精简优化，阿里扫描符合规范

Author: dolyw

README.md

@@ -1,4 +1,4 @@
-## SpringBootGenerator
+## ViewGenerator
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/wang926454/SpringBootGenerator/pulls)
@@ -17,7 +17,7 @@ SpringBoot1.5(第三版) | 可视化界面生成代码  | 当前
 
 #### 项目介绍
 
-SpringBootGenerator是一个基于SpringBoot & FreeMarker的自定义模板代码生成系统，用于快速构建中小型项目，稳定、简单、快速，使我们摆脱那些重复劳动，专注于业务代码的编写，能在短短几十秒钟内实现一套简单的基础代码(自动生成Model、Mapper、MapperXML、Service、ServiceImpl、Controller、JS、Vue等自定义模板代码)
+ViewGenerator是一个基于SpringBoot & FreeMarker的自定义模板代码生成系统，用于快速构建中小型项目，稳定、简单、快速，使我们摆脱那些重复劳动，专注于业务代码的编写，能在短短几十秒钟内实现一套简单的基础代码(自动生成Model、Mapper、MapperXML、Service、ServiceImpl、Controller、JS、Vue等自定义模板代码)
 
 1. 可视化界面，上手操作简单
 2. 高度灵活的代码模板配置(提供两套模板参考)，可以自行添加N套代码模板
