Skip to content

Commit 16c7f68

Browse files
committed
new index html with CDN and new jdbc-template model
1 parent 8a15750 commit 16c7f68

123 files changed

Lines changed: 435 additions & 16685 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
![image](https://img.shields.io/badge/CodeGenerator-%E2%98%85%E2%98%85%E2%98%85-green.svg)
33
SpringBootCodeGenerator
44
----
5-
基于SpringBoot2+xxl-codegenerator的代码生成器。用于生成mybatis和jpa相关代码,目前jpa的为主,mybatis的后续进行优化
5+
基于SpringBoot2+xxl-codegenerator的代码生成器。用DDL语句生成JPA/JdbcTemplate/Mybatis相关代码,目前以JPA的为主,各大模板也在陆续优化
66
<br><br>
77
感谢bejson三叔将他部署在http://java.bejson.com/generator上
88
<br><br>
@@ -12,7 +12,8 @@ SpringBootCodeGenerator
1212
<tr><td>CSDN博客</td> <td>http://blog.csdn.net/moshowgame</td></tr>
1313
<tr><td></td> <td></td></tr>
1414
<tr><td>更新日期</td> <td>更新内容</td></tr>
15-
<tr><td>20180916-2<td>优化oracle支持,空格/"/'的支持,以及多余内容的剔除。</td></tr>
15+
<tr><td>20180917<td>全新首页,静态文件全部采用CDN。新增jdbcTemplate模块。</td></tr>
16+
<tr><td>20180916-2<td>优化oracle支持,优化DDL语句中"或者'或者空格的支持。</td></tr>
1617
<tr><td>20180916-1<td>补充char/clob/blob/json等类型,如果类型未知,默认为String。</td></tr>
1718
<tr><td>20180915<td>新增Swagger-UI模板。修复一些命名和导入问题。JPA的Entity默认第一个字段为Id,如果不是请手工修改。</td></tr>
1819
<tr><td>20180913<td>修复字段没有描述以及类型为DATE型导致的问题。新增JPA的Controller模板。</td></tr>

codegenerator1.png

-9.18 KB
Loading

codegenerator2.png

-13.4 KB
Loading

codegenerator3.png

-2.94 KB
Loading

codegenerator4.png

-2.02 KB
Loading

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
import java.util.Map;
2020

2121
/**
22-
* sso server (for web)
23-
*
24-
* @author xuxueli 2017-08-01 21:39:47
22+
* spring boot code generator
23+
* @author zhengk/moshow
2524
*/
2625
@Controller
2726
public class IndexController {
@@ -37,7 +36,11 @@ public String index() {
3736

3837
@RequestMapping("/genCode")
3938
@ResponseBody
40-
public ReturnT<Map<String, String>> codeGenerate(String tableSql) {
39+
public ReturnT<Map<String, String>> codeGenerate(String tableSql,String authorName,String packageName) {
40+
41+
if(StringUtils.isBlank(authorName)) authorName="大狼狗";
42+
43+
if(StringUtils.isBlank(packageName)) packageName="com.softdev.system";
4144

4245
try {
4346

@@ -51,23 +54,26 @@ public ReturnT<Map<String, String>> codeGenerate(String tableSql) {
5154
// code genarete
5255
Map<String, Object> params = new HashMap<String, Object>();
5356
params.put("classInfo", classInfo);
57+
params.put("authorName", authorName);
58+
params.put("packageName", packageName);
5459

5560
// result
5661
Map<String, String> result = new HashMap<String, String>();
5762

58-
result.put("controller_code", freemarkerTool.processString("xxl-code-generator/controller.ftl", params));
59-
result.put("service_code", freemarkerTool.processString("xxl-code-generator/service.ftl", params));
60-
result.put("service_impl_code", freemarkerTool.processString("xxl-code-generator/service_impl.ftl", params));
61-
62-
result.put("dao_code", freemarkerTool.processString("xxl-code-generator/dao.ftl", params));
63-
result.put("mybatis_code", freemarkerTool.processString("xxl-code-generator/mybatis.ftl", params));
64-
result.put("model_code", freemarkerTool.processString("xxl-code-generator/model.ftl", params));
63+
result.put("controller", freemarkerTool.processString("xxl-code-generator/controller.ftl", params));
64+
result.put("service", freemarkerTool.processString("xxl-code-generator/service.ftl", params));
65+
result.put("service_impl", freemarkerTool.processString("xxl-code-generator/service_impl.ftl", params));
66+
result.put("dao", freemarkerTool.processString("xxl-code-generator/dao.ftl", params));
67+
result.put("mybatis", freemarkerTool.processString("xxl-code-generator/mybatis.ftl", params));
68+
result.put("model", freemarkerTool.processString("xxl-code-generator/model.ftl", params));
6569

66-
result.put("entity_code", freemarkerTool.processString("xxl-code-generator/entity.ftl", params));
67-
result.put("swaggerui_code", freemarkerTool.processString("xxl-code-generator/swaggerui.ftl", params));
68-
result.put("repository_code", freemarkerTool.processString("xxl-code-generator/repository.ftl", params));
70+
result.put("entity", freemarkerTool.processString("xxl-code-generator/entity.ftl", params));
71+
result.put("swaggerui", freemarkerTool.processString("xxl-code-generator/swagger-ui.ftl", params));
72+
result.put("repository", freemarkerTool.processString("xxl-code-generator/repository.ftl", params));
73+
result.put("jpacontroller", freemarkerTool.processString("xxl-code-generator/jpacontroller.ftl", params));
6974

70-
result.put("jpacontroller_code", freemarkerTool.processString("xxl-code-generator/jpacontroller.ftl", params));
75+
result.put("jtdao", freemarkerTool.processString("xxl-code-generator/jtdao.ftl", params));
76+
result.put("jtdaoimpl", freemarkerTool.processString("xxl-code-generator/jtdaoimpl.ftl", params));
7177

7278
// 计算,生成代码行数
7379
int lineNum = 0;
@@ -81,7 +87,7 @@ public ReturnT<Map<String, String>> codeGenerate(String tableSql) {
8187
return new ReturnT<Map<String, String>>(result);
8288
} catch (IOException | TemplateException e) {
8389
logger.error(e.getMessage(), e);
84-
return new ReturnT<Map<String, String>>(ReturnT.FAIL_CODE, "表结构解析失败");
90+
return new ReturnT<Map<String, String>>(ReturnT.FAIL_CODE, "表结构解析失败"+e.getMessage());
8591
}
8692

8793
}

generator-web/src/main/resources/static/adminlte/bootstrap/css/bootstrap.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

generator-web/src/main/resources/static/adminlte/bootstrap/css/bootstrap.min.css

Lines changed: 0 additions & 6 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)