1.springboot2内置tomcat更换为性能更强大的undertow 2.修复tinyintTransType参数丢失问题

1.springboot2内置tomcat更换为性能更强大的undertow 2.修复tinyintTransType参数丢失问题

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的反馈). |   

generator-web/pom.xml

@@ -38,10 +38,10 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 
@@ -65,7 +65,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.8.1</version>
 				<configuration>
 					<skip>true</skip>
 					<compilerId>javac</compilerId>
@@ -87,25 +87,24 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.1.0</version>
 				<configuration>
 					<!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
 					<includeEmptyDirs>true</includeEmptyDirs>
 				</configuration>
 			</plugin>
-			<plugin>
+			<!--<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
+				<version>3.2.3</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<warSourceExcludes>upload/**</warSourceExcludes>
 				</configuration>
-			</plugin>
+			</plugin>-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.0.4.RELEASE</version>
 				<executions>
 					<execution>
 						<goals>

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<String, String> result = generatorService.getResultByParams(params);
 

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("(")) {

generator-web/src/main/resources/application.yml

@@ -2,17 +2,25 @@ server:
   port: 1234
   servlet:
       context-path: /generator
-tomcat:
+#tomcat:
-    remote-ip-header: x-forward-for
+#    remote-ip-header: x-forward-for
-    uri-encoding: UTF-8
+#    uri-encoding: UTF-8
-    max-threads: 10
+#    max-threads: 10
-    background-processor-delay: 30
+#    background-processor-delay: 30
-    basedir: ${user.home}/tomcat/
+#    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:

pom.xml

@@ -31,6 +31,18 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<!-- 排除Tomcat依赖 -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- 添加 Undertow依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
@@ -67,7 +79,7 @@
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
-			<version>4.6.1</version>
+			<version>5.0.6</version>
 		</dependency>
 
 		<!-- lombok -->
@@ -134,7 +146,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.8.1</version>
 				<configuration>
 					<skip>true</skip>
 					<compilerId>javac</compilerId>
@@ -156,13 +168,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.1.0</version>
 				<configuration>
 					<!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
 					<includeEmptyDirs>true</includeEmptyDirs>
 				</configuration>
 			</plugin>
-			<plugin>
+			<!--<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.1.1</version>
@@ -170,7 +182,7 @@
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<warSourceExcludes>upload/**</warSourceExcludes>
 				</configuration>
-			</plugin>
+			</plugin>-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>