代码重构！异常处理优化，Freemarker相关工具类优化，简化模板生成部分，通过template.json来配置需要生成的模板，不需要配置java文件。

Author: moshowgame

README.md

@@ -27,6 +27,7 @@
 
 |更新日期|更新内容|
 |-|-|
+|20200517|1.代码重构！异常处理优化，Freemarker相关工具类优化，简化模板生成部分，通过template.json来配置需要生成的模板，不需要配置java文件。|
 |20200503|1.优化对特殊字符的处理，对于包含#和$等特殊字符的，在模板使用井和￥代替便可，escapeString方法会自动处理<br> 2.优化mybatisplus实体类相关(感谢@chunchengmeigui的反馈) 3.修优化对所有类型的判断(感谢@cnlw的反馈) 4.移除swagger-entity，该功能已经包含在‘swagger-ui’的下拉选项中  5.升级hutool和lombok版本|
 |20200306|1.提交一套layuimini+mybatisplus的模板. 2.修复mybatisplus一些相关问题. |
 |20200206|1.新增历史记录功能，自动保存最近生成的对象 2.新增swagger开关选项和修复@Column带name参数(感谢@liuyu-struggle的建议) 3.去除mybatis模板中的方括号[]和修改模板里的类注释样式(感谢@gaohanghang的PR)|
@@ -65,7 +66,7 @@
 |20180913|修复字段没有描述以及类型为DATE型导致的问题.新增JPA的Controller模板.|
 |20180831|初始化项目.新增JPA系列Entity+Repository模板.|
 
-# FieldName
+# ClassInfo/TableInfo
 |字段名|说明|
 |-|-|
 |packageName|自定义的包名|
@@ -77,6 +78,12 @@
 |fieldName|字段名|
 |fieldComment|字段备注|
 
+# how to add a new template
+1. code-generator中找到对应分类，新增一个.ftl文件
+2. 根据类信息编写freemarker模板.ftl文件
+3. 修改template.json文件，新增模板信息
+4. index页面增加一个button
+5. reload,test,complete
 
 <img src="./codegenerator1.png">
 <img src="./codegenerator2.png">

codegenerator1.png

@@ -1,20 +1,20 @@
-package com.softdev.system.generator.config;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.softdev.system.generator.entity.ReturnT;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@ControllerAdvice
-public class GlobalDefaultExceptionHandler {
-	
-	@ExceptionHandler(Exception.class)
-	@ResponseBody
-	public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
-		e.printStackTrace();
-		return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage());
-	}
-	
-}
+package com.softdev.system.generator.config;
+
+import com.softdev.system.generator.entity.ReturnT;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice
+public class GlobalDefaultExceptionHandler {
+	
+	@ExceptionHandler(Exception.class)
+	@ResponseBody
+	public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) {
+		e.printStackTrace();
+		return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage());
+	}
+	
+}

codegenerator2.png

@@ -1,23 +1,18 @@
 package com.softdev.system.generator.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.softdev.system.generator.entity.ClassInfo;
 import com.softdev.system.generator.entity.ParamInfo;
 import com.softdev.system.generator.entity.ReturnT;
 import com.softdev.system.generator.service.GeneratorService;
-import com.softdev.system.generator.util.CodeGenerateException;
 import com.softdev.system.generator.util.TableParseUtil;
-import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,49 +34,39 @@ public String index() {
 
     @PostMapping("/genCode")
     @ResponseBody
-    public ReturnT<Map<String, String>> codeGenerate(@RequestBody ParamInfo paramInfo ) {
+    public ReturnT<Map<String, String>> codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception {
 
-        try {
-
-            if (StringUtils.isBlank(paramInfo.getTableSql())) {
-                return new ReturnT<>(ReturnT.FAIL_CODE, "表结构信息不可为空");
-            }
-
-            // parse table
-            ClassInfo classInfo = null;
-            switch (paramInfo.getDataType()){
-                //parse json
-                case "json":classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);break;
-                //parse sql  by regex
-                case "sql-regex":classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);break;
-                //default parse sql by java
-                default : classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);break;
-            }
-
-            // process the param
-            Map<String, Object> params = new HashMap<String, Object>(8);
-            params.put("classInfo", classInfo);
-            params.put("tableName", classInfo==null?System.currentTimeMillis():classInfo.getTableName());
-            params.put("authorName", paramInfo.getAuthorName());
-            params.put("packageName", paramInfo.getPackageName());
-            params.put("returnUtil", paramInfo.getReturnUtil());
-            params.put("swagger", paramInfo.isSwagger());
+        if (paramInfo.getTableSql().trim().length()<1) {
+            return new ReturnT<>(ReturnT.FAIL_CODE, "表结构信息不可为空");
+        }
 
-            //log the params
-            //log.info(JSON.toJSONString(paramInfo));
+        //1.Parse Table Structure 表结构解析
+        ClassInfo classInfo = null;
+        switch (paramInfo.getDataType()){
+            //JSON模式：parse field from json string
+            case "json":classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);break;
+            //正则表达式模式（非完善版本）：parse sql by regex
+            case "sql-regex":classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);break;
+            //默认模式：default parse sql by java
+            default : classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);break;
+        }
 
