diff --git a/all-in-one/pom.xml b/all-in-one/pom.xml index 98083a9..2d64590 100644 --- a/all-in-one/pom.xml +++ b/all-in-one/pom.xml @@ -22,9 +22,14 @@ boot-starter-ssm ${micro.fast.version} + + com.micro.fast + boot-starter-security-app + org.springframework.boot spring-boot-devtools + true org.springframework.boot @@ -41,21 +46,17 @@ - org.mybatis.generator - mybatis-generator-maven-plugin - - true - true - + org.mybatis.generator + mybatis-generator-maven-plugin + + true + false + org.apache.maven.plugins maven-compiler-plugin - - - - com.spotify docker-maven-plugin diff --git a/all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java b/all-in-one/src/main/java/com/lishouyu/AllInOneApplication.java similarity index 79% rename from all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java rename to all-in-one/src/main/java/com/lishouyu/AllInOneApplication.java index 3ae771a..5793e16 100644 --- a/all-in-one/src/main/java/com/lishouyu/PerformanceAppraisalApplication.java +++ b/all-in-one/src/main/java/com/lishouyu/AllInOneApplication.java @@ -7,9 +7,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @MapperScan(basePackages = {"com.micro.fast.pa.dao"}) -public class PerformanceAppraisalApplication { - +public class AllInOneApplication { public static void main(String[] args) { - SpringApplication.run(PerformanceAppraisalApplication.class, args); + SpringApplication.run(AllInOneApplication.class, args); } } diff --git a/all-in-one/src/main/resources/application-dev.yml b/all-in-one/src/main/resources/application-dev.yml index c50a6ba..97388e1 100644 --- a/all-in-one/src/main/resources/application-dev.yml +++ b/all-in-one/src/main/resources/application-dev.yml @@ -30,8 +30,8 @@ server: jdbc: master: username: root - password: hfAhyoTu3UKAfmy27/RNKQ== - url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true + password: studyj2e + url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false driverClass: com.mysql.jdbc.Driver mybatis: typeAliasesPackage: com.lishouyu.pojo diff --git a/all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java b/all-in-one/src/test/java/com/lishouyu/AllInOneApplicationTests.java similarity index 84% rename from all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java rename to all-in-one/src/test/java/com/lishouyu/AllInOneApplicationTests.java index f2240b5..37b7fc2 100644 --- a/all-in-one/src/test/java/com/lishouyu/PerformanceAppraisalApplicationTests.java +++ b/all-in-one/src/test/java/com/lishouyu/AllInOneApplicationTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class PerformanceAppraisalApplicationTests { +public class AllInOneApplicationTests { @Test public void contextLoads() {