1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml.

README.md

@@ -16,6 +16,7 @@ SpringBootCodeGenerator
 <tr><td>CSDN博客</td> <td>http://zhengkai.blog.csdn.net</td></tr>
 <tr><td></td> <td></td></tr>
 <tr><td>更新日期</td> <td>更新内容</td></tr>
+<tr><td>20191123<td>1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml.</td></tr>   
 <tr><td>20191116<td>优化对primary关键字的处理(感谢@liujiansgit的反馈). </td></tr>   
 <tr><td>20191115<td>1.添加tinyint类型转换(感谢@lixiliang&@liujiansgit的Suggestion) 2.添加一键复制功能(感谢@gaohanghang的Suggestion) 3.Mybatis的insert增加keyProperty="id"用于返回自增id(感谢@88888888888888888888的Suggestion) 4.优化date类型的支持(感谢@SteveLsf的反馈) 5.其他一些优化. </td></tr> 
 <tr><td>20191015<td>修复jdbcTemplates中insert语句第一个字段丢失的问题. </td></tr>   

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));

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>

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>

generator-web/src/main/resources/templates/code-generator/util/xml.ftl

@@ -0,0 +1,11 @@
+<!--
+ ${classInfo.classComment}对象Get Set
+ @author ${authorName} ${.now?string('yyyy-MM-dd')}
+-->
+<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
+<${classInfo.className}>
+<#list classInfo.fieldList as fieldItem>
+ <${fieldItem.fieldName}></${fieldItem.fieldName}>
+</#list>
+</${classInfo.className}>
+</#if>

generator-web/src/main/resources/templates/common/common-import.ftl

@@ -16,6 +16,8 @@
 
     <link href="//cdn.staticfile.org/codemirror/5.48.4/codemirror.min.css" rel="stylesheet">
 
+    <link href="//cdn.bootcss.com/jquery-toast-plugin/1.3.2/jquery.toast.min.css" rel="stylesheet">
+
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -32,10 +34,10 @@
     <script src="//cdn.staticfile.org/jquery/3.4.1/jquery.min.js"></script>
     <!-- Bootstrap -->
     <script src="//cdn.staticfile.org/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="//cdn.bootcss.com/jquery-toast-plugin/1.3.2/jquery.toast.min.js"></script>
     <!-- FastClick -->
     <script src="//cdn.staticfile.org/fastclick/1.0.6/fastclick.min.js"></script>
     <script src="//cdn.staticfile.org/jQuery-slimScroll/1.3.8/jquery.slimscroll.min.js"></script>
-    <script src="//cdn.staticfile.org/layer/2.3/layer.js"></script>
     <script src="//cdn.staticfile.org/codemirror/5.48.4/codemirror.min.js"></script>
     <script src="//cdn.staticfile.org/codemirror/5.48.4/addon/display/placeholder.min.js"></script>
     <script src="//cdn.staticfile.org/codemirror/5.48.4/mode/clike/clike.min.js"></script>

generator-web/src/main/resources/templates/index.ftl

@@ -9,7 +9,6 @@
     <@netCommon.commonStyle />
     <@netCommon.commonScript />
 
-    <#--<script src="${request.contextPath}/static/js/index-new.js"></script>-->
 <script>
 
     <@netCommon.viewerCounter />
@@ -25,6 +24,7 @@
             lineWrapping:false,
             readOnly:false,
             foldGutter: true,
+            //keyMap:"sublime",
             gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
         });
         ddlSqlArea.setSize('auto','auto');
@@ -34,8 +34,9 @@
             matchBrackets: true,
             mode: "text/x-java",
             lineWrapping:true,
-            readOnly:true,
+            readOnly:false,
             foldGutter: true,
+            //keyMap:"sublime",
             gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
         });
         genCodeArea.setSize('auto','auto');
@@ -46,7 +47,6 @@
          * 生成代码
          */
         $('#btnGenCode').click(function ()  {
-
             var tableSql = ddlSqlArea.getValue();
             $.ajax({
                 type: 'POST',
@@ -61,15 +61,12 @@
                 dataType: "json",
                 success: function (data) {
                     if (data.code == 200) {
-                        layer.msg("代码生成成功");
                         codeData = data.data;
                         genCodeArea.setValue(codeData.beetlentity);
                         genCodeArea.setSize('auto', 'auto');
+                        $.toast("√ 代码生成成功");
                     } else {
-                        layer.open({
+                        $.toast("× 代码生成失败");
-                            icon: '2',
-                            content: (data.msg || '代码生成失败')
-                        });
                     }
                 }
             });
@@ -104,7 +101,7 @@
         $('#btnCopy').on('click', function(){
             if(!$.isEmptyObject(genCodeArea.getValue())&&!$.isEmptyObject(navigator)&&!$.isEmptyObject(navigator.clipboard)){
                 navigator.clipboard.writeText(genCodeArea.getValue());
-                layer.msg("复制成功");
+                $.toast("√ 复制成功");
             }
         });
 
@@ -169,21 +166,21 @@
             </select>
         </div>
         <textarea id="ddlSqlArea" placeholder="请输入表结构信息..." class="form-control btn-lg" style="height: 250px;">
-CREATE TABLE `userinfo` (
+CREATE TABLE 'userinfo' (
-  `user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  'user_id' int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  `username` varchar(255) NOT NULL COMMENT '用户名',
+  'username' varchar(255) NOT NULL COMMENT '用户名',
-  `addtime` datetime NOT NULL COMMENT '创建时间',
+  'addtime' datetime NOT NULL COMMENT '创建时间',
-  PRIMARY KEY (`user_id`)
+  PRIMARY KEY ('user_id')
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息'
         </textarea><br>
-        <p><button class="btn btn-primary btn-lg disabled" id="btnGenCode" role="button">开始生成 »</button> <button class="btn alert-secondary" id="btnCopy">一键复制</button></p>
+        <p><button class="btn btn-primary btn-lg disabled" id="btnGenCode" role="button" data-toggle="popover" data-content="">开始生成 »</button> <button class="btn alert-secondary" id="btnCopy">一键复制</button></p>
         <hr>
         <!-- Example row of columns -->
         <div class="row" style="margin-top: 10px;">
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">通用实体</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">通用实体</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -194,7 +191,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-7" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">Mybatis</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">Mybatis</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -211,7 +208,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">MybatisPlus</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">MybatisPlus</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -223,7 +220,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">UI</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">UI</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -238,7 +235,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">BeetlSQL</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">BeetlSQL</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -249,7 +246,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">JPA</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">JPA</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -263,7 +260,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">JdbcTemplate</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">JdbcTemplate</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -274,7 +271,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-7" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">SQL</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">SQL</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -289,7 +286,7 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">DTO</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">DTO</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
@@ -299,11 +296,13 @@ CREATE TABLE `userinfo` (
             <div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
                 <div class="input-group">
                     <div class="input-group-prepend">
-                        <div class="btn btn-secondary disabled" id="btnGroupAddon">Util</div>
+                        <div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">Util</div>
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
                     <button type="button" class="btn btn-default generator" id="util">bean get set</button>
+                    <button type="button" class="btn btn-default generator" id="json">json</button>
+                    <button type="button" class="btn btn-default generator" id="xml">xml</button>
                 </div>
             </div>
         </div>
@@ -311,6 +310,7 @@ CREATE TABLE `userinfo` (
         <textarea id="genCodeArea" class="form-control btn-lg" ></textarea>
     </div>
 </div>
+
     <@netCommon.commonFooter />
 </body>
 </html>