-            log.info("generator table:"+(classInfo==null?"":classInfo.getTableName())
-                    +",field size:"+((classInfo==null||classInfo.getFieldList()==null)?"":classInfo.getFieldList().size()));
+        //2.Set the params 设置表格参数
+        Map<String, Object> params = new HashMap<String, Object>(8);
+        params.put("classInfo", classInfo);
+        params.put("tableName", classInfo==null?System.currentTimeMillis():classInfo.getTableName());
+        params.put("authorName", paramInfo.getAuthorName());
+        params.put("packageName", paramInfo.getPackageName());
+        params.put("returnUtil", paramInfo.getReturnUtil());
+        params.put("swagger", paramInfo.isSwagger());
 
-            // generate the code 需要加新的模板请在里面改
-            Map<String, String> result = generatorService.getResultByParams(params);
+        //log the generated table and filed size记录解析了什么表，有多少个字段
+        log.info("generated table:" + classInfo.getTableName() + ",field size:" + (classInfo.getFieldList() == null ? "" : classInfo.getFieldList().size()));
 
-            return new ReturnT<>(result);
-        } catch (IOException | TemplateException | CodeGenerateException e) {
-            log.error(e.getMessage(), e);
-            return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage());
-        }
+        //3.generate the code by freemarker template and param . Freemarker根据参数和模板生成代码
+        Map<String, String> result = generatorService.getResultByParams(params);
 
+        return new ReturnT<>(result);
     }
 
 }

codegenerator3.png

@@ -1,26 +1,26 @@
-package com.softdev.system.generator.entity;
-
-import lombok.Data;
-
-/**
- * Post data - ParamInfo
- * @author zhengkai.blog.csdn.net
- */
-@Data
-public class ParamInfo {
-    private String tableSql;
-    private String authorName;
-    private String packageName;
-    private String returnUtil;
-    private String nameCaseType;
-    private String tinyintTransType;
-    private String dataType;
-    private boolean swagger;
-
-    @Data
-    public static class NAME_CASE_TYPE{
-        public static String CAMEL_CASE="CamelCase";
-        public static String UNDER_SCORE_CASE="UnderScoreCase";
-        public static String UPPER_UNDER_SCORE_CASE="UpperUnderScoreCase";
-    }
-}
+package com.softdev.system.generator.entity;
+
+import lombok.Data;
+
+/**
+ * Post data - ParamInfo
+ * @author zhengkai.blog.csdn.net
+ */
+@Data
+public class ParamInfo {
+    private String tableSql;
+    private String authorName;
+    private String packageName;
+    private String returnUtil;
+    private String nameCaseType;
+    private String tinyintTransType;
+    private String dataType;
+    private boolean swagger;
+
+    @Data
+    public static class NAME_CASE_TYPE{
+        public static String CAMEL_CASE="CamelCase";
+        public static String UNDER_SCORE_CASE="UnderScoreCase";
+        public static String UPPER_UNDER_SCORE_CASE="UpperUnderScoreCase";
+    }
+}

codegenerator4.png

@@ -0,0 +1,18 @@
+package com.softdev.system.generator.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TemplateConfig implements Serializable {
+
+    public static final long serialVersionUID = 66L;
+
+    Integer id;
+    String name;
+    String group;
+    String path;
+    String description;
+
+}

generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java

@@ -1,17 +1,17 @@
-package com.softdev.system.generator.service;
-
-import freemarker.template.TemplateException;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * GeneratorService
- * @author zhengkai.blog.csdn.net
- */
-public interface GeneratorService {
-
-    public Map<String,String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException;
-
-}
+package com.softdev.system.generator.service;
+
+import freemarker.template.TemplateException;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * GeneratorService
+ * @author zhengkai.blog.csdn.net
+ */
+public interface GeneratorService {
+
+    public Map<String,String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException;
+
+}