From b865c3dc29b93dfb0ff347b569a5ee8827c1ec2c Mon Sep 17 00:00:00 2001 From: wangbing Date: Tue, 19 Mar 2019 17:34:47 +0800 Subject: [PATCH] =?UTF-8?q?android=20=E4=BC=98=E5=8C=96=EF=BC=8Cwebapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manger/callable/SpringBootCallable.java | 105 ++++++++++-------- .../callable/SpringMVCMybatisCallable.java | 78 ++++++------- .../dbtool/javafx/tool/JavaClassReader.java | 2 +- .../dbtool/web/framework/utils/MD5Util.java | 2 +- .../SpringBoot/java/action/AjaxController.ftl | 16 +-- .../java/action/FeignController.ftl | 16 +-- .../java/action/GlobalController.ftl | 12 +- .../java/action/control/Footer.java | 2 +- .../java/action/control/Header.java | 2 +- .../SpringBoot/java/action/screen/Index.java | 2 +- .../config/BeanDefinitionRegistryConfig.java | 6 +- .../config/SecurityConfig.java | 8 +- .../{framework => }/config/TaskConfig.java | 6 +- .../config/ThreadPoolConfig.java | 2 +- .../{framework => }/config/WebMvcConfig.java | 6 +- .../modules/SpringBoot/java/ent/entity.ftl | 2 +- .../{framework => frame}/base/BaseEntity.java | 2 +- .../base/BaseFindRequest.java | 2 +- .../base/BaseFindResponse.java | 2 +- .../base/BaseGetAllRequest.java | 2 +- .../base/BaseRequest.java | 2 +- .../base/BaseResponse.java | 2 +- .../base/BaseSearchRequest.java | 2 +- .../base/BaseUpdateRequest.java | 2 +- .../{framework => frame}/base/Control.java | 2 +- .../java/{framework => frame}/base/Error.java | 2 +- .../{framework => frame}/base/ErrorType.java | 2 +- .../base/FileUploadResponse.java | 2 +- .../{framework => frame}/base/Screen.java | 2 +- .../{framework => frame}/base/SortType.java | 2 +- .../java/{framework => frame}/base/Token.java | 2 +- .../freemarker/Layout.java | 8 +- .../{framework => frame}/freemarker/Uri.java | 2 +- .../freemarker/ViewNameTranslator.java | 4 +- .../springmvc/GlobalHandlerInterceptor.java | 8 +- .../{framework => frame}/utils/AESUtil.java | 2 +- .../utils/Base64Util.java | 2 +- .../utils/CookieUtil.java | 2 +- .../utils/IDgenerator.java | 2 +- .../{framework => frame}/utils/LocalData.java | 4 +- .../{framework => frame}/utils/LogUtil.java | 2 +- .../{framework => frame}/utils/MD5Util.java | 2 +- .../utils/MapperUtil.java | 2 +- .../{framework => frame}/utils/Message.java | 2 +- .../utils/ProcessUtil.java | 2 +- .../{framework => frame}/utils/RSAUtil.java | 2 +- .../utils/ValidationUtil.java | 8 +- .../{framework => frame}/utils/WebUtils.java | 2 +- .../SpringBoot/java/mgr/ApiManager.java | 2 +- .../SpringBoot/java/mgr/ApiManagerImpl.java | 2 +- .../modules/SpringBoot/java/mgr/manager.ftl | 2 +- .../SpringBoot/java/mgr/managerImpl.ftl | 12 +- .../SpringBoot/java/mpr/mapperJava.ftl | 2 +- .../java/req/ApiExampleRequest.java | 2 +- .../java/req/createRequestClass.ftl | 2 +- .../java/req/deleteRequestClass.ftl | 2 +- .../SpringBoot/java/req/findRequestClass.ftl | 2 +- .../java/req/getAllRequestClass.ftl | 2 +- .../SpringBoot/java/req/getRequestClass.ftl | 2 +- .../java/req/searchRequestClass.ftl | 2 +- .../java/req/updateRequestClass.ftl | 2 +- .../java/rsp/ApiExampleResponse.java | 2 +- .../java/rsp/createResponseClass.ftl | 2 +- .../java/rsp/deleteResponseClass.ftl | 2 +- .../SpringBoot/java/rsp/findResponseClass.ftl | 2 +- .../java/rsp/getAllResponseClass.ftl | 2 +- .../SpringBoot/java/rsp/getResponseClass.ftl | 2 +- .../java/rsp/searchResponseClass.ftl | 2 +- .../java/rsp/updateResponseClass.ftl | 2 +- .../modules/SpringBoot/test/TestConfig.ftl | 4 +- .../modules/SpringBoot/test/test.ftl | 2 +- 71 files changed, 212 insertions(+), 199 deletions(-) rename src/main/resources/modules/SpringBoot/java/{framework => }/config/BeanDefinitionRegistryConfig.java (96%) rename src/main/resources/modules/SpringBoot/java/{framework => }/config/SecurityConfig.java (94%) rename src/main/resources/modules/SpringBoot/java/{framework => }/config/TaskConfig.java (90%) rename src/main/resources/modules/SpringBoot/java/{framework => }/config/ThreadPoolConfig.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => }/config/WebMvcConfig.java (96%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseEntity.java (97%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseFindRequest.java (96%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseFindResponse.java (93%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseGetAllRequest.java (93%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseRequest.java (76%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseResponse.java (95%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseSearchRequest.java (90%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/BaseUpdateRequest.java (90%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/Control.java (86%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/Error.java (94%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/ErrorType.java (86%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/FileUploadResponse.java (93%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/Screen.java (87%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/SortType.java (81%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/base/Token.java (97%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/freemarker/Layout.java (94%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/freemarker/Uri.java (96%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/freemarker/ViewNameTranslator.java (97%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/springmvc/GlobalHandlerInterceptor.java (91%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/AESUtil.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/Base64Util.java (99%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/CookieUtil.java (95%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/IDgenerator.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/LocalData.java (96%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/LogUtil.java (97%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/MD5Util.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/MapperUtil.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/Message.java (95%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/ProcessUtil.java (98%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/RSAUtil.java (99%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/ValidationUtil.java (89%) rename src/main/resources/modules/SpringBoot/java/{framework => frame}/utils/WebUtils.java (99%) 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 e1399525..fc1c72e0 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 @@ -98,6 +98,10 @@ public class SpringBootCallable implements Callable { System.out.println("生成模块:action"); generateController(new File(src.getAbsolutePath(), "action"), project, dataBase, option); + //生成Config + System.out.println("生成模块:config"); + generateConfig(new File(src.getAbsolutePath(), "config"), project, dataBase, option); + //module { for (Module module : project.getModules()) { @@ -123,9 +127,9 @@ public class SpringBootCallable implements Callable { } } - //framework - System.out.println("生成模块:framework"); - generateFramework(new File(src.getAbsolutePath(), "framework"), project, dataBase, option); + //frame + System.out.println("生成模块:frame"); + generateFrame(new File(src.getAbsolutePath(), "frame"), project, dataBase, option); System.out.println("生成模块:Application"); generateApplication(new File(src.getAbsolutePath()), project, dataBase, option); @@ -203,6 +207,24 @@ public class SpringBootCallable implements Callable { freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "AjaxController.java"), option + "/java/action/AjaxController.ftl", ctx); } + public void generateConfig(File root, Project project, DataBase dataBase, String option) { + if (!root.exists()) { + root.mkdirs(); + } else { + clear(root); + } + HashMap ctx = new HashMap(); + ctx.put("basePackage", project.getProjectBasePackage()); + ctx.put("author", project.getProjectAuthor()); + ctx.put("date", new Date()); + + //config + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "BeanDefinitionRegistryConfig.java"), option + "/java/config/BeanDefinitionRegistryConfig.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "SecurityConfig.java"), option + "/java/config/SecurityConfig.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "TaskConfig.java"), option + "/java/config/TaskConfig.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "ThreadPoolConfig.java"), option + "/java/config/ThreadPoolConfig.java", ctx); + freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "WebMvcConfig.java"), option + "/java/config/WebMvcConfig.java", ctx); + } /** * 生成entity @@ -418,12 +440,12 @@ public class SpringBootCallable implements Callable { } /** - * 生成framework类 + * 生成frame类 * * @param root * @param project */ - public void generateFramework(File root, Project project, DataBase dataBase, String option) { + public void generateFrame(File root, Project project, DataBase dataBase, String option) { if (!root.exists()) { root.mkdirs(); } else { @@ -436,8 +458,6 @@ public class SpringBootCallable implements Callable { File base = new File(root.getAbsolutePath(), "base"); base.mkdirs(); - File config = new File(root.getAbsolutePath(), "config"); - config.mkdirs(); File freemarker = new File(root.getAbsolutePath(), "freemarker"); freemarker.mkdirs(); File springmvc = new File(root.getAbsolutePath(), "springmvc"); @@ -446,51 +466,44 @@ public class SpringBootCallable implements Callable { utils.mkdirs(); //base - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseEntity.java"), option + "/java/framework/base/BaseEntity.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseFindRequest.java"), option + "/java/framework/base/BaseFindRequest.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseFindResponse.java"), option + "/java/framework/base/BaseFindResponse.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseGetAllRequest.java"), option + "/java/framework/base/BaseGetAllRequest.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseRequest.java"), option + "/java/framework/base/BaseRequest.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseResponse.java"), option + "/java/framework/base/BaseResponse.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseSearchRequest.java"), option + "/java/framework/base/BaseSearchRequest.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseUpdateRequest.java"), option + "/java/framework/base/BaseUpdateRequest.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Control.java"), option + "/java/framework/base/Control.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Error.java"), option + "/java/framework/base/Error.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "ErrorType.java"), option + "/java/framework/base/ErrorType.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "FileUploadResponse.java"), option + "/java/framework/base/FileUploadResponse.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Screen.java"), option + "/java/framework/base/Screen.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "SortType.java"), option + "/java/framework/base/SortType.java", ctx); - freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Token.java"), option + "/java/framework/base/Token.java", ctx); - - //config - freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "BeanDefinitionRegistryConfig.java"), option + "/java/framework/config/BeanDefinitionRegistryConfig.java", ctx); - freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "SecurityConfig.java"), option + "/java/framework/config/SecurityConfig.java", ctx); - freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "TaskConfig.java"), option + "/java/framework/config/TaskConfig.java", ctx); - freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "ThreadPoolConfig.java"), option + "/java/framework/config/ThreadPoolConfig.java", ctx); - freeMarkerManager.outputTemp(new File(config.getAbsolutePath(), "WebMvcConfig.java"), option + "/java/framework/config/WebMvcConfig.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseEntity.java"), option + "/java/frame/base/BaseEntity.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseFindRequest.java"), option + "/java/frame/base/BaseFindRequest.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseFindResponse.java"), option + "/java/frame/base/BaseFindResponse.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseGetAllRequest.java"), option + "/java/frame/base/BaseGetAllRequest.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseRequest.java"), option + "/java/frame/base/BaseRequest.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseResponse.java"), option + "/java/frame/base/BaseResponse.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseSearchRequest.java"), option + "/java/frame/base/BaseSearchRequest.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseUpdateRequest.java"), option + "/java/frame/base/BaseUpdateRequest.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Control.java"), option + "/java/frame/base/Control.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Error.java"), option + "/java/frame/base/Error.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "ErrorType.java"), option + "/java/frame/base/ErrorType.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "FileUploadResponse.java"), option + "/java/frame/base/FileUploadResponse.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Screen.java"), option + "/java/frame/base/Screen.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "SortType.java"), option + "/java/frame/base/SortType.java", ctx); + freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "Token.java"), option + "/java/frame/base/Token.java", ctx); //freemarker - freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "ViewNameTranslator.java"), option + "/java/framework/freemarker/ViewNameTranslator.java", ctx); - freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "Layout.java"), option + "/java/framework/freemarker/Layout.java", ctx); - freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "Uri.java"), option + "/java/framework/freemarker/Uri.java", ctx); + freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "ViewNameTranslator.java"), option + "/java/frame/freemarker/ViewNameTranslator.java", ctx); + freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "Layout.java"), option + "/java/frame/freemarker/Layout.java", ctx); + freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath(), "Uri.java"), option + "/java/frame/freemarker/Uri.java", ctx); //springmvc - freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath(), "GlobalHandlerInterceptor.java"), option + "/java/framework/springmvc/GlobalHandlerInterceptor.java", ctx); + freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath(), "GlobalHandlerInterceptor.java"), option + "/java/frame/springmvc/GlobalHandlerInterceptor.java", ctx); //uitls - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "Base64Util.java"), option + "/java/framework/utils/Base64Util.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "AESUtil.java"), option + "/java/framework/utils/AESUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "CookieUtil.java"), option + "/java/framework/utils/CookieUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "LogUtil.java"), option + "/java/framework/utils/LogUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "MapperUtil.java"), option + "/java/framework/utils/MapperUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "MD5Util.java"), option + "/java/framework/utils/MD5Util.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "ProcessUtil.java"), option + "/java/framework/utils/ProcessUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "RSAUtil.java"), option + "/java/framework/utils/RSAUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "ValidationUtil.java"), option + "/java/framework/utils/ValidationUtil.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "WebUtils.java"), option + "/java/framework/utils/WebUtils.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "LocalData.java"), option + "/java/framework/utils/LocalData.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "IDgenerator.java"), option + "/java/framework/utils/IDgenerator.java", ctx); - freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "Message.java"), option + "/java/framework/utils/Message.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "Base64Util.java"), option + "/java/frame/utils/Base64Util.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "AESUtil.java"), option + "/java/frame/utils/AESUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "CookieUtil.java"), option + "/java/frame/utils/CookieUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "LogUtil.java"), option + "/java/frame/utils/LogUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "MapperUtil.java"), option + "/java/frame/utils/MapperUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "MD5Util.java"), option + "/java/frame/utils/MD5Util.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "ProcessUtil.java"), option + "/java/frame/utils/ProcessUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "RSAUtil.java"), option + "/java/frame/utils/RSAUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "ValidationUtil.java"), option + "/java/frame/utils/ValidationUtil.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "WebUtils.java"), option + "/java/frame/utils/WebUtils.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "LocalData.java"), option + "/java/frame/utils/LocalData.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "IDgenerator.java"), option + "/java/frame/utils/IDgenerator.java", ctx); + freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "Message.java"), option + "/java/frame/utils/Message.java", ctx); } /** diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCMybatisCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCMybatisCallable.java index 4d05f0df..8f8bd7b4 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCMybatisCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCMybatisCallable.java @@ -122,13 +122,13 @@ // generateRequset(new File(src.getAbsolutePath() + File.separator + "req"), md, dataBase, option); // System.out.println("生成模块:Response"); // generateResponse(new File(src.getAbsolutePath() + File.separator + "rsp"), md, dataBase, option); -// System.out.println("生成模块:framework"); +// System.out.println("生成模块:frame"); // // } // -// //framework -// System.out.println("生成模块:framework"); -// generateBase(new File(src.getParentFile().getAbsolutePath() + File.separator + "framework"), md, dataBase, option); +// //frame +// System.out.println("生成模块:frame"); +// generateBase(new File(src.getParentFile().getAbsolutePath() + File.separator + "frame"), md, dataBase, option); // // } // @@ -419,41 +419,41 @@ // File utils = new File(root.getAbsolutePath() + File.separator + "utils"); // utils.mkdirs(); // -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseEntity.java"), option + "/java/framework/base/BaseEntity.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseFindRequest.java"), option + "/java/framework/base/BaseFindRequest.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseFindResponse.java"), option + "/java/framework/base/BaseFindResponse.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseGetAllRequest.java"), option + "/java/framework/base/BaseGetAllRequest.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseRequest.java"), option + "/java/framework/base/BaseRequest.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseResponse.java"), option + "/java/framework/base/BaseResponse.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseSearchRequest.java"), option + "/java/framework/base/BaseSearchRequest.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseUpdateRequest.java"), option + "/java/framework/base/BaseUpdateRequest.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "Error.java"), option + "/java/framework/base/Error.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "ErrorType.java"), option + "/java/framework/base/ErrorType.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "SortType.java"), option + "/java/framework/base/SortType.java", ctx); -// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "Token.java"), option + "/java/framework/base/Token.java", ctx); -// -// -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "AESUtil.java"), option + "/java/framework/utils/AESUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "Base64Util.java"), option + "/java/framework/utils/Base64Util.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "CookieUtil.java"), option + "/java/framework/utils/CookieUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "IDgenerator.java"), option + "/java/framework/utils/IDgenerator.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "LocalData.java"), option + "/java/framework/utils/LocalData.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "LogUtil.java"), option + "/java/framework/utils/LogUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "MapperUtil.java"), option + "/java/framework/utils/MapperUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "MD5Util.java"), option + "/java/framework/utils/MD5Util.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "Message.java"), option + "/java/framework/utils/Message.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "ProcessUtil.java"), option + "/java/framework/utils/ProcessUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "RSAUtil.java"), option + "/java/framework/utils/RSAUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "ValidationUtil.java"), option + "/java/framework/utils/ValidationUtil.java", ctx); -// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "WebUtils.java"), option + "/java/framework/utils/WebUtils.java", ctx); -// -// -// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "ViewNameTranslator.java"), option + "/java/framework/freemarker/ViewNameTranslator.java", ctx); -// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "Layout.java"), option + "/java/framework/freemarker/Layout.java", ctx); -// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "Url.java"), option + "/java/framework/freemarker/Url.java", ctx); -// -// freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath() + File.separator + "GlobalHandlerInterceptor.java"), option + "/java/framework/springmvc/GlobalHandlerInterceptor.java", ctx); -// freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath() + File.separator + "GlobalObjectMapper.java"), option + "/java/framework/springmvc/GlobalObjectMapper.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseEntity.java"), option + "/java/frame/base/BaseEntity.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseFindRequest.java"), option + "/java/frame/base/BaseFindRequest.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseFindResponse.java"), option + "/java/frame/base/BaseFindResponse.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseGetAllRequest.java"), option + "/java/frame/base/BaseGetAllRequest.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseRequest.java"), option + "/java/frame/base/BaseRequest.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseResponse.java"), option + "/java/frame/base/BaseResponse.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseSearchRequest.java"), option + "/java/frame/base/BaseSearchRequest.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "BaseUpdateRequest.java"), option + "/java/frame/base/BaseUpdateRequest.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "Error.java"), option + "/java/frame/base/Error.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "ErrorType.java"), option + "/java/frame/base/ErrorType.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "SortType.java"), option + "/java/frame/base/SortType.java", ctx); +// freeMarkerManager.outputTemp(new File(base.getAbsolutePath() + File.separator + "Token.java"), option + "/java/frame/base/Token.java", ctx); +// +// +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "AESUtil.java"), option + "/java/frame/utils/AESUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "Base64Util.java"), option + "/java/frame/utils/Base64Util.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "CookieUtil.java"), option + "/java/frame/utils/CookieUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "IDgenerator.java"), option + "/java/frame/utils/IDgenerator.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "LocalData.java"), option + "/java/frame/utils/LocalData.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "LogUtil.java"), option + "/java/frame/utils/LogUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "MapperUtil.java"), option + "/java/frame/utils/MapperUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "MD5Util.java"), option + "/java/frame/utils/MD5Util.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "Message.java"), option + "/java/frame/utils/Message.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "ProcessUtil.java"), option + "/java/frame/utils/ProcessUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "RSAUtil.java"), option + "/java/frame/utils/RSAUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "ValidationUtil.java"), option + "/java/frame/utils/ValidationUtil.java", ctx); +// freeMarkerManager.outputTemp(new File(utils.getAbsolutePath() + File.separator + "WebUtils.java"), option + "/java/frame/utils/WebUtils.java", ctx); +// +// +// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "ViewNameTranslator.java"), option + "/java/frame/freemarker/ViewNameTranslator.java", ctx); +// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "Layout.java"), option + "/java/frame/freemarker/Layout.java", ctx); +// freeMarkerManager.outputTemp(new File(freemarker.getAbsolutePath() + File.separator + "Url.java"), option + "/java/frame/freemarker/Url.java", ctx); +// +// freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath() + File.separator + "GlobalHandlerInterceptor.java"), option + "/java/frame/springmvc/GlobalHandlerInterceptor.java", ctx); +// freeMarkerManager.outputTemp(new File(springmvc.getAbsolutePath() + File.separator + "GlobalObjectMapper.java"), option + "/java/frame/springmvc/GlobalObjectMapper.java", ctx); // } catch (Exception e) { // e.printStackTrace(); // } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java index b84fc5dc..d17612c6 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java @@ -57,7 +57,7 @@ public class JavaClassReader { continue; } if (line.startsWith("import")) { - if (!line.contains("framework")) { + if (!line.contains("frame")) { if (line.contains(".ent.")){ line = line.replaceAll("\\.ent\\.",".entity."); } diff --git a/src/main/java/xyz/wbsite/dbtool/web/framework/utils/MD5Util.java b/src/main/java/xyz/wbsite/dbtool/web/framework/utils/MD5Util.java index 58761966..685d25fc 100644 --- a/src/main/java/xyz/wbsite/dbtool/web/framework/utils/MD5Util.java +++ b/src/main/java/xyz/wbsite/dbtool/web/framework/utils/MD5Util.java @@ -1,4 +1,4 @@ -package xyz.wbsite.dbtool.web.framework.utils;//package com.example.demo.framework.utils; +package xyz.wbsite.dbtool.web.framework.utils;//package com.example.demo.frame.utils; import com.fasterxml.jackson.core.TreeNode; diff --git a/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl b/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl index 2ddb2e6f..149d60f4 100644 --- a/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/AjaxController.ftl @@ -13,14 +13,14 @@ import java.io.InputStreamReader; import ${basePackage}.${m.moduleName}.req.*; import ${basePackage}.${m.moduleName}.mgr.*; -import ${basePackage}.framework.utils.LocalData; -import ${basePackage}.framework.utils.MapperUtil; -import ${basePackage}.framework.utils.Message; -import ${basePackage}.framework.base.BaseResponse; -import ${basePackage}.framework.base.ErrorType; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.utils.LogUtil; -import ${basePackage}.framework.base.Error; +import ${basePackage}.frame.utils.LocalData; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.Message; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.base.ErrorType; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.utils.LogUtil; +import ${basePackage}.frame.base.Error; @Controller public class AjaxController { diff --git a/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl b/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl index bff7c635..9226c52a 100644 --- a/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/FeignController.ftl @@ -13,14 +13,14 @@ import java.io.InputStreamReader; import ${basePackage}.${m.moduleName}.req.*; import ${basePackage}.${m.moduleName}.mgr.*; -import ${basePackage}.framework.utils.LocalData; -import ${basePackage}.framework.utils.MapperUtil; -import ${basePackage}.framework.utils.Message; -import ${basePackage}.framework.base.BaseResponse; -import ${basePackage}.framework.base.ErrorType; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.utils.LogUtil; -import ${basePackage}.framework.base.Error; +import ${basePackage}.frame.utils.LocalData; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.Message; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.base.ErrorType; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.utils.LogUtil; +import ${basePackage}.frame.base.Error; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl index c6b125b0..de0a88c0 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl @@ -1,11 +1,11 @@ package ${basePackage}.action; -import ${basePackage}.framework.base.FileUploadResponse; -import ${basePackage}.framework.base.BaseResponse; -import ${basePackage}.framework.base.ErrorType; -import ${basePackage}.framework.base.Screen; -import ${basePackage}.framework.utils.LocalData; -import ${basePackage}.framework.config.BeanDefinitionRegistryConfig; +import ${basePackage}.frame.base.FileUploadResponse; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.base.ErrorType; +import ${basePackage}.frame.base.Screen; +import ${basePackage}.frame.utils.LocalData; +import ${basePackage}.config.BeanDefinitionRegistryConfig; import org.springframework.beans.BeansException; import org.apache.commons.io.FileUtils; import org.springframework.boot.web.servlet.error.ErrorController; diff --git a/src/main/resources/modules/SpringBoot/java/action/control/Footer.java b/src/main/resources/modules/SpringBoot/java/action/control/Footer.java index b4fb3569..054e25c0 100644 --- a/src/main/resources/modules/SpringBoot/java/action/control/Footer.java +++ b/src/main/resources/modules/SpringBoot/java/action/control/Footer.java @@ -1,6 +1,6 @@ package ${basePackage}.action.control; -import ${basePackage}.framework.base.Control; +import ${basePackage}.frame.base.Control; import org.springframework.ui.Model; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/resources/modules/SpringBoot/java/action/control/Header.java b/src/main/resources/modules/SpringBoot/java/action/control/Header.java index 6c8ad5c2..30436ae5 100644 --- a/src/main/resources/modules/SpringBoot/java/action/control/Header.java +++ b/src/main/resources/modules/SpringBoot/java/action/control/Header.java @@ -1,6 +1,6 @@ package ${basePackage}.action.control; -import ${basePackage}.framework.base.Control; +import ${basePackage}.frame.base.Control; import org.springframework.ui.Model; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/resources/modules/SpringBoot/java/action/screen/Index.java b/src/main/resources/modules/SpringBoot/java/action/screen/Index.java index c9aec0e9..f3f6075e 100644 --- a/src/main/resources/modules/SpringBoot/java/action/screen/Index.java +++ b/src/main/resources/modules/SpringBoot/java/action/screen/Index.java @@ -1,6 +1,6 @@ package ${basePackage}.action.screen; -import ${basePackage}.framework.base.Screen; +import ${basePackage}.frame.base.Screen; import org.springframework.ui.Model; import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/resources/modules/SpringBoot/java/framework/config/BeanDefinitionRegistryConfig.java b/src/main/resources/modules/SpringBoot/java/config/BeanDefinitionRegistryConfig.java similarity index 96% rename from src/main/resources/modules/SpringBoot/java/framework/config/BeanDefinitionRegistryConfig.java rename to src/main/resources/modules/SpringBoot/java/config/BeanDefinitionRegistryConfig.java index ad42e4cd..07aa8645 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/config/BeanDefinitionRegistryConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/BeanDefinitionRegistryConfig.java @@ -1,7 +1,7 @@ -package ${basePackage}.framework.config; +package ${basePackage}.config; -import ${basePackage}.framework.base.Control; -import ${basePackage}.framework.base.Screen; +import ${basePackage}.frame.base.Control; +import ${basePackage}.frame.base.Screen; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/src/main/resources/modules/SpringBoot/java/framework/config/SecurityConfig.java b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java similarity index 94% rename from src/main/resources/modules/SpringBoot/java/framework/config/SecurityConfig.java rename to src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java index 45fe734b..f3bbd573 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/config/SecurityConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.config; +package ${basePackage}.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -9,9 +9,9 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.Authentication; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.utils.CookieUtil; -import ${basePackage}.framework.utils.LocalData; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.utils.CookieUtil; +import ${basePackage}.frame.utils.LocalData; import javax.servlet.http.HttpServletRequest; @Configuration diff --git a/src/main/resources/modules/SpringBoot/java/framework/config/TaskConfig.java b/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java similarity index 90% rename from src/main/resources/modules/SpringBoot/java/framework/config/TaskConfig.java rename to src/main/resources/modules/SpringBoot/java/config/TaskConfig.java index 8a8a2b1e..dd90bf82 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/config/TaskConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java @@ -1,7 +1,7 @@ -package ${basePackage}.framework.config; +package ${basePackage}.config; -import ${basePackage}.framework.utils.LogUtil; -import ${basePackage}.framework.utils.ProcessUtil; +import ${basePackage}.frame.utils.LogUtil; +import ${basePackage}.frame.utils.ProcessUtil; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/resources/modules/SpringBoot/java/framework/config/ThreadPoolConfig.java b/src/main/resources/modules/SpringBoot/java/config/ThreadPoolConfig.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/config/ThreadPoolConfig.java rename to src/main/resources/modules/SpringBoot/java/config/ThreadPoolConfig.java index d566b163..02d6239a 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/config/ThreadPoolConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.config; +package ${basePackage}.config; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.context.annotation.Configuration; diff --git a/src/main/resources/modules/SpringBoot/java/framework/config/WebMvcConfig.java b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java similarity index 96% rename from src/main/resources/modules/SpringBoot/java/framework/config/WebMvcConfig.java rename to src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java index 0ecdb1e5..eb340964 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/config/WebMvcConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package ${basePackage}.framework.config; +package ${basePackage}.config; -import ${basePackage}.framework.springmvc.GlobalHandlerInterceptor; +import ${basePackage}.frame.springmvc.GlobalHandlerInterceptor; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; @@ -22,7 +22,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import ${basePackage}.framework.springmvc.GlobalHandlerInterceptor; +import ${basePackage}.frame.springmvc.GlobalHandlerInterceptor; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl b/src/main/resources/modules/SpringBoot/java/ent/entity.ftl index 50f80248..94e06199 100644 --- a/src/main/resources/modules/SpringBoot/java/ent/entity.ftl +++ b/src/main/resources/modules/SpringBoot/java/ent/entity.ftl @@ -3,7 +3,7 @@ package ${basePackage}.${moduleName}.ent; <#if table.has('Date')> import java.util.Date; -import ${basePackage}.framework.base.BaseEntity; +import ${basePackage}.frame.base.BaseEntity; /** * ${table.tableName} - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseEntity.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java similarity index 97% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseEntity.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java index a96997b9..71de623e 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseEntity.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.Date; diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseFindRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java similarity index 96% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseFindRequest.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java index 70de1543..3371b07d 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * BaseFindRequest - 基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseFindResponse.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindResponse.java similarity index 93% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseFindResponse.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseFindResponse.java index b12c0236..08c574e9 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseFindResponse.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseFindResponse.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import java.util.List; diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseGetAllRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseGetAllRequest.java similarity index 93% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseGetAllRequest.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseGetAllRequest.java index f6f95d5d..96c55a6b 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseGetAllRequest.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseGetAllRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * BaseFindRequest - 基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseRequest.java similarity index 76% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseRequest.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseRequest.java index 0e0bbe2e..5dd4081c 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseRequest.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * BaseRequest - 基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseResponse.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseResponse.java similarity index 95% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseResponse.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseResponse.java index 0ceaef94..0a6455e6 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseResponse.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseResponse.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import java.util.ArrayList; import java.util.List; diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseSearchRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseSearchRequest.java similarity index 90% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseSearchRequest.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseSearchRequest.java index 320eaacf..013606f4 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseSearchRequest.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseSearchRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * BaseSearchRequest - 基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/BaseUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseUpdateRequest.java similarity index 90% rename from src/main/resources/modules/SpringBoot/java/framework/base/BaseUpdateRequest.java rename to src/main/resources/modules/SpringBoot/java/frame/base/BaseUpdateRequest.java index 0fb98ad2..f5bb9796 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/BaseUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseUpdateRequest.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * BaseUpdateRequest - 基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/Control.java b/src/main/resources/modules/SpringBoot/java/frame/base/Control.java similarity index 86% rename from src/main/resources/modules/SpringBoot/java/framework/base/Control.java rename to src/main/resources/modules/SpringBoot/java/frame/base/Control.java index ecfc2dfd..a2d55ff4 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/Control.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/Control.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import org.springframework.ui.Model; diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/Error.java b/src/main/resources/modules/SpringBoot/java/frame/base/Error.java similarity index 94% rename from src/main/resources/modules/SpringBoot/java/framework/base/Error.java rename to src/main/resources/modules/SpringBoot/java/frame/base/Error.java index dddef11e..d434572e 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/Error.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/Error.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * Error - 错误基类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/ErrorType.java b/src/main/resources/modules/SpringBoot/java/frame/base/ErrorType.java similarity index 86% rename from src/main/resources/modules/SpringBoot/java/framework/base/ErrorType.java rename to src/main/resources/modules/SpringBoot/java/frame/base/ErrorType.java index bd6cc408..9c9521bd 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/ErrorType.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/ErrorType.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * ErrorType - 错误类型 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/FileUploadResponse.java b/src/main/resources/modules/SpringBoot/java/frame/base/FileUploadResponse.java similarity index 93% rename from src/main/resources/modules/SpringBoot/java/framework/base/FileUploadResponse.java rename to src/main/resources/modules/SpringBoot/java/frame/base/FileUploadResponse.java index 137354fe..52d5af96 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/FileUploadResponse.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/FileUploadResponse.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; public class FileUploadResponse extends BaseResponse { diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/Screen.java b/src/main/resources/modules/SpringBoot/java/frame/base/Screen.java similarity index 87% rename from src/main/resources/modules/SpringBoot/java/framework/base/Screen.java rename to src/main/resources/modules/SpringBoot/java/frame/base/Screen.java index d66d99d0..cb658e5e 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/Screen.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/Screen.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import org.springframework.ui.Model; diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/SortType.java b/src/main/resources/modules/SpringBoot/java/frame/base/SortType.java similarity index 81% rename from src/main/resources/modules/SpringBoot/java/framework/base/SortType.java rename to src/main/resources/modules/SpringBoot/java/frame/base/SortType.java index d59b460d..9939badc 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/SortType.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/SortType.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; /** * SortTypeEnum - 排序方式 diff --git a/src/main/resources/modules/SpringBoot/java/framework/base/Token.java b/src/main/resources/modules/SpringBoot/java/frame/base/Token.java similarity index 97% rename from src/main/resources/modules/SpringBoot/java/framework/base/Token.java rename to src/main/resources/modules/SpringBoot/java/frame/base/Token.java index d0e2eb5b..306058f0 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/base/Token.java +++ b/src/main/resources/modules/SpringBoot/java/frame/base/Token.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.base; +package ${basePackage}.frame.base; import java.io.Serializable; import java.util.HashSet; diff --git a/src/main/resources/modules/SpringBoot/java/framework/freemarker/Layout.java b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java similarity index 94% rename from src/main/resources/modules/SpringBoot/java/framework/freemarker/Layout.java rename to src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java index 25ae8208..a564bea9 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/freemarker/Layout.java +++ b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Layout.java @@ -1,7 +1,7 @@ -package ${basePackage}.framework.freemarker; +package ${basePackage}.frame.freemarker; import java.io.File; -import ${basePackage}.framework.config.BeanDefinitionRegistryConfig; +import ${basePackage}.config.BeanDefinitionRegistryConfig; import freemarker.template.TemplateModelException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +17,8 @@ import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Locale; -import ${basePackage}.framework.base.Control; -import ${basePackage}.framework.utils.LocalData; +import ${basePackage}.frame.base.Control; +import ${basePackage}.frame.utils.LocalData; /** * 布局帮助类 diff --git a/src/main/resources/modules/SpringBoot/java/framework/freemarker/Uri.java b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Uri.java similarity index 96% rename from src/main/resources/modules/SpringBoot/java/framework/freemarker/Uri.java rename to src/main/resources/modules/SpringBoot/java/frame/freemarker/Uri.java index 4bd18099..98c0ce20 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/freemarker/Uri.java +++ b/src/main/resources/modules/SpringBoot/java/frame/freemarker/Uri.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.freemarker; +package ${basePackage}.frame.freemarker; import freemarker.template.TemplateModelException; import org.springframework.stereotype.Component; diff --git a/src/main/resources/modules/SpringBoot/java/framework/freemarker/ViewNameTranslator.java b/src/main/resources/modules/SpringBoot/java/frame/freemarker/ViewNameTranslator.java similarity index 97% rename from src/main/resources/modules/SpringBoot/java/framework/freemarker/ViewNameTranslator.java rename to src/main/resources/modules/SpringBoot/java/frame/freemarker/ViewNameTranslator.java index 1cc37145..040692f5 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/freemarker/ViewNameTranslator.java +++ b/src/main/resources/modules/SpringBoot/java/frame/freemarker/ViewNameTranslator.java @@ -1,6 +1,6 @@ -package ${basePackage}.framework.freemarker; +package ${basePackage}.frame.freemarker; -import ${basePackage}.framework.utils.LocalData; +import ${basePackage}.frame.utils.LocalData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/resources/modules/SpringBoot/java/framework/springmvc/GlobalHandlerInterceptor.java b/src/main/resources/modules/SpringBoot/java/frame/springmvc/GlobalHandlerInterceptor.java similarity index 91% rename from src/main/resources/modules/SpringBoot/java/framework/springmvc/GlobalHandlerInterceptor.java rename to src/main/resources/modules/SpringBoot/java/frame/springmvc/GlobalHandlerInterceptor.java index 1b51fe2a..7762ea9a 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/springmvc/GlobalHandlerInterceptor.java +++ b/src/main/resources/modules/SpringBoot/java/frame/springmvc/GlobalHandlerInterceptor.java @@ -1,8 +1,8 @@ -package ${basePackage}.framework.springmvc; +package ${basePackage}.frame.springmvc; -import ${basePackage}.framework.utils.LocalData; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.utils.LogUtil; +import ${basePackage}.frame.utils.LocalData; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.utils.LogUtil; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/AESUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/AESUtil.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/utils/AESUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/AESUtil.java index 107e6d8a..d384bcb8 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/AESUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/AESUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/Base64Util.java b/src/main/resources/modules/SpringBoot/java/frame/utils/Base64Util.java similarity index 99% rename from src/main/resources/modules/SpringBoot/java/framework/utils/Base64Util.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/Base64Util.java index b7116de8..c554f149 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/Base64Util.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/Base64Util.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import java.util.Arrays; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/CookieUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/CookieUtil.java similarity index 95% rename from src/main/resources/modules/SpringBoot/java/framework/utils/CookieUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/CookieUtil.java index 8483e640..e017e89f 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/CookieUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/CookieUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import javax.servlet.http.Cookie; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/IDgenerator.java b/src/main/resources/modules/SpringBoot/java/frame/utils/IDgenerator.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/utils/IDgenerator.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/IDgenerator.java index 1a0ef895..d2260fcb 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/IDgenerator.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/IDgenerator.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/LocalData.java b/src/main/resources/modules/SpringBoot/java/frame/utils/LocalData.java similarity index 96% rename from src/main/resources/modules/SpringBoot/java/framework/utils/LocalData.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/LocalData.java index 5f6d1938..94e40dc7 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/LocalData.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/LocalData.java @@ -1,6 +1,6 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; -import ${basePackage}.framework.base.Token; +import ${basePackage}.frame.base.Token; import org.springframework.context.ApplicationContext; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/LogUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/LogUtil.java similarity index 97% rename from src/main/resources/modules/SpringBoot/java/framework/utils/LogUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/LogUtil.java index 51eb269f..6aab307c 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/LogUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/LogUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/MD5Util.java b/src/main/resources/modules/SpringBoot/java/frame/utils/MD5Util.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/utils/MD5Util.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/MD5Util.java index 27c7e2ff..12c73809 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/MD5Util.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/MD5Util.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import com.fasterxml.jackson.core.TreeNode; import java.security.MessageDigest; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/MapperUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/MapperUtil.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/utils/MapperUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/MapperUtil.java index b6e54463..9dcd7baf 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/MapperUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/MapperUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/Message.java b/src/main/resources/modules/SpringBoot/java/frame/utils/Message.java similarity index 95% rename from src/main/resources/modules/SpringBoot/java/framework/utils/Message.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/Message.java index 72d7eec3..f4ec02b0 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/Message.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/Message.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; /** diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/ProcessUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/ProcessUtil.java similarity index 98% rename from src/main/resources/modules/SpringBoot/java/framework/utils/ProcessUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/ProcessUtil.java index 4ebe3df9..4b89b0b6 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/ProcessUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/ProcessUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import java.awt.*; import java.io.BufferedReader; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/RSAUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/RSAUtil.java similarity index 99% rename from src/main/resources/modules/SpringBoot/java/framework/utils/RSAUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/RSAUtil.java index a303139c..32c34d40 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/RSAUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/RSAUtil.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import javax.crypto.Cipher; import java.io.ByteArrayOutputStream; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/ValidationUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/ValidationUtil.java similarity index 89% rename from src/main/resources/modules/SpringBoot/java/framework/utils/ValidationUtil.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/ValidationUtil.java index 389b200a..5e9aac0c 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/ValidationUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/ValidationUtil.java @@ -1,8 +1,8 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; -import ${basePackage}.framework.base.BaseRequest; -import ${basePackage}.framework.base.BaseResponse; -import ${basePackage}.framework.base.ErrorType; +import ${basePackage}.frame.base.BaseRequest; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.base.ErrorType; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; diff --git a/src/main/resources/modules/SpringBoot/java/framework/utils/WebUtils.java b/src/main/resources/modules/SpringBoot/java/frame/utils/WebUtils.java similarity index 99% rename from src/main/resources/modules/SpringBoot/java/framework/utils/WebUtils.java rename to src/main/resources/modules/SpringBoot/java/frame/utils/WebUtils.java index 116e4f1f..44b00c52 100644 --- a/src/main/resources/modules/SpringBoot/java/framework/utils/WebUtils.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/WebUtils.java @@ -1,4 +1,4 @@ -package ${basePackage}.framework.utils; +package ${basePackage}.frame.utils; import javax.net.ssl.*; import java.io.*; diff --git a/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java b/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java index ee381ea9..da155139 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java +++ b/src/main/resources/modules/SpringBoot/java/mgr/ApiManager.java @@ -2,7 +2,7 @@ package ${basePackage}.${moduleName}.mgr; import ${basePackage}.${moduleName}.req.*; import ${basePackage}.${moduleName}.rsp.*; -import ${basePackage}.framework.base.Token; +import ${basePackage}.frame.base.Token; /** * Api接口 diff --git a/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java b/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java index 4570b643..51180bcd 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/mgr/ApiManagerImpl.java @@ -2,7 +2,7 @@ package ${basePackage}.${moduleName}.mgr; import ${basePackage}.${moduleName}.req.*; import ${basePackage}.${moduleName}.rsp.*; -import ${basePackage}.framework.base.Token; +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/mgr/manager.ftl index 35dcab2d..bf1fd7f7 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/manager.ftl +++ b/src/main/resources/modules/SpringBoot/java/mgr/manager.ftl @@ -2,7 +2,7 @@ package ${basePackage}.${moduleName}.mgr; import ${basePackage}.${moduleName}.req.*; import ${basePackage}.${moduleName}.rsp.*; -import ${basePackage}.framework.base.Token; +import ${basePackage}.frame.base.Token; /** * ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl b/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl index 3fe57a84..ab50a40e 100644 --- a/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl +++ b/src/main/resources/modules/SpringBoot/java/mgr/managerImpl.ftl @@ -1,11 +1,11 @@ package ${basePackage}.${moduleName}.mgr; -import ${basePackage}.framework.utils.IDgenerator; -import ${basePackage}.framework.utils.Message; -import ${basePackage}.framework.base.ErrorType; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.utils.MapperUtil; -import ${basePackage}.framework.utils.ValidationUtil; +import ${basePackage}.frame.utils.IDgenerator; +import ${basePackage}.frame.utils.Message; +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.*; diff --git a/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl b/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl index 480f1344..168d3d73 100644 --- a/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl +++ b/src/main/resources/modules/SpringBoot/java/mpr/mapperJava.ftl @@ -7,7 +7,7 @@ import java.util.List; import ${basePackage}.${moduleName}.ent.${table.getCName()}; import ${basePackage}.${moduleName}.req.*; -import ${basePackage}.framework.base.Token; +import ${basePackage}.frame.base.Token; /** * ${table.tableName} - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java b/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java index 30ee600a..f28f9549 100644 --- a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java +++ b/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseRequest; +import ${basePackage}.frame.base.BaseRequest; /** * ApiExampleRequest - Api示例请求 diff --git a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl index ac269ef3..76f54470 100644 --- a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseRequest; +import ${basePackage}.frame.base.BaseRequest; <#if table.has('Date')> import java.util.Date; diff --git a/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl index a66a8674..1d3fd27e 100644 --- a/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/deleteRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseUpdateRequest; +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/req/findRequestClass.ftl index d5f0d9c2..c1b48ddb 100644 --- a/src/main/resources/modules/SpringBoot/java/req/findRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/findRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseFindRequest; +import ${basePackage}.frame.base.BaseFindRequest; <#if table.has('Date')> import java.util.Date; diff --git a/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl index 15a15013..4974af17 100644 --- a/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/getAllRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseGetAllRequest; +import ${basePackage}.frame.base.BaseGetAllRequest; /** * ${table.getCName()}GetAllRequest - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl index fd8c058f..98e1f437 100644 --- a/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/getRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseRequest; +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/req/searchRequestClass.ftl index a040e486..12829bb0 100644 --- a/src/main/resources/modules/SpringBoot/java/req/searchRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/searchRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseSearchRequest; +import ${basePackage}.frame.base.BaseSearchRequest; <#if table.has('Date')> import java.util.Date; diff --git a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl index 81b1b8e9..94314a32 100644 --- a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.req; -import ${basePackage}.framework.base.BaseUpdateRequest; +import ${basePackage}.frame.base.BaseUpdateRequest; import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; diff --git a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java b/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java index 624b1296..220a1912 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java +++ b/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseResponse; +import ${basePackage}.frame.base.BaseResponse; /** * ApiExampleResponse - Api示例响应 diff --git a/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl index 95ef63e4..847d39ea 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/createResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseResponse; +import ${basePackage}.frame.base.BaseResponse; /** * ${table.getCName()}CreateResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl index 00381470..062e1444 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/deleteResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseResponse; +import ${basePackage}.frame.base.BaseResponse; /** * ${table.getCName()}DeleteResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl index f5291a72..1c95ba38 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/findResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseFindResponse; +import ${basePackage}.frame.base.BaseFindResponse; import ${basePackage}.${moduleName}.ent.${table.getCName()}; /** diff --git a/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl index 6cc7503c..b6dab918 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/getAllResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseFindResponse; +import ${basePackage}.frame.base.BaseFindResponse; import ${basePackage}.${moduleName}.ent.${table.getCName()}; /** diff --git a/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl index d4133fb2..c5d3a735 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/getResponseClass.ftl @@ -1,7 +1,7 @@ package ${basePackage}.${moduleName}.rsp; import ${basePackage}.${moduleName}.ent.${table.getCName()}; -import ${basePackage}.framework.base.BaseResponse; +import ${basePackage}.frame.base.BaseResponse; /** * ${table.getCName()}GetResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl index 23e4fd68..513a7a8f 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/searchResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseFindResponse; +import ${basePackage}.frame.base.BaseFindResponse; import ${basePackage}.${moduleName}.ent.${table.getCName()}; /** diff --git a/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl b/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl index 088ba074..8ad98810 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/rsp/updateResponseClass.ftl @@ -1,6 +1,6 @@ package ${basePackage}.${moduleName}.rsp; -import ${basePackage}.framework.base.BaseResponse; +import ${basePackage}.frame.base.BaseResponse; /** * ${table.getCName()}UpdateResponse - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/test/TestConfig.ftl b/src/main/resources/modules/SpringBoot/test/TestConfig.ftl index 8d6debe5..43fc9c3b 100644 --- a/src/main/resources/modules/SpringBoot/test/TestConfig.ftl +++ b/src/main/resources/modules/SpringBoot/test/TestConfig.ftl @@ -1,7 +1,7 @@ package ${basePackage}.config; -import ${basePackage}.framework.base.Token; -import ${basePackage}.framework.springmvc.GlobalHandlerInterceptor; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.springmvc.GlobalHandlerInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index 3652686a..2240c021 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import ${basePackage}.${moduleName}.mgr.${table.getCName()}Manager; import ${basePackage}.${moduleName}.req.*; import ${basePackage}.${moduleName}.rsp.*; -import ${basePackage}.framework.base.Token; +import ${basePackage}.frame.base.Token; ${table.getImport()} /**