From 71ead5c95a4453693d7021afd346ca111c5e63df Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Tue, 23 Jan 2018 14:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 all-in-one/pom.xml                            | 21 ++++++++++---------
 ...lication.java => AllInOneApplication.java} |  5 ++---
 .../src/main/resources/application-dev.yml    |  4 ++--
 ...sts.java => AllInOneApplicationTests.java} |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename all-in-one/src/main/java/com/lishouyu/{PerformanceAppraisalApplication.java => AllInOneApplication.java} (79%)
 rename all-in-one/src/test/java/com/lishouyu/{PerformanceAppraisalApplicationTests.java => AllInOneApplicationTests.java} (84%)

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 @@
             <artifactId>boot-starter-ssm</artifactId>
             <version>${micro.fast.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.micro.fast</groupId>
+            <artifactId>boot-starter-security-app</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -41,21 +46,17 @@
             </plugin>
             <!--生成mybatis dao 层 sql mapper的插件-->
             <plugin>
-                <groupId>org.mybatis.generator</groupId>
-                <artifactId>mybatis-generator-maven-plugin</artifactId>
-                <configuration>
-                    <verbose>true</verbose>
-                    <overwrite>true</overwrite>
-                </configuration>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-maven-plugin</artifactId>
+            <configuration>
+                <verbose>true</verbose>
+                <overwrite>false</overwrite>
+            </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-            <!--</plugin>-->
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
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() {