From 20f550d527c979c596f7a87ed8da2f17e6ecf931 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 27 Jun 2023 09:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/utils/GenUtil.java | 12 ++++++------ .../src/main/resources/generator.properties | 2 +- .../main/resources/template}/admin/Controller.ftl | 0 .../src/main/resources/template}/admin/Dto.ftl | 0 .../src/main/resources/template}/admin/Entity.ftl | 0 .../src/main/resources/template}/admin/Mapper.ftl | 0 .../main/resources/template}/admin/QueryCriteria.ftl | 0 .../main/resources/template}/admin/Repository.ftl | 0 .../src/main/resources/template}/admin/Service.ftl | 0 .../main/resources/template}/admin/ServiceImpl.ftl | 0 .../src/main/resources/template}/front/api.ftl | 0 .../src/main/resources/template}/front/index.ftl | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename {eladmin-system => eladmin-generator}/src/main/resources/generator.properties (85%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Controller.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Dto.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Entity.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Mapper.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/QueryCriteria.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Repository.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/Service.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/admin/ServiceImpl.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/front/api.ftl (100%) rename {eladmin-system/src/main/resources/template/generator => eladmin-generator/src/main/resources/template}/front/index.ftl (100%) diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index b62efa2d..8c8a95aa 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -87,7 +87,7 @@ public class GenUtil { TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); for (String templateName : templates) { Map map = new HashMap<>(1); - Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl"); + Template template = engine.getTemplate("admin/" + templateName + ".ftl"); map.put("content", template.render(genMap)); map.put("name", templateName); genList.add(map); @@ -96,7 +96,7 @@ public class GenUtil { templates = getFrontTemplateNames(); for (String templateName : templates) { Map map = new HashMap<>(1); - Template template = engine.getTemplate("generator/front/" + templateName + ".ftl"); + Template template = engine.getTemplate("front/" + templateName + ".ftl"); map.put(templateName, template.render(genMap)); map.put("content", template.render(genMap)); map.put("name", templateName); @@ -114,7 +114,7 @@ public class GenUtil { // 生成后端代码 List templates = getAdminTemplateNames(); for (String templateName : templates) { - Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl"); + Template template = engine.getTemplate("admin/" + templateName + ".ftl"); String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), tempPath + "eladmin" + File.separator); assert filePath != null; File file = new File(filePath); @@ -128,7 +128,7 @@ public class GenUtil { // 生成前端代码 templates = getFrontTemplateNames(); for (String templateName : templates) { - Template template = engine.getTemplate("generator/front/" + templateName + ".ftl"); + Template template = engine.getTemplate("front/" + templateName + ".ftl"); String path = tempPath + "eladmin-web" + File.separator; String apiPath = path + "src" + File.separator + "api" + File.separator; String srcPath = path + "src" + File.separator + "views" + File.separator + genMap.get("changeClassName").toString() + File.separator; @@ -151,7 +151,7 @@ public class GenUtil { // 生成后端代码 List templates = getAdminTemplateNames(); for (String templateName : templates) { - Template template = engine.getTemplate("generator/admin/" + templateName + ".ftl"); + Template template = engine.getTemplate("admin/" + templateName + ".ftl"); String rootPath = System.getProperty("user.dir"); String filePath = getAdminFilePath(templateName, genConfig, genMap.get("className").toString(), rootPath); @@ -169,7 +169,7 @@ public class GenUtil { // 生成前端代码 templates = getFrontTemplateNames(); for (String templateName : templates) { - Template template = engine.getTemplate("generator/front/" + templateName + ".ftl"); + Template template = engine.getTemplate("front/" + templateName + ".ftl"); String filePath = getFrontFilePath(templateName, genConfig.getApiPath(), genConfig.getPath(), genMap.get("changeClassName").toString()); assert filePath != null; diff --git a/eladmin-system/src/main/resources/generator.properties b/eladmin-generator/src/main/resources/generator.properties similarity index 85% rename from eladmin-system/src/main/resources/generator.properties rename to eladmin-generator/src/main/resources/generator.properties index 2ed93706..e64d0608 100644 --- a/eladmin-system/src/main/resources/generator.properties +++ b/eladmin-generator/src/main/resources/generator.properties @@ -1,4 +1,4 @@ -#数据库类型转Java类型 +# Database type to Java type tinyint=Integer smallint=Integer mediumint=Integer diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-generator/src/main/resources/template/admin/Controller.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Controller.ftl rename to eladmin-generator/src/main/resources/template/admin/Controller.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/eladmin-generator/src/main/resources/template/admin/Dto.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Dto.ftl rename to eladmin-generator/src/main/resources/template/admin/Dto.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/eladmin-generator/src/main/resources/template/admin/Entity.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Entity.ftl rename to eladmin-generator/src/main/resources/template/admin/Entity.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-generator/src/main/resources/template/admin/Mapper.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl rename to eladmin-generator/src/main/resources/template/admin/Mapper.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl rename to eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/Repository.ftl b/eladmin-generator/src/main/resources/template/admin/Repository.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Repository.ftl rename to eladmin-generator/src/main/resources/template/admin/Repository.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl b/eladmin-generator/src/main/resources/template/admin/Service.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/Service.ftl rename to eladmin-generator/src/main/resources/template/admin/Service.ftl diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl rename to eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl diff --git a/eladmin-system/src/main/resources/template/generator/front/api.ftl b/eladmin-generator/src/main/resources/template/front/api.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/front/api.ftl rename to eladmin-generator/src/main/resources/template/front/api.ftl diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-generator/src/main/resources/template/front/index.ftl similarity index 100% rename from eladmin-system/src/main/resources/template/generator/front/index.ftl rename to eladmin-generator/src/main/resources/template/front/index.ftl