diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index 3560879a..6be2c48b 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -60,6 +60,10 @@ public class SpringBootCallable implements Callable { if (!src.exists()) { src.mkdirs(); } + File moduleDir = new File(src,"module"); + if (!moduleDir.exists()) { + moduleDir.mkdirs(); + } // 生成资源目录 stringBuffer = new StringBuffer(projectDir.getAbsolutePath() + File.separator + "src" + File.separator + "main"); @@ -102,14 +106,13 @@ public class SpringBootCallable implements Callable { { Module module = new Module(); - File api = new File(src.getAbsolutePath(), "api"); + File api = new File(moduleDir.getAbsolutePath(), "api"); api.mkdirs(); module.setModuleName("api"); module.setProjectAuthor(project.getProjectAuthor()); module.setProjectBasePackage(project.getProjectBasePackage()); module.setProjectName(project.getProjectName()); - System.out.println("生成模块:Entity"); generateEntity(new File(api.getAbsolutePath(), "ent"), module, dataBase, option); System.out.println("生成模块:Enums"); @@ -128,7 +131,7 @@ public class SpringBootCallable implements Callable { module.setProjectBasePackage(project.getProjectBasePackage()); module.setProjectName(project.getProjectName()); - File modulePath = new File(src.getAbsolutePath(), module.getModuleName()); + File modulePath = new File(moduleDir.getAbsolutePath(), module.getModuleName()); modulePath.mkdirs(); System.out.println("生成模块:Entity"); @@ -267,7 +270,7 @@ public class SpringBootCallable implements Callable { File file = new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + ".java"); - freeMarkerManager.outputTemp(file, option + "/java/ent/entity.ftl", ctx); + freeMarkerManager.outputTemp(file, option + "/java/module/ent/entity.ftl", ctx); } } @@ -301,7 +304,7 @@ public class SpringBootCallable implements Callable { if ("Enum".equals(field.getFieldType().javaType())) { ctx.put("Type", field.getCName()); ctx.put("FieldComment", field.getFieldComment()); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), field.getCName() + ".java"), option + "/java/enums/Type.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), field.getCName() + ".java"), option + "/java/module/enums/Type.ftl", ctx); } } } @@ -331,12 +334,12 @@ public class SpringBootCallable implements Callable { for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".java"), option + "/java/mpr/mapperJava.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".java"), option + "/java/module/mpr/mapperJava.ftl", ctx); if (md.isHasSysFields()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), option + "/java/mpr/mapper.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), option + "/java/module/mpr/mapper.ftl", ctx); } else { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), option + "/java/mpr/mapper_nosys.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Mapper" + ".xml"), option + "/java/module/mpr/mapper_nosys.ftl", ctx); } } } @@ -357,14 +360,14 @@ public class SpringBootCallable implements Callable { ctx.put("date", new Date()); if (md.getModuleName().equals("api")) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiManager" + ".java"), option + "/java/mgr/ApiManager.java", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiManagerImpl" + ".java"), option + "/java/mgr/ApiManagerImpl.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiManager" + ".java"), option + "/java/module/mgr/ApiManager.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiManagerImpl" + ".java"), option + "/java/module/mgr/ApiManagerImpl.java", ctx); } for (Table table : md.getTables()) { ctx.put("table", table); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Manager" + ".java"), option + "/java/mgr/manager.ftl", ctx); - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "ManagerImpl" + ".java"), option + "/java/mgr/managerImpl.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "Manager" + ".java"), option + "/java/module/mgr/manager.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "ManagerImpl" + ".java"), option + "/java/module/mgr/managerImpl.ftl", ctx); } } @@ -390,37 +393,37 @@ public class SpringBootCallable implements Callable { ctx.put("date", new Date()); if (md.getModuleName().equals("api")) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiExampleRequest" + ".java"), option + "/java/req/ApiExampleRequest.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiExampleRequest" + ".java"), option + "/java/module/req/ApiExampleRequest.java", ctx); } for (Table table : md.getTables()) { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateRequest" + ".java"), option + "/java/req/createRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateRequest" + ".java"), option + "/java/module/req/createRequestClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteRequest" + ".java"), option + "/java/req/deleteRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteRequest" + ".java"), option + "/java/module/req/deleteRequestClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateRequest" + ".java"), option + "/java/req/updateRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateRequest" + ".java"), option + "/java/module/req/updateRequestClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindRequest" + ".java"), option + "/java/req/findRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindRequest" + ".java"), option + "/java/module/req/findRequestClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetRequest" + ".java"), option + "/java/req/getRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetRequest" + ".java"), option + "/java/module/req/getRequestClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchRequest" + ".java"), option + "/java/req/searchRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchRequest" + ".java"), option + "/java/module/req/searchRequestClass.ftl", ctx); } if (table.getGetAll()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetAllRequest" + ".java"), option + "/java/req/getAllRequestClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetAllRequest" + ".java"), option + "/java/module/req/getAllRequestClass.ftl", ctx); } } } @@ -447,37 +450,37 @@ public class SpringBootCallable implements Callable { ctx.put("date", new Date()); if (md.getModuleName().equals("api")) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiExampleResponse" + ".java"), option + "/java/rsp/ApiExampleResponse.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ApiExampleResponse" + ".java"), option + "/java/module/rsp/ApiExampleResponse.java", ctx); } for (Table table : md.getTables()) { ctx.put("table", table); if (table.getCreate()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateResponse" + ".java"), option + "/java/rsp/createResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "CreateResponse" + ".java"), option + "/java/module/rsp/createResponseClass.ftl", ctx); } if (table.getDelete()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteResponse" + ".java"), option + "/java/rsp/deleteResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "DeleteResponse" + ".java"), option + "/java/module/rsp/deleteResponseClass.ftl", ctx); } if (table.getUpdate()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateResponse" + ".java"), option + "/java/rsp/updateResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "UpdateResponse" + ".java"), option + "/java/module/rsp/updateResponseClass.ftl", ctx); } if (table.getFind()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindResponse" + ".java"), option + "/java/rsp/findResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "FindResponse" + ".java"), option + "/java/module/rsp/findResponseClass.ftl", ctx); } if (table.getGet()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetResponse" + ".java"), option + "/java/rsp/getResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetResponse" + ".java"), option + "/java/module/rsp/getResponseClass.ftl", ctx); } if (table.getSearch()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchResponse" + ".java"), option + "/java/rsp/searchResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "SearchResponse" + ".java"), option + "/java/module/rsp/searchResponseClass.ftl", ctx); } if (table.getGetAll()) { - freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetAllResponse" + ".java"), option + "/java/rsp/getAllResponseClass.ftl", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), Tool.lineToClassName(table.getTableName()) + "GetAllResponse" + ".java"), option + "/java/module/rsp/getAllResponseClass.ftl", ctx); } } } diff --git a/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl b/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl index 149d60f4..7d835def 100644 --- a/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.InputStreamReader; <#list modules as m> -import ${basePackage}.${m.moduleName}.req.*; -import ${basePackage}.${m.moduleName}.mgr.*; +import ${basePackage}.module.${m.moduleName}.req.*; +import ${basePackage}.module.${m.moduleName}.mgr.*; import ${basePackage}.frame.utils.LocalData; import ${basePackage}.frame.utils.MapperUtil; diff --git a/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl b/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl index 9226c52a..d1831cd7 100644 --- a/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.InputStreamReader; <#list modules as m> -import ${basePackage}.${m.moduleName}.req.*; -import ${basePackage}.${m.moduleName}.mgr.*; +import ${basePackage}.module.${m.moduleName}.req.*; +import ${basePackage}.module.${m.moduleName}.mgr.*; import ${basePackage}.frame.utils.LocalData; import ${basePackage}.frame.utils.MapperUtil; diff --git a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl b/src/main/resources/modules/SpringBoot/java/module/ent/entity.ftl similarity index 92% rename from src/main/resources/modules/SpringBoot/java/ent/entity.ftl rename to src/main/resources/modules/SpringBoot/java/module/ent/entity.ftl index 93214e86..c0d6abec 100644 --- a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/ent/entity.ftl @@ -1,11 +1,11 @@ -package ${basePackage}.${moduleName}.ent; +package ${basePackage}.module.${moduleName}.ent; <#if table.has('Date')> import java.util.Date; <#list table.fields as field> <#if field.fieldType.javaType() == "Enum"> -import ${basePackage}.${moduleName}.enums.${field.getCName()}; +import ${basePackage}.module.${moduleName}.enums.${field.getCName()}; import ${basePackage}.frame.base.BaseEntity; diff --git a/src/main/resources/modules/SpringBoot/java/enums/Type.ftl b/src/main/resources/modules/SpringBoot/java/module/enums/Type.ftl similarity index 75% rename from src/main/resources/modules/SpringBoot/java/enums/Type.ftl rename to src/main/resources/modules/SpringBoot/java/module/enums/Type.ftl index b9d442e3..9a643848 100644 --- a/src/main/resources/modules/SpringBoot/java/enums/Type.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/enums/Type.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.enums; +package ${basePackage}.module.${moduleName}.enums; /** diff --git a/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java b/src/main/resources/modules/SpringBoot/java/module/mgr/ApiManager.java similarity index 70% rename from src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java rename to src/main/resources/modules/SpringBoot/java/module/mgr/ApiManager.java index da155139..56b38423 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/ApiManager.java @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.mgr; +package ${basePackage}.module.${moduleName}.mgr; -import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.${moduleName}.rsp.*; +import ${basePackage}.module.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.rsp.*; import ${basePackage}.frame.base.Token; /** diff --git a/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/mgr/ApiManagerImpl.java similarity index 79% rename from src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java rename to src/main/resources/modules/SpringBoot/java/module/mgr/ApiManagerImpl.java index 51180bcd..130ab58e 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/ApiManagerImpl.java @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.mgr; +package ${basePackage}.module.${moduleName}.mgr; -import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.${moduleName}.rsp.*; +import ${basePackage}.module.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.rsp.*; import ${basePackage}.frame.base.Token; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/resources/modules/SpringBoot/java/mgr/manager.ftl b/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl similarity index 92% rename from src/main/resources/modules/SpringBoot/java/mgr/manager.ftl rename to src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl index bf1fd7f7..d157915e 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/manager.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.mgr; +package ${basePackage}.module.${moduleName}.mgr; -import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.${moduleName}.rsp.*; +import ${basePackage}.module.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.rsp.*; import ${basePackage}.frame.base.Token; /** diff --git a/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl similarity index 96% rename from src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl rename to src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl index 515efbcc..2fe246b4 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.mgr; +package ${basePackage}.module.${moduleName}.mgr; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.Message; @@ -6,10 +6,10 @@ import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.Token; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.ValidationUtil; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; -import ${basePackage}.${moduleName}.mpr.${table.getCName()}Mapper; -import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.${moduleName}.rsp.*; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper; +import ${basePackage}.module.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.rsp.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.github.pagehelper.util.StringUtil; diff --git a/src/main/resources/modules/SpringBoot/java/mpr/mapper.ftl b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.ftl similarity index 96% rename from src/main/resources/modules/SpringBoot/java/mpr/mapper.ftl rename to src/main/resources/modules/SpringBoot/java/module/mpr/mapper.ftl index 2da72bdb..ee941bf7 100644 --- a/src/main/resources/modules/SpringBoot/java/mpr/mapper.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.ftl @@ -2,7 +2,7 @@ - + <#if dataBase == 'ORACLE'> @@ -19,7 +19,7 @@ - + <#list table.fields as f> diff --git a/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl b/src/main/resources/modules/SpringBoot/java/module/mpr/mapperJava.ftl similarity index 93% rename from src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl rename to src/main/resources/modules/SpringBoot/java/module/mpr/mapperJava.ftl index 168d3d73..547c19e4 100644 --- a/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mpr/mapperJava.ftl @@ -1,12 +1,12 @@ -package ${basePackage}.${moduleName}.mpr; +package ${basePackage}.module.${moduleName}.mpr; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; import java.util.List; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; -import ${basePackage}.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.req.*; import ${basePackage}.frame.base.Token; /** diff --git a/src/main/resources/modules/SpringBoot/java/mpr/mapper_nosys.ftl b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper_nosys.ftl similarity index 93% rename from src/main/resources/modules/SpringBoot/java/mpr/mapper_nosys.ftl rename to src/main/resources/modules/SpringBoot/java/module/mpr/mapper_nosys.ftl index 4d68cb55..7b1fac42 100644 --- a/src/main/resources/modules/SpringBoot/java/mpr/mapper_nosys.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper_nosys.ftl @@ -2,7 +2,7 @@ - + <#if dataBase == 'ORACLE'> @@ -19,7 +19,7 @@ - + <#list table.fields as f> diff --git a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java b/src/main/resources/modules/SpringBoot/java/module/req/ApiExampleRequest.java similarity index 87% rename from src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java rename to src/main/resources/modules/SpringBoot/java/module/req/ApiExampleRequest.java index aeaf2c57..0215ae4a 100644 --- a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/req/ApiExampleRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseRequest; diff --git a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl similarity index 94% rename from src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl index 6d739d23..a78171ab 100644 --- a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseRequest; <#if table.has('Date')> @@ -6,7 +6,7 @@ import java.util.Date; <#list table.fields as field> <#if field.fieldType.javaType() == "Enum"> -import ${basePackage}.${moduleName}.enums.${field.getCName()}; +import ${basePackage}.module.${moduleName}.enums.${field.getCName()}; import javax.validation.constraints.NotNull; diff --git a/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl similarity index 96% rename from src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl index 25aeb1b5..1c0dfe9b 100644 --- a/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/deleteRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseUpdateRequest; import javax.validation.constraints.NotNull; diff --git a/src/main/resources/modules/SpringBoot/java/req/findRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl similarity index 92% rename from src/main/resources/modules/SpringBoot/java/req/findRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl index b0e511fa..05d6a537 100644 --- a/src/main/resources/modules/SpringBoot/java/req/findRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseFindRequest; <#if table.has('Date')> @@ -6,7 +6,7 @@ import java.util.Date; <#list table.fields as field> <#if field.fieldType.javaType() == "Enum"> -import ${basePackage}.${moduleName}.enums.${field.getCName()}; +import ${basePackage}.module.${moduleName}.enums.${field.getCName()}; diff --git a/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/getAllRequestClass.ftl similarity index 86% rename from src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/getAllRequestClass.ftl index 6f0661d7..776980b4 100644 --- a/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/getAllRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseGetAllRequest; diff --git a/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/getRequestClass.ftl similarity index 91% rename from src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/getRequestClass.ftl index ca1e7d68..23a67eaf 100644 --- a/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/getRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseRequest; import javax.validation.constraints.NotNull; diff --git a/src/main/resources/modules/SpringBoot/java/req/searchRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/searchRequestClass.ftl similarity index 88% rename from src/main/resources/modules/SpringBoot/java/req/searchRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/searchRequestClass.ftl index cf1c429d..1b0e4543 100644 --- a/src/main/resources/modules/SpringBoot/java/req/searchRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/searchRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseSearchRequest; <#if table.has('Date')> diff --git a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl similarity index 94% rename from src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl index d816fc95..922e8383 100644 --- a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.req; +package ${basePackage}.module.${moduleName}.req; import ${basePackage}.frame.base.BaseUpdateRequest; import javax.validation.constraints.NotNull; @@ -9,7 +9,7 @@ import java.util.Date; <#list table.fields as field> <#if field.fieldType.javaType() == "Enum"> -import ${basePackage}.${moduleName}.enums.${field.getCName()}; +import ${basePackage}.module.${moduleName}.enums.${field.getCName()}; diff --git a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java b/src/main/resources/modules/SpringBoot/java/module/rsp/ApiExampleResponse.java similarity index 87% rename from src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java rename to src/main/resources/modules/SpringBoot/java/module/rsp/ApiExampleResponse.java index 59cb4ba3..2f0e09cc 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/ApiExampleResponse.java @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseResponse; diff --git a/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl similarity index 90% rename from src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl index d5627fb2..7672e667 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/createResponseClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseResponse; diff --git a/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/deleteResponseClass.ftl similarity index 90% rename from src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/deleteResponseClass.ftl index 062e1444..0ac344fb 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/deleteResponseClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseResponse; diff --git a/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/findResponseClass.ftl similarity index 72% rename from src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/findResponseClass.ftl index 1c95ba38..e9a03096 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/findResponseClass.ftl @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseFindResponse; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; /** * ${table.getCName()}FindResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/getAllResponseClass.ftl similarity index 72% rename from src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/getAllResponseClass.ftl index b6dab918..1fb9503b 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/getAllResponseClass.ftl @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseFindResponse; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; /** * ${table.getCName()}GetAllResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/getResponseClass.ftl similarity index 84% rename from src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/getResponseClass.ftl index c5d3a735..d4a31b47 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/getResponseClass.ftl @@ -1,6 +1,6 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; import ${basePackage}.frame.base.BaseResponse; /** diff --git a/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/searchResponseClass.ftl similarity index 72% rename from src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/searchResponseClass.ftl index 513a7a8f..abc2b2ea 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/searchResponseClass.ftl @@ -1,7 +1,7 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseFindResponse; -import ${basePackage}.${moduleName}.ent.${table.getCName()}; +import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; /** * ${table.getCName()}FindResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/module/rsp/updateResponseClass.ftl similarity index 90% rename from src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl rename to src/main/resources/modules/SpringBoot/java/module/rsp/updateResponseClass.ftl index 8ad98810..0e849991 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/rsp/updateResponseClass.ftl @@ -1,4 +1,4 @@ -package ${basePackage}.${moduleName}.rsp; +package ${basePackage}.module.${moduleName}.rsp; import ${basePackage}.frame.base.BaseResponse; diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index 703958af..e5f078be 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -7,9 +7,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.assertTrue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.${moduleName}.mgr.${table.getCName()}Manager; -import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.${moduleName}.rsp.*; +import ${basePackage}.module.${moduleName}.mgr.${table.getCName()}Manager; +import ${basePackage}.module.${moduleName}.req.*; +import ${basePackage}.module.${moduleName}.rsp.*; import ${basePackage}.frame.base.Token; ${table.getImport()}