From 065d263ab6ff5700e267e5cef22ce58ce780dc76 Mon Sep 17 00:00:00 2001
From: winLsy <18332763730@163.com>
Date: Fri, 1 Dec 2017 16:59:51 +0800
Subject: [PATCH] =?UTF-8?q?mybatis-gennerator-extend=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pom.xml | 15 ++++++++++++++-
.../mojo/MyabtisGeneratorExtendMojo.java | 18 ++++++++++++++++++
.../extend/pojo/MybatisGenerator.java | 1 -
.../extend/service/MybatisGeneratorExtend.java | 10 +++-------
...{generatorConfig.fm => generatorConfig.ftl} | 13 ++-----------
...ybatisGenerator.fm => mybatisGenerator.ftl} | 0
ms/upms/pom.xml | 1 +
7 files changed, 38 insertions(+), 20 deletions(-)
create mode 100644 boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MyabtisGeneratorExtendMojo.java
rename boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/{generatorConfig.fm => generatorConfig.ftl} (63%)
rename boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/{mybatisGenerator.fm => mybatisGenerator.ftl} (100%)
diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/pom.xml b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/pom.xml
index 61d86b4..aab5d96 100644
--- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/pom.xml
+++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/pom.xml
@@ -3,7 +3,7 @@
4.0.0
mybatis-generator-extend-maven-plugin
- jar
+ maven-plugin
mybatis-generator-extend
mybatis-generator-extend-maven-plugin
@@ -15,6 +15,7 @@
+
com.micro.fast
boot-starter-util
@@ -38,6 +39,18 @@
org.slf4j
slf4j-api
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ 3.2
+ provided
+
+
+ org.apache.maven
+ maven-plugin-api
+ 2.0.6
+
diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MyabtisGeneratorExtendMojo.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MyabtisGeneratorExtendMojo.java
new file mode 100644
index 0000000..db48e1d
--- /dev/null
+++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/mojo/MyabtisGeneratorExtendMojo.java
@@ -0,0 +1,18 @@
+package com.micro.fast.mybatis.generator.extend.mojo;
+
+import com.micro.fast.mybatis.generator.extend.service.MybatisGeneratorExtend;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+
+/**
+ * maven插件执行主类
+ */
+@Mojo(name = "generateFiles")
+public class MyabtisGeneratorExtendMojo extends AbstractMojo {
+ @Override
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ MybatisGeneratorExtend.GenerateMybatisGeneratorNeedFilesByTemplates();
+ }
+}
diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/MybatisGenerator.java b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/MybatisGenerator.java
index 3289eb2..e5f18fe 100644
--- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/MybatisGenerator.java
+++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/java/com/micro/fast/mybatis/generator/extend/pojo/MybatisGenerator.java
@@ -1,6 +1,5 @@
package com.micro.fast.mybatis.generator.extend.pojo;
-import java.util.List;
import java.util.Map;
/**
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 003761b..2100eb8 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
@@ -66,11 +66,7 @@ public class MybatisGeneratorExtend {
String firstUpper = string.replaceFirst(s, upperCase);
doMainObjectName += firstUpper;
}
- char c = tableName.charAt(0);
- String s = String.valueOf(c);
- String upperCase = s.toUpperCase();
- String firstUpperDoMainObjectName = doMainObjectName.replaceFirst(s, upperCase);
- tablesNameAndDoMainObjectsName.put(tableName,firstUpperDoMainObjectName);
+ tablesNameAndDoMainObjectsName.put(tableName,doMainObjectName);
}
}
MybatisGeneratorExtend.mybatisGenerator.setTablesNameAndDoMainObjectsName(tablesNameAndDoMainObjectsName);
@@ -78,8 +74,8 @@ public class MybatisGeneratorExtend {
Map mybatisGeneratorModel = new HashMap<>();
mybatisGeneratorModel.put("db",MybatisGeneratorExtend.db);
mybatisGeneratorModel.put("mybatisGenerator",MybatisGeneratorExtend.mybatisGenerator);
- boolean mybatisGeneratorFileSuccess = FreemarkerUtil.createFile("mybatisGenerator.fm", mybatisGeneratorModel, "mybatisGenerator.properties");
- boolean generatorConfigFileSuccess = FreemarkerUtil.createFile("generatorConfig.fm", mybatisGeneratorModel, "generatorConfig.xml");
+ boolean mybatisGeneratorFileSuccess = FreemarkerUtil.createFile("mybatisGenerator.ftl", mybatisGeneratorModel, "mybatisGenerator.properties");
+ boolean generatorConfigFileSuccess = FreemarkerUtil.createFile("generatorConfig.ftl", mybatisGeneratorModel, "generatorConfig.xml");
} catch (SQLException e) {
log.error("错误{} {}", e, "sql语句执行失败");
e.printStackTrace();
diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.fm b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.ftl
similarity index 63%
rename from boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.fm
rename to boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.ftl
index 7ea5e0e..66efd10 100644
--- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.fm
+++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/generatorConfig.ftl
@@ -66,17 +66,8 @@
- <#list mybatisGenerator.tablesName as >
+ <#list mybatisGenerator.tablesNameAndDoMainObjectsName?keys as key >
+
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/mybatisGenerator.fm b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/mybatisGenerator.ftl
similarity index 100%
rename from boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/mybatisGenerator.fm
rename to boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/mybatisGenerator.ftl
diff --git a/ms/upms/pom.xml b/ms/upms/pom.xml
index d5d82e5..a5d8182 100644
--- a/ms/upms/pom.xml
+++ b/ms/upms/pom.xml
@@ -118,6 +118,7 @@
org.mybatis.generator
mybatis-generator-maven-plugin
+
true
true