android 优化，webapp

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<String, Object> ctx = new HashMap<String, Object>();
+        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);
     }
 
     /**

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();
 //        }

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.");
                     }

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;

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.*;
 </#list>
-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 {

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.*;
 </#list>
-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;

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;

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;

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;

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;

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;

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

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;

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;

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;

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;
 </#if>
-import ${basePackage}.framework.base.BaseEntity;
+import ${basePackage}.frame.base.BaseEntity;
 
 /**
  * ${table.tableName} - ${table.tableComment}

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;

src/main/resources/modules/SpringBoot/java/frame/base/BaseFindRequest.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * BaseFindRequest - 基类

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;
 

src/main/resources/modules/SpringBoot/java/frame/base/BaseGetAllRequest.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * BaseFindRequest - 基类

src/main/resources/modules/SpringBoot/java/frame/base/BaseRequest.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * BaseRequest - 基类

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;

src/main/resources/modules/SpringBoot/java/frame/base/BaseSearchRequest.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * BaseSearchRequest - 基类

src/main/resources/modules/SpringBoot/java/frame/base/BaseUpdateRequest.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * BaseUpdateRequest - 基类

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;
 

src/main/resources/modules/SpringBoot/java/frame/base/Error.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * Error - 错误基类

src/main/resources/modules/SpringBoot/java/frame/base/ErrorType.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * ErrorType - 错误类型

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 {
 

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;
 

src/main/resources/modules/SpringBoot/java/frame/base/SortType.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.base;
+package ${basePackage}.frame.base;
 
 /**
  * SortTypeEnum - 排序方式

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;

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;
 
 /**
  * 布局帮助类

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

src/main/resources/modules/SpringBoot/java/frame/utils/Message.java

@@ -1,4 +1,4 @@
-package ${basePackage}.framework.utils;
+package ${basePackage}.frame.utils;
 
 
 /**

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;

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;

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;

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.*;

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接口

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;
 

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}

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.*;

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}

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示例请求

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;
 </#if>

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;
 
 /**

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;
 </#if>

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}

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;
 
 /**

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;
 </#if>

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;

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示例响应

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}

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}

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()};
 
 /**

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()};
 
 /**

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}

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()};
 
 /**

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}

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;

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()}
 
 /**