From b99e7eeb60812977c22a2c20afbf1cfc472cefe4 Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Fri, 1 Dec 2017 14:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=86=8Dwindows=E4=B8=8B?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=AF=A5=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MybatisGeneratorExtend.java       |  2 +-
 .../boot-starter-maven-plugin/pom.xml         |  2 +-
 pom.xml                                       | 24 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java
index 6321c28..003761b 100644
--- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java
+++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/service/MybatisGeneratorExtend.java
@@ -78,7 +78,7 @@ public class MybatisGeneratorExtend {
             Map<String,Object> mybatisGeneratorModel = new HashMap<>();
             mybatisGeneratorModel.put("db",MybatisGeneratorExtend.db);
             mybatisGeneratorModel.put("mybatisGenerator",MybatisGeneratorExtend.mybatisGenerator);
-            boolean mybatisGeneratorFileSuccess = FreemarkerUtil.createFile("mybatisGenerator.fm", mybatisGeneratorModel, "mybatisGenerator.xml");
+            boolean mybatisGeneratorFileSuccess = FreemarkerUtil.createFile("mybatisGenerator.fm", mybatisGeneratorModel, "mybatisGenerator.properties");
             boolean generatorConfigFileSuccess = FreemarkerUtil.createFile("generatorConfig.fm", mybatisGeneratorModel, "generatorConfig.xml");
         } catch (SQLException e) {
             log.error("错误{} {}", e, "sql语句执行失败");
diff --git a/boot-starter/boot-starter-maven-plugin/pom.xml b/boot-starter/boot-starter-maven-plugin/pom.xml
index ad239b5..9ebf8de 100644
--- a/boot-starter/boot-starter-maven-plugin/pom.xml
+++ b/boot-starter/boot-starter-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>mybatis-generator-extend</module>
+        <module>mybatis-generator-extend-maven-plugin</module>
     </modules>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 751f350..1f6c241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <modules>
         <module>boot-starter</module>
         <module>ms</module>
-        <module>pa</module>
+        <module>performance-appraisal</module>
     </modules>
 
     <properties>
@@ -98,6 +98,28 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>win-dev</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <!--这里面的参数在这个profile被激活的时候会覆盖默认的这些参数值-->
+                <java.version>1.7</java.version>
+                <maven.compiler.source>1.7</maven.compiler.source>
+                <maven.compiler.target>1.7</maven.compiler.target>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-devtools</artifactId>
+                        <version>${springboot.version}</version>
+                        <optional>true</optional>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
     <!--对依赖的版本进行统一管理-->
     <dependencyManagement>