diff --git a/README.md b/README.md
index b7fbb54..6a8fcc0 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ SpringBootCodeGenerator
| CSDN博客 | http://zhengkai.blog.csdn.net |
| |
| 更新日期 | 更新内容 |
+| 20191123 | 1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml. |
| 20191116 | 优化对primary关键字的处理(感谢@liujiansgit的反馈). |
| 20191115 | 1.添加tinyint类型转换(感谢@lixiliang&@liujiansgit的Suggestion) 2.添加一键复制功能(感谢@gaohanghang的Suggestion) 3.Mybatis的insert增加keyProperty="id"用于返回自增id(感谢@88888888888888888888的Suggestion) 4.优化date类型的支持(感谢@SteveLsf的反馈) 5.其他一些优化. |
| 20191015 | 修复jdbcTemplates中insert语句第一个字段丢失的问题. |
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 ce0e79c..cdcbc79 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
@@ -92,6 +92,8 @@ public class IndexController {
result.put("plusmapper", freemarkerTool.processString("code-generator/mybatis-plus/plusmapper.ftl", params));
//util
result.put("util", freemarkerTool.processString("code-generator/util/util.ftl", params));
+ result.put("json", freemarkerTool.processString("code-generator/util/json.ftl", params));
+ result.put("xml", freemarkerTool.processString("code-generator/util/xml.ftl", params));
//sql generate
result.put("select", freemarkerTool.processString("code-generator/sql/select.ftl", params));
result.put("insert", freemarkerTool.processString("code-generator/sql/insert.ftl", params));
diff --git a/generator-web/src/main/resources/templates/code-generator/util/json.ftl b/generator-web/src/main/resources/templates/code-generator/util/json.ftl
new file mode 100644
index 0000000..a0be13a
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/util/json.ftl
@@ -0,0 +1,7 @@
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+{
+<#list classInfo.fieldList as fieldItem>
+ "${fieldItem.fieldName}":""<#if fieldItem_has_next>,#if>
+#list>
+}
+#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/util/util.ftl b/generator-web/src/main/resources/templates/code-generator/util/util.ftl
index 7176745..13da0ab 100644
--- a/generator-web/src/main/resources/templates/code-generator/util/util.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/util/util.ftl
@@ -13,4 +13,9 @@ ${fieldItem.fieldClass} ${fieldItem.fieldName} = ${classInfo.className?uncap_fir
// ${fieldItem.fieldComment}
${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}();
#list>
+
+<#list classInfo.fieldList as fieldItem>
+// ${fieldItem.fieldComment}
+${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}(${classInfo.className?uncap_first}2.get${fieldItem.fieldName?cap_first}(););
+#list>
#if>
diff --git a/generator-web/src/main/resources/templates/code-generator/util/xml.ftl b/generator-web/src/main/resources/templates/code-generator/util/xml.ftl
new file mode 100644
index 0000000..d815657
--- /dev/null
+++ b/generator-web/src/main/resources/templates/code-generator/util/xml.ftl
@@ -0,0 +1,11 @@
+
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+<${classInfo.className}>
+<#list classInfo.fieldList as fieldItem>
+ <${fieldItem.fieldName}>${fieldItem.fieldName}>
+#list>
+${classInfo.className}>
+#if>
diff --git a/generator-web/src/main/resources/templates/common/common-import.ftl b/generator-web/src/main/resources/templates/common/common-import.ftl
index c307aae..3e6c424 100644
--- a/generator-web/src/main/resources/templates/common/common-import.ftl
+++ b/generator-web/src/main/resources/templates/common/common-import.ftl
@@ -16,6 +16,8 @@
+
+
+
-
diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl
index 4195e2e..0550ff2 100644
--- a/generator-web/src/main/resources/templates/index.ftl
+++ b/generator-web/src/main/resources/templates/index.ftl
@@ -9,7 +9,6 @@
<@netCommon.commonStyle />
<@netCommon.commonScript />
- <#---->