diff --git a/README.md b/README.md index e745f5f..c2841c1 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ |更新日期|更新内容| |-|-| +|20191126|1.springboot2内置tomcat更换为性能更强大的undertow 2.修复tinyintTransType参数丢失问题 | |20191124|1.java代码结构优化. 2.新增简单的json生成模式 3.新增简单的正则表达式匹配模式(感谢@ydq的贡献) 4.新增对复制String代码中的乱SQL代码的支持 5.优化对JSON的父子节点/处理,JSONObject和JSONArray节点处理,子节点缺失'{'头处理| |20191123|1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml.| |20191116|优化对primary关键字的处理(感谢@liujiansgit的反馈). | diff --git a/codegenerator4.png b/codegenerator4.png new file mode 100644 index 0000000..e1d23e4 Binary files /dev/null and b/codegenerator4.png differ diff --git a/generator-web/pom.xml b/generator-web/pom.xml index 3ca5e97..ceaa594 100644 --- a/generator-web/pom.xml +++ b/generator-web/pom.xml @@ -38,10 +38,10 @@ spring-boot-starter-data-jpa --> - + @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 true javac @@ -87,25 +87,24 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.1 + 3.1.0 true - + org.springframework.boot spring-boot-maven-plugin - 2.0.4.RELEASE diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java index 4df4b89..31c7381 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java +++ b/generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java @@ -62,6 +62,8 @@ public class IndexController { params.put("packageName", paramInfo.getPackageName()); params.put("returnUtil", paramInfo.getReturnUtil()); + log.info("generator table:"+(classInfo==null?"":classInfo.getTableName())); + // generate the code 需要加新的模板请在里面改 Map result = generatorService.getResultByParams(params); diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java index 843bf3e..31c1c28 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java +++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java @@ -42,9 +42,7 @@ public class TableParseUtil { //deal with special character tableSql = tableSql.trim().replaceAll("'","`").replaceAll("\"","`").replaceAll(",",",").toLowerCase(); //deal with java string copy \n" - System.out.println(tableSql); tableSql = tableSql.trim().replaceAll("n`","").replaceAll("\\+","").replaceAll("``","`").replaceAll("\\\\",""); - System.out.println(tableSql); // table Name String tableName = null; if (tableSql.contains("TABLE") && tableSql.contains("(")) { diff --git a/generator-web/src/main/resources/application.yml b/generator-web/src/main/resources/application.yml index c54490d..b8563c8 100644 --- a/generator-web/src/main/resources/application.yml +++ b/generator-web/src/main/resources/application.yml @@ -2,17 +2,25 @@ server: port: 1234 servlet: context-path: /generator -tomcat: - remote-ip-header: x-forward-for - uri-encoding: UTF-8 - max-threads: 10 - background-processor-delay: 30 - basedir: ${user.home}/tomcat/ +#tomcat: +# remote-ip-header: x-forward-for +# uri-encoding: UTF-8 +# max-threads: 10 +# background-processor-delay: 30 +# basedir: ${user.home}/tomcat/ + undertow: + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + # 不要设置过大,如果过大,启动项目会报错:打开文件数过多 + io-threads: 4 + # 阻塞任务线程池, 当执行类似servlet请求阻塞IO操作, undertow会从这个线程池中取得线程 + # 它的值设置取决于系统线程执行任务的阻塞系数,默认值是IO线程数*8 + worker-threads: 64 + # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 + # 每块buffer的空间大小,越小的空间被利用越充分,不要设置太大,以免影响其他应用,合适即可 + buffer-size: 1024 + # 是否分配的直接内存(NIO直接分配的堆外内存) + direct-buffers: true spring: - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 banner: charset: UTF-8 http: diff --git a/pom.xml b/pom.xml index a4e4264..c220783 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,18 @@ org.springframework.boot spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + org.springframework.boot + spring-boot-starter-undertow @@ -67,7 +79,7 @@ cn.hutool hutool-all - 4.6.1 + 5.0.6 @@ -134,7 +146,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 true javac @@ -156,13 +168,13 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.1 + 3.1.0 true - + org.springframework.boot spring-boot-maven-plugin