Skip to content

Commit 1b5d79d

Browse files
moshowgamemoshowgame
committed
1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml.
1 parent c5186ce commit 1b5d79d

File tree

7 files changed

+54
-26
lines changed

7 files changed

+54
-26
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SpringBootCodeGenerator
1616
<tr><td>CSDN博客</td> <td>http://zhengkai.blog.csdn.net</td></tr>
1717
<tr><td></td> <td></td></tr>
1818
<tr><td>更新日期</td> <td>更新内容</td></tr>
19+
<tr><td>20191123<td>1.移除频繁出错和被过滤的layer,改为jquery-toast. 2.Util功能优化,新增json和xml.</td></tr>
1920
<tr><td>20191116<td>优化对primary关键字的处理(感谢@liujiansgit的反馈). </td></tr>
2021
<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>
2122
<tr><td>20191015<td>修复jdbcTemplates中insert语句第一个字段丢失的问题. </td></tr>

‎generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ public ReturnT<Map<String, String>> codeGenerate(String tableSql,
9292
result.put("plusmapper", freemarkerTool.processString("code-generator/mybatis-plus/plusmapper.ftl", params));
9393
//util
9494
result.put("util", freemarkerTool.processString("code-generator/util/util.ftl", params));
95+
result.put("json", freemarkerTool.processString("code-generator/util/json.ftl", params));
96+
result.put("xml", freemarkerTool.processString("code-generator/util/xml.ftl", params));
9597
//sql generate
9698
result.put("select", freemarkerTool.processString("code-generator/sql/select.ftl", params));
9799
result.put("insert", freemarkerTool.processString("code-generator/sql/insert.ftl", params));

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
2+
{
3+
<#list classInfo.fieldList as fieldItem>
4+
"${fieldItem.fieldName}":""<#if fieldItem_has_next>,</#if>
5+
</#list>
6+
}
7+
</#if>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ ${fieldItem.fieldClass} ${fieldItem.fieldName} = ${classInfo.className?uncap_fir
1313
// ${fieldItem.fieldComment}
1414
${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}();
1515
</#list>
16+
17+
<#list classInfo.fieldList as fieldItem>
18+
// ${fieldItem.fieldComment}
19+
${classInfo.className?uncap_first}.set${fieldItem.fieldName?cap_first}(${classInfo.className?uncap_first}2.get${fieldItem.fieldName?cap_first}(););
20+
</#list>
1621
</#if>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
${classInfo.classComment}对象Get Set
3+
@author ${authorName} ${.now?string('yyyy-MM-dd')}
4+
-->
5+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
6+
<${classInfo.className}>
7+
<#list classInfo.fieldList as fieldItem>
8+
<${fieldItem.fieldName}></${fieldItem.fieldName}>
9+
</#list>
10+
</${classInfo.className}>
11+
</#if>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
<link href="//cdn.staticfile.org/codemirror/5.48.4/codemirror.min.css" rel="stylesheet">
1818

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

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<@netCommon.commonStyle />
1010
<@netCommon.commonScript />
1111

12-
<#--<script src="${request.contextPath}/static/js/index-new.js"></script>-->
1312
<script>
1413
1514
<@netCommon.viewerCounter />
@@ -25,6 +24,7 @@
2524
lineWrapping:false,
2625
readOnly:false,
2726
foldGutter: true,
27+
//keyMap:"sublime",
2828
gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
2929
});
3030
ddlSqlArea.setSize('auto','auto');
@@ -34,8 +34,9 @@
3434
matchBrackets: true,
3535
mode: "text/x-java",
3636
lineWrapping:true,
37-
readOnly:true,
37+
readOnly:false,
3838
foldGutter: true,
39+
//keyMap:"sublime",
3940
gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
4041
});
4142
genCodeArea.setSize('auto','auto');
@@ -46,7 +47,6 @@
4647
* 生成代码
4748
*/
4849
$('#btnGenCode').click(function () {
49-
5050
var tableSql = ddlSqlArea.getValue();
5151
$.ajax({
5252
type: 'POST',
@@ -61,15 +61,12 @@
6161
dataType: "json",
6262
success: function (data) {
6363
if (data.code == 200) {
64-
layer.msg("代码生成成功");
6564
codeData = data.data;
6665
genCodeArea.setValue(codeData.beetlentity);
6766
genCodeArea.setSize('auto', 'auto');
67+
$.toast("√ 代码生成成功");
6868
} else {
69-
layer.open({
70-
icon: '2',
71-
content: (data.msg || '代码生成失败')
72-
});
69+
$.toast("× 代码生成失败");
7370
}
7471
}
7572
});
@@ -104,7 +101,7 @@
104101
$('#btnCopy').on('click', function(){
105102
if(!$.isEmptyObject(genCodeArea.getValue())&&!$.isEmptyObject(navigator)&&!$.isEmptyObject(navigator.clipboard)){
106103
navigator.clipboard.writeText(genCodeArea.getValue());
107-
layer.msg("复制成功");
104+
$.toast("√ 复制成功");
108105
}
109106
});
110107
@@ -169,21 +166,21 @@
169166
</select>
170167
</div>
171168
<textarea id="ddlSqlArea" placeholder="请输入表结构信息..." class="form-control btn-lg" style="height: 250px;">
172-
CREATE TABLE `userinfo` (
173-
`user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
174-
`username` varchar(255) NOT NULL COMMENT '用户名',
175-
`addtime` datetime NOT NULL COMMENT '创建时间',
176-
PRIMARY KEY (`user_id`)
169+
CREATE TABLE 'userinfo' (
170+
'user_id' int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
171+
'username' varchar(255) NOT NULL COMMENT '用户名',
172+
'addtime' datetime NOT NULL COMMENT '创建时间',
173+
PRIMARY KEY ('user_id')
177174
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息'
178175
</textarea><br>
179-
<p><button class="btn btn-primary btn-lg disabled" id="btnGenCode" role="button">开始生成 »</button> <button class="btn alert-secondary" id="btnCopy">一键复制</button></p>
176+
<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>
180177
<hr>
181178
<!-- Example row of columns -->
182179
<div class="row" style="margin-top: 10px;">
183180
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
184181
<div class="input-group">
185182
<div class="input-group-prepend">
186-
<div class="btn btn-secondary disabled" id="btnGroupAddon">通用实体</div>
183+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">通用实体</div>
187184
</div>
188185
</div>
189186
<div class="btn-group" role="group" aria-label="First group">
@@ -194,7 +191,7 @@ CREATE TABLE `userinfo` (
194191
<div class="btn-toolbar col-md-7" role="toolbar" aria-label="Toolbar with button groups">
195192
<div class="input-group">
196193
<div class="input-group-prepend">
197-
<div class="btn btn-secondary disabled" id="btnGroupAddon">Mybatis</div>
194+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">Mybatis</div>
198195
</div>
199196
</div>
200197
<div class="btn-group" role="group" aria-label="First group">
@@ -211,7 +208,7 @@ CREATE TABLE `userinfo` (
211208
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
212209
<div class="input-group">
213210
<div class="input-group-prepend">
214-
<div class="btn btn-secondary disabled" id="btnGroupAddon">MybatisPlus</div>
211+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">MybatisPlus</div>
215212
</div>
216213
</div>
217214
<div class="btn-group" role="group" aria-label="First group">
@@ -223,7 +220,7 @@ CREATE TABLE `userinfo` (
223220
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
224221
<div class="input-group">
225222
<div class="input-group-prepend">
226-
<div class="btn btn-secondary disabled" id="btnGroupAddon">UI</div>
223+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">UI</div>
227224
</div>
228225
</div>
229226
<div class="btn-group" role="group" aria-label="First group">
@@ -238,7 +235,7 @@ CREATE TABLE `userinfo` (
238235
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
239236
<div class="input-group">
240237
<div class="input-group-prepend">
241-
<div class="btn btn-secondary disabled" id="btnGroupAddon">BeetlSQL</div>
238+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">BeetlSQL</div>
242239
</div>
243240
</div>
244241
<div class="btn-group" role="group" aria-label="First group">
@@ -249,7 +246,7 @@ CREATE TABLE `userinfo` (
249246
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
250247
<div class="input-group">
251248
<div class="input-group-prepend">
252-
<div class="btn btn-secondary disabled" id="btnGroupAddon">JPA</div>
249+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">JPA</div>
253250
</div>
254251
</div>
255252
<div class="btn-group" role="group" aria-label="First group">
@@ -263,7 +260,7 @@ CREATE TABLE `userinfo` (
263260
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
264261
<div class="input-group">
265262
<div class="input-group-prepend">
266-
<div class="btn btn-secondary disabled" id="btnGroupAddon">JdbcTemplate</div>
263+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">JdbcTemplate</div>
267264
</div>
268265
</div>
269266
<div class="btn-group" role="group" aria-label="First group">
@@ -274,7 +271,7 @@ CREATE TABLE `userinfo` (
274271
<div class="btn-toolbar col-md-7" role="toolbar" aria-label="Toolbar with button groups">
275272
<div class="input-group">
276273
<div class="input-group-prepend">
277-
<div class="btn btn-secondary disabled" id="btnGroupAddon">SQL</div>
274+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">SQL</div>
278275
</div>
279276
</div>
280277
<div class="btn-group" role="group" aria-label="First group">
@@ -289,7 +286,7 @@ CREATE TABLE `userinfo` (
289286
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
290287
<div class="input-group">
291288
<div class="input-group-prepend">
292-
<div class="btn btn-secondary disabled" id="btnGroupAddon">DTO</div>
289+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">DTO</div>
293290
</div>
294291
</div>
295292
<div class="btn-group" role="group" aria-label="First group">
@@ -299,18 +296,21 @@ CREATE TABLE `userinfo` (
299296
<div class="btn-toolbar col-md-5" role="toolbar" aria-label="Toolbar with button groups">
300297
<div class="input-group">
301298
<div class="input-group-prepend">
302-
<div class="btn btn-secondary disabled" id="btnGroupAddon">Util</div>
299+
<div class="btn btn-secondary disabled setWidth" id="btnGroupAddon">Util</div>
303300
</div>
304301
</div>
305302
<div class="btn-group" role="group" aria-label="First group">
306303
<button type="button" class="btn btn-default generator" id="util">bean get set</button>
304+
<button type="button" class="btn btn-default generator" id="json">json</button>
305+
<button type="button" class="btn btn-default generator" id="xml">xml</button>
307306
</div>
308307
</div>
309308
</div>
310309
<hr>
311310
<textarea id="genCodeArea" class="form-control btn-lg" ></textarea>
312311
</div>
313312
</div>
313+
314314
<@netCommon.commonFooter />
315315
</body>
316316
</html>

0 commit comments

Comments
 (0)