@@ -43,19 +43,19 @@ SpringBoot + Mybatis + PageHelper + 通用Mapper + Thymeleaf(Amaze UI(布局) +
 ```
 启动首页界面
 ```
-![image text](https://docs.wang64.cn/Project/SpringBootGenerator/image/20190406001.png)
+![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406001.png)
 ```
 生成代码界面如下
 ```
-![image text](https://docs.wang64.cn/Project/SpringBootGenerator/image/20190406002.png)
+![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406002.png)
 ```
 查看表详细信息界面如下
 ```
-![image text](https://docs.wang64.cn/Project/SpringBootGenerator/image/20190406003.png)
+![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406003.png)
 ```
 配置更新界面如下
 ```
-![image text](https://docs.wang64.cn/Project/SpringBootGenerator/image/20190406004.png)
+![image text](https://docs.wang64.cn/Project/ViewGenerator/image/20190406004.png)
 
 #### 搭建参考
 

pom.xml

@@ -4,11 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.example</groupId>
-    <artifactId>SpringBootGenerator</artifactId>
+    <artifactId>ViewGenerator</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>SpringBootGenerator</name>
+    <name>ViewGenerator</name>
     <description>Demo project for Spring Boot</description>
 
     <parent>
@@ -33,6 +33,7 @@
         <commons-lang3.version>3.7</commons-lang3.version>
         <commons-io.version>2.5</commons-io.version>
         <antlr.version>3.2</antlr.version>
+        <rapid.version>4.0.6</rapid.version>
     </properties>
 
     <dependencies>
@@ -117,16 +118,16 @@
             <artifactId>freemarker</artifactId>
             <version>${freemarker.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.rapid-framework</groupId>
+            <artifactId>rapid-generator</artifactId>
+            <version>${rapid.version}</version>
+        </dependency>
         <!--<dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-maven-plugin</artifactId>
             <version>${generator.version}</version>
         </dependency>-->
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>${antlr.version}</version>
-        </dependency>
 
         <!-- Guava工具包 -->
         <!--<dependency>

…in/java/com/example/config/DbConfig.java …a/com/example/config/DataBaseConfig.javasrc/main/java/com/example/config/DbConfig.java renamed to src/main/java/com/example/config/DataBaseConfig.java src/main/java/com/example/config/DbConfig.java renamed to src/main/java/com/example/config/DataBaseConfig.java

@@ -1,5 +1,6 @@
 package com.example.config;
 
+import com.example.constant.DataBaseEnum;
 import com.example.dao.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,42 +14,22 @@
  * @date 2019/4/5 17:56
  */
 @Configuration
-public class DbConfig {
+public class DataBaseConfig {
 
-    /**
-     * MYSQL
-     */
-    private static final String MYSQL = "mysql";
-
-    /**
-     * ORACLE
-     */
-    private static final String ORACLE = "oracle";
-
-    /**
-     * POSTGRESQL
-     */
-    private static final String POSTGRESQL = "postgresql";
-
-    /**
-     * SQLSERVER
-     */
-    private static final String SQLSERVER = "sqlserver";
-
-    @Value("${jdbc.driver}")
+    @Value("${jdbc_driver}")
     private String driver;
 
     @Autowired
-    private MySQLGeneratorDao mySQLGeneratorDao;
+    private MySqlGeneratorDao mySqlGeneratorDao;
 
     @Autowired
     private OracleGeneratorDao oracleGeneratorDao;
 
     @Autowired
-    private PostgreSQLGeneratorDao postgreSQLGeneratorDao;
+    private PostgreSqlGeneratorDao postgreSqlGeneratorDao;
 
     @Autowired
-    private SQLServerGeneratorDao sqlServerGeneratorDao;
+    private SqlServerGeneratorDao sqlServerGeneratorDao;
 
     /**
      * 根据驱动判断注入那个类型数据库
@@ -61,13 +42,14 @@ public class DbConfig {
     @Bean
     @Primary
     public GeneratorDao getGeneratorDao() {
-        if(driver.indexOf(MYSQL) > 0) {
-            return mySQLGeneratorDao;
-        } else if (driver.indexOf(ORACLE) > 0) {
+        String str = DataBaseEnum.MYSQL.getValue();
+        if(driver.indexOf(DataBaseEnum.MYSQL.getValue()) > 0) {
+            return mySqlGeneratorDao;
+        } else if (driver.indexOf(DataBaseEnum.ORACLE.getValue()) > 0) {
             return oracleGeneratorDao;
-        } else if (driver.indexOf(POSTGRESQL) > 0) {
-            return postgreSQLGeneratorDao;
-        } else if (driver.indexOf(SQLSERVER) > 0) {
+        } else if (driver.indexOf(DataBaseEnum.POSTGRESQL.getValue()) > 0) {
+            return postgreSqlGeneratorDao;
+        } else if (driver.indexOf(DataBaseEnum.SQLSERVER.getValue()) > 0) {
             return sqlServerGeneratorDao;
         }
         return null;

src/main/java/com/example/config/WebMvcConfig.java

@@ -11,10 +11,12 @@
  */
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurerAdapter {
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**").allowedOrigins("*")
                 .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowCredentials(false).maxAge(3600);
     }
+
 }

src/main/java/com/example/constant/Constant.java

@@ -0,0 +1,20 @@
+package com.example.constant;
+
+/**
+ * Constant
+ * @author Wang926454
+ * @date 2019/4/6 19:50
+ */
+public interface Constant {
+
+    /**
+     * 项目在硬盘上的基础路径
+     */
+    String PROJECT_PATH = System.getProperty("user.dir");
+
+    /**
+     * 冒号
+     */
+    String COLON = ":";
+
+}

src/main/java/com/example/constant/DataBaseEnum.java

@@ -0,0 +1,36 @@
+package com.example.constant;
+
+/**
+ * 数据库类型
+ * @author Wang926454
+ * @date 2019/4/6 19:53
+ */
+public enum DataBaseEnum {
+    /**
+     * MYSQL
+     */
+    MYSQL("mysql"),
+    /**
+     * ORACLE
+     */
+    ORACLE("oracle"),
+    /**
+     * POSTGRESQL
+     */
+    POSTGRESQL("postgresql"),
+    /**
+     * SQLSERVER
+     */
+    SQLSERVER("sqlserver");
+
+    private String value;
+
+    DataBaseEnum(String type) {
+        value = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

src/main/java/com/example/controller/DataBaseController.java

@@ -5,11 +5,15 @@
  */
 package com.example.controller;
 
+import cn.org.rapid_framework.generator.Generator;
+import cn.org.rapid_framework.generator.GeneratorFacade;
+import cn.org.rapid_framework.generator.GeneratorProperties;
+import com.example.constant.Constant;
 import com.example.dao.GeneratorDao;
 import com.example.exception.SystemException;
 import com.example.util.SafeProperties;
 import com.example.util.ZipUtil;
-import com.uframe.generator.GeneratorFacade;
+import com.generator.CustomGeneratorFacade;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,11 +42,6 @@
 @RequestMapping("database")
 public class DataBaseController {
 
-    /**
-     * 项目在硬盘上的基础路径
-     */
-    private static final String PROJECT_PATH = System.getProperty("user.dir");
-
     /**
      * 代码生成的文件输出路径
      */
@@ -134,10 +133,16 @@ public ResponseBean open() {
      * @date 2019-04-05 18:00:26
      */
     @PostMapping("/{tableName}")
-    public ResponseBean genTable(@PathVariable("tableName") String tableName) {
+    public ResponseBean genTable(@PathVariable("tableName") String tableName) throws IOException {
         // 配置表名
         String[] tableNames = tableName.split("-");
-        if (genCode(tableNames, null)) {
+        if (outRoot == null) {
+            throw new IllegalArgumentException("outRootDir must be not null");
+        } else if (outRoot.indexOf(Constant.COLON) < 0) {
+            // 项目在硬盘上的基础路径
+            outRoot = System.getProperty("user.dir") + outRoot;
+        }
+        if (genCode(tableNames, outRoot)) {
             System.out.println("----- 生成成功 -----");
             // 获得系统属性集
             Properties props = System.getProperties();
@@ -199,24 +204,20 @@ public void genTableToZip(@PathVariable("tableName") String tableName,
      * 通过表名称生成代码
      * @param tableNames
      */
-    public boolean genCode(String[] tableNames, String outRootDir) {
-        // GeneratorFacade
-        GeneratorFacade generatorFacade = null;
-        if (outRootDir == null) {
-            generatorFacade = new GeneratorFacade();
-        } else {
-            generatorFacade = new GeneratorFacade(outRootDir);
-        }
+    public boolean genCode(String[] tableNames, String outRootDir) throws IOException {
+        GeneratorFacade generatorFacade = new CustomGeneratorFacade(outRootDir);
+        // 配置信息
+        GeneratorProperties.load(new String[]{ "classpath:config/generator.properties" });
+        // 模板位置
+        Generator generator = generatorFacade.getGenerator();
+        generator.addTemplateRootDir(Constant.PROJECT_PATH + template);
         // 开始执行
         try {
             for (String tableName : tableNames) {
-                // 有设置输出路径说明为临时路径，不需要旧删除文件
-                if (outRootDir == null) {
-                    // 删除旧文件
-                    generatorFacade.deleteByTable(tableName, PROJECT_PATH + template);
-                }
+                // 删除旧文件
+                generatorFacade.deleteByTable(tableName);
                 // 生成新文件
-                generatorFacade.generateByTable(tableName, PROJECT_PATH + template);
+                generatorFacade.generateByTable(tableName);
             }
         } catch (Exception e) {
             System.out.println("----- 生成失败 请检查数据库是否连接正常及表名是否正确以及权限是否缺失 -----");

src/main/java/com/example/dao/MySQLGeneratorDao.java

@@ -8,6 +8,6 @@
  * @date 2019/4/5 17:53
  */
 @Repository
-public interface MySQLGeneratorDao extends GeneratorDao {
+public interface MySqlGeneratorDao extends GeneratorDao {
 
 }

src/main/java/com/example/dao/PostgreSQLGeneratorDao.java

@@ -8,6 +8,6 @@
  * @date 2019/4/5 18:21
  */
 @Repository
-public interface PostgreSQLGeneratorDao extends GeneratorDao {
+public interface PostgreSqlGeneratorDao extends GeneratorDao {
 
 }

src/main/java/com/example/dao/SQLServerGeneratorDao.java

@@ -8,6 +8,6 @@
  * @date 2019/4/5 18:22
  */
 @Repository
-public interface SQLServerGeneratorDao extends GeneratorDao {
+public interface SqlServerGeneratorDao extends GeneratorDao {
 
 }