Skip to content

Commit 20f550d

Browse files
elunezelunez
committed
代码结构优化
1 parent d14835a commit 20f550d

File tree

12 files changed

+7
-7
lines changed

12 files changed

+7
-7
lines changed

‎eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static List<Map<String, Object>> preview(List<ColumnInfo> columns, GenCon
8787
TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
8888
for (String templateName : templates) {
8989
Map<String, Object> map = new HashMap<>(1);
90-
Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
90+
Template template = engine.getTemplate("admin/" + templateName + ".ftl");
9191
map.put("content", template.render(genMap));
9292
map.put("name", templateName);
9393
genList.add(map);
@@ -96,7 +96,7 @@ public static List<Map<String, Object>> preview(List<ColumnInfo> columns, GenCon
9696
templates = getFrontTemplateNames();
9797
for (String templateName : templates) {
9898
Map<String, Object> map = new HashMap<>(1);
99-
Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
99+
Template template = engine.getTemplate("front/" + templateName + ".ftl");
100100
map.put(templateName, template.render(genMap));
101101
map.put("content", template.render(genMap));
102102
map.put("name", templateName);
@@ -114,7 +114,7 @@ public static String download(List<ColumnInfo> columns, GenConfig genConfig) thr
114114
// 生成后端代码
115115
List<String> templates = getAdminTemplateNames();
116116
for (String templateName : templates) {
117-
Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
117+
Template template = engine.getTemplate("admin/" + templateName + ".ftl");
118118
String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), tempPath + "eladmin" + File.separator);
119119
assert filePath != null;
120120
File file = new File(filePath);
@@ -128,7 +128,7 @@ public static String download(List<ColumnInfo> columns, GenConfig genConfig) thr
128128
// 生成前端代码
129129
templates = getFrontTemplateNames();
130130
for (String templateName : templates) {
131-
Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
131+
Template template = engine.getTemplate("front/" + templateName + ".ftl");
132132
String path = tempPath + "eladmin-web" + File.separator;
133133
String apiPath = path + "src" + File.separator + "api" + File.separator;
134134
String srcPath = path + "src" + File.separator + "views" + File.separator + genMap.get("changeClassName").toString() + File.separator;
@@ -151,7 +151,7 @@ public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConf
151151
// 生成后端代码
152152
List<String> templates = getAdminTemplateNames();
153153
for (String templateName : templates) {
154-
Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl");
154+
Template template = engine.getTemplate("admin/" + templateName + ".ftl");
155155
String rootPath = System.getProperty("user.dir");
156156
String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), rootPath);
157157

@@ -169,7 +169,7 @@ public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConf
169169
// 生成前端代码
170170
templates = getFrontTemplateNames();
171171
for (String templateName : templates) {
172-
Template template = engine.getTemplate("generator/front/" + templateName + ".ftl");
172+
Template template = engine.getTemplate("front/" + templateName + ".ftl");
173173
String filePath = getFrontFilePath(templateName, genConfig.getApiPath(), genConfig.getPath(), genMap.get("changeClassName").toString());
174174

175175
assert filePath != null;

‎eladmin-system/src/main/resources/generator.properties renamed to ‎eladmin-generator/src/main/resources/generator.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#数据库类型转Java类型
1+
# Database type to Java type
22
tinyint=Integer
33
smallint=Integer
44
mediumint=Integer

‎eladmin-system/src/main/resources/template/generator/admin/Controller.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Controller.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/Dto.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Dto.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/Entity.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Entity.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Mapper.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/Repository.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Repository.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/Service.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/Service.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl renamed to ‎eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/front/api.ftl renamed to ‎eladmin-generator/src/main/resources/template/front/api.ftl

File renamed without changes.

‎eladmin-system/src/main/resources/template/generator/front/index.ftl renamed to ‎eladmin-generator/src/main/resources/template/front/index.ftl

File renamed without changes.

0 commit comments

Comments
 (0)