diff --git a/README.md b/README.md index 72cab8e..e01ea41 100644 --- a/README.md +++ b/README.md @@ -189,10 +189,10 @@ com.softdev.system.generator ```java // 成功响应 -ResultVo.ok(data) +ResultVo.ok(data); // 错误响应 -ResultVo.error(message) +ResultVo.error(message); ``` ## 重构优势 @@ -236,7 +236,7 @@ ResultVo.error(message) # Update Logs | 更新日期 | 更新内容 | |:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| 2025.12.07 | 后端重构优化！[REFACTORING_DOCUMENT.md](REFACTORING_DOCUMENT.md) | +| 2025.12.07 | 后端重构优化！[REFACTORING_DOCUMENT.md](REFACTORING_DOCUMENT.md) ;目录结构调整! | | 2025.09.14 | 优化JSqlParser Engine(DDL Create SQL和Select SQL),适配更高级复杂的SQL | | 2025.09.13 | JSqlParser Engine全新升级，目前Select SQL模式相对稳定!
更新SpringBoot等类库版本，修复漏洞
修复CDN问题，切换为staticfile.org | | 2025.09.06 | 处理建表字段包含 using 字符时无法生成对应字段的情况(感谢@wubiaoo的反馈和@willxiang的PR) | diff --git a/generator-web/pom.xml b/generator-web/pom.xml deleted file mode 100644 index 2dc3742..0000000 --- a/generator-web/pom.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - 4.0.0 - - com.softdev.system - SpringBootCodeGenerator - 2023 - - - generator-web - 3.0 - jar - - - UTF-8 - UTF-8 - - - - - - - - - - - - - - junit - junit - test - - - - org.springframework.boot - spring-boot-autoconfigure - - - org.projectlombok - lombok - 1.18.32 - provided - - - - - - - - - src/main/java - - **/*.properties - **/*.xml - - false - - - src/main/resources - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - true - javac - 1.8 - 1.8 - UTF-8 - 1.8 - true - true - - - - org.codehaus.plexus - plexus-compiler-eclipse - 2.2 - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - true - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/pom.xml b/pom.xml index 484f396..b95a209 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ com.softdev.system SpringBootCodeGenerator - 2023 - pom + 2025 + jar org.springframework.boot @@ -14,10 +14,6 @@ 3.5.8 - - generator-web - - alimaven @@ -41,6 +37,16 @@ jsqlparser 5.3 + + junit + junit + test + + + + org.springframework.boot + spring-boot-autoconfigure + org.springframework.boot diff --git a/generator-web/src/main/java/com/softdev/system/generator/Application.java b/src/main/java/com/softdev/system/generator/Application.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/Application.java rename to src/main/java/com/softdev/system/generator/Application.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java b/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java rename to src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/HTMLFilter.java b/src/main/java/com/softdev/system/generator/config/HTMLFilter.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/config/HTMLFilter.java rename to src/main/java/com/softdev/system/generator/config/HTMLFilter.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/ServerConfig.java b/src/main/java/com/softdev/system/generator/config/ServerConfig.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/config/ServerConfig.java rename to src/main/java/com/softdev/system/generator/config/ServerConfig.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java b/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java rename to src/main/java/com/softdev/system/generator/config/WebMvcConfig.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/CodeGenController.java b/src/main/java/com/softdev/system/generator/controller/CodeGenController.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/controller/CodeGenController.java rename to src/main/java/com/softdev/system/generator/controller/CodeGenController.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java b/src/main/java/com/softdev/system/generator/controller/GeneratorController.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/controller/GeneratorController.java rename to src/main/java/com/softdev/system/generator/controller/GeneratorController.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/PageController.java b/src/main/java/com/softdev/system/generator/controller/PageController.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/controller/PageController.java rename to src/main/java/com/softdev/system/generator/controller/PageController.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/controller/TemplateController.java b/src/main/java/com/softdev/system/generator/controller/TemplateController.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/controller/TemplateController.java rename to src/main/java/com/softdev/system/generator/controller/TemplateController.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/ClassInfo.java b/src/main/java/com/softdev/system/generator/entity/ClassInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/ClassInfo.java rename to src/main/java/com/softdev/system/generator/entity/ClassInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java b/src/main/java/com/softdev/system/generator/entity/FieldInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/FieldInfo.java rename to src/main/java/com/softdev/system/generator/entity/FieldInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/NonCaseString.java b/src/main/java/com/softdev/system/generator/entity/NonCaseString.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/NonCaseString.java rename to src/main/java/com/softdev/system/generator/entity/NonCaseString.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/ParamInfo.java b/src/main/java/com/softdev/system/generator/entity/ParamInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/ParamInfo.java rename to src/main/java/com/softdev/system/generator/entity/ParamInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/TemplateConfig.java b/src/main/java/com/softdev/system/generator/entity/TemplateConfig.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/TemplateConfig.java rename to src/main/java/com/softdev/system/generator/entity/TemplateConfig.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/dto/ClassInfo.java b/src/main/java/com/softdev/system/generator/entity/dto/ClassInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/dto/ClassInfo.java rename to src/main/java/com/softdev/system/generator/entity/dto/ClassInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/dto/FieldInfo.java b/src/main/java/com/softdev/system/generator/entity/dto/FieldInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/dto/FieldInfo.java rename to src/main/java/com/softdev/system/generator/entity/dto/FieldInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/dto/ParamInfo.java b/src/main/java/com/softdev/system/generator/entity/dto/ParamInfo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/dto/ParamInfo.java rename to src/main/java/com/softdev/system/generator/entity/dto/ParamInfo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/enums/ParserTypeEnum.java b/src/main/java/com/softdev/system/generator/entity/enums/ParserTypeEnum.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/enums/ParserTypeEnum.java rename to src/main/java/com/softdev/system/generator/entity/enums/ParserTypeEnum.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/vo/ResultVo.java b/src/main/java/com/softdev/system/generator/entity/vo/ResultVo.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/entity/vo/ResultVo.java rename to src/main/java/com/softdev/system/generator/entity/vo/ResultVo.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/CodeGenService.java b/src/main/java/com/softdev/system/generator/service/CodeGenService.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/CodeGenService.java rename to src/main/java/com/softdev/system/generator/service/CodeGenService.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/TemplateService.java b/src/main/java/com/softdev/system/generator/service/TemplateService.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/TemplateService.java rename to src/main/java/com/softdev/system/generator/service/TemplateService.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/impl/CodeGenServiceImpl.java b/src/main/java/com/softdev/system/generator/service/impl/CodeGenServiceImpl.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/impl/CodeGenServiceImpl.java rename to src/main/java/com/softdev/system/generator/service/impl/CodeGenServiceImpl.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/impl/TemplateServiceImpl.java b/src/main/java/com/softdev/system/generator/service/impl/TemplateServiceImpl.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/impl/TemplateServiceImpl.java rename to src/main/java/com/softdev/system/generator/service/impl/TemplateServiceImpl.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/impl/parser/JsonParserServiceImpl.java b/src/main/java/com/softdev/system/generator/service/impl/parser/JsonParserServiceImpl.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/impl/parser/JsonParserServiceImpl.java rename to src/main/java/com/softdev/system/generator/service/impl/parser/JsonParserServiceImpl.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/impl/parser/SqlParserServiceImpl.java b/src/main/java/com/softdev/system/generator/service/impl/parser/SqlParserServiceImpl.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/impl/parser/SqlParserServiceImpl.java rename to src/main/java/com/softdev/system/generator/service/impl/parser/SqlParserServiceImpl.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/parser/JsonParserService.java b/src/main/java/com/softdev/system/generator/service/parser/JsonParserService.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/parser/JsonParserService.java rename to src/main/java/com/softdev/system/generator/service/parser/JsonParserService.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/parser/SqlParserService.java b/src/main/java/com/softdev/system/generator/service/parser/SqlParserService.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/service/parser/SqlParserService.java rename to src/main/java/com/softdev/system/generator/service/parser/SqlParserService.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/CodeGenerateException.java b/src/main/java/com/softdev/system/generator/util/CodeGenerateException.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/CodeGenerateException.java rename to src/main/java/com/softdev/system/generator/util/CodeGenerateException.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java b/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java rename to src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/MapUtil.java b/src/main/java/com/softdev/system/generator/util/MapUtil.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/MapUtil.java rename to src/main/java/com/softdev/system/generator/util/MapUtil.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/SqlException.java b/src/main/java/com/softdev/system/generator/util/SqlException.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/SqlException.java rename to src/main/java/com/softdev/system/generator/util/SqlException.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/StringUtilsPlus.java b/src/main/java/com/softdev/system/generator/util/StringUtilsPlus.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/StringUtilsPlus.java rename to src/main/java/com/softdev/system/generator/util/StringUtilsPlus.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/ValueUtil.java b/src/main/java/com/softdev/system/generator/util/ValueUtil.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/ValueUtil.java rename to src/main/java/com/softdev/system/generator/util/ValueUtil.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/exception/CodeGenException.java b/src/main/java/com/softdev/system/generator/util/exception/CodeGenException.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/exception/CodeGenException.java rename to src/main/java/com/softdev/system/generator/util/exception/CodeGenException.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/exception/SqlParseException.java b/src/main/java/com/softdev/system/generator/util/exception/SqlParseException.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/exception/SqlParseException.java rename to src/main/java/com/softdev/system/generator/util/exception/SqlParseException.java diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/mysqlJavaTypeUtil.java b/src/main/java/com/softdev/system/generator/util/mysqlJavaTypeUtil.java similarity index 100% rename from generator-web/src/main/java/com/softdev/system/generator/util/mysqlJavaTypeUtil.java rename to src/main/java/com/softdev/system/generator/util/mysqlJavaTypeUtil.java diff --git a/generator-web/src/main/resources/application-bejson.yml b/src/main/resources/application-bejson.yml similarity index 100% rename from generator-web/src/main/resources/application-bejson.yml rename to src/main/resources/application-bejson.yml diff --git a/generator-web/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml similarity index 100% rename from generator-web/src/main/resources/application-dev.yml rename to src/main/resources/application-dev.yml diff --git a/generator-web/src/main/resources/application-json.yml b/src/main/resources/application-json.yml similarity index 100% rename from generator-web/src/main/resources/application-json.yml rename to src/main/resources/application-json.yml diff --git a/generator-web/src/main/resources/application.yml b/src/main/resources/application.yml similarity index 100% rename from generator-web/src/main/resources/application.yml rename to src/main/resources/application.yml diff --git a/generator-web/src/main/resources/statics/fonts/FontAwesome.otf b/src/main/resources/statics/fonts/FontAwesome.otf similarity index 100% rename from generator-web/src/main/resources/statics/fonts/FontAwesome.otf rename to src/main/resources/statics/fonts/FontAwesome.otf diff --git a/generator-web/src/main/resources/statics/fonts/fontawesome-webfont.eot b/src/main/resources/statics/fonts/fontawesome-webfont.eot similarity index 100% rename from generator-web/src/main/resources/statics/fonts/fontawesome-webfont.eot rename to src/main/resources/statics/fonts/fontawesome-webfont.eot diff --git a/generator-web/src/main/resources/statics/fonts/fontawesome-webfont.svg b/src/main/resources/statics/fonts/fontawesome-webfont.svg similarity index 100% rename from generator-web/src/main/resources/statics/fonts/fontawesome-webfont.svg rename to src/main/resources/statics/fonts/fontawesome-webfont.svg diff --git a/generator-web/src/main/resources/statics/fonts/fontawesome-webfont.ttf b/src/main/resources/statics/fonts/fontawesome-webfont.ttf similarity index 100% rename from generator-web/src/main/resources/statics/fonts/fontawesome-webfont.ttf rename to src/main/resources/statics/fonts/fontawesome-webfont.ttf diff --git a/generator-web/src/main/resources/statics/fonts/fontawesome-webfont.woff b/src/main/resources/statics/fonts/fontawesome-webfont.woff similarity index 100% rename from generator-web/src/main/resources/statics/fonts/fontawesome-webfont.woff rename to src/main/resources/statics/fonts/fontawesome-webfont.woff diff --git a/generator-web/src/main/resources/statics/fonts/fontawesome-webfont.woff2 b/src/main/resources/statics/fonts/fontawesome-webfont.woff2 similarity index 100% rename from generator-web/src/main/resources/statics/fonts/fontawesome-webfont.woff2 rename to src/main/resources/statics/fonts/fontawesome-webfont.woff2 diff --git a/generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.eot b/src/main/resources/statics/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.eot rename to src/main/resources/statics/fonts/glyphicons-halflings-regular.eot diff --git a/generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.svg b/src/main/resources/statics/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.svg rename to src/main/resources/statics/fonts/glyphicons-halflings-regular.svg diff --git a/generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.ttf b/src/main/resources/statics/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.ttf rename to src/main/resources/statics/fonts/glyphicons-halflings-regular.ttf diff --git a/generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff b/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff rename to src/main/resources/statics/fonts/glyphicons-halflings-regular.woff diff --git a/generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff2 b/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from generator-web/src/main/resources/statics/fonts/glyphicons-halflings-regular.woff2 rename to src/main/resources/statics/fonts/glyphicons-halflings-regular.woff2 diff --git a/generator-web/src/main/resources/statics/js/common.js b/src/main/resources/statics/js/common.js similarity index 100% rename from generator-web/src/main/resources/statics/js/common.js rename to src/main/resources/statics/js/common.js diff --git a/generator-web/src/main/resources/statics/js/index.js b/src/main/resources/statics/js/index.js similarity index 100% rename from generator-web/src/main/resources/statics/js/index.js rename to src/main/resources/statics/js/index.js diff --git a/generator-web/src/main/resources/statics/js/main.js b/src/main/resources/statics/js/main.js similarity index 100% rename from generator-web/src/main/resources/statics/js/main.js rename to src/main/resources/statics/js/main.js diff --git a/generator-web/src/main/resources/statics/js/navtab.js b/src/main/resources/statics/js/navtab.js similarity index 100% rename from generator-web/src/main/resources/statics/js/navtab.js rename to src/main/resources/statics/js/navtab.js diff --git a/generator-web/src/main/resources/statics/libs/axios/axios.min.js b/src/main/resources/statics/libs/axios/axios.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/axios/axios.min.js rename to src/main/resources/statics/libs/axios/axios.min.js diff --git a/generator-web/src/main/resources/statics/libs/axios/axios.min.map b/src/main/resources/statics/libs/axios/axios.min.map similarity index 100% rename from generator-web/src/main/resources/statics/libs/axios/axios.min.map rename to src/main/resources/statics/libs/axios/axios.min.map diff --git a/generator-web/src/main/resources/statics/libs/bootstrap-icons/bootstrap-icons.min.css b/src/main/resources/statics/libs/bootstrap-icons/bootstrap-icons.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap-icons/bootstrap-icons.min.css rename to src/main/resources/statics/libs/bootstrap-icons/bootstrap-icons.min.css diff --git a/generator-web/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff b/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff rename to src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff diff --git a/generator-web/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff2 b/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff2 similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff2 rename to src/main/resources/statics/libs/bootstrap-icons/fonts/bootstrap-icons.woff2 diff --git a/generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js b/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js rename to src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js diff --git a/generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js.map b/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js.map similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js.map rename to src/main/resources/statics/libs/bootstrap/bootstrap.bundle.min.js.map diff --git a/generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.css b/src/main/resources/statics/libs/bootstrap/bootstrap.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.css rename to src/main/resources/statics/libs/bootstrap/bootstrap.min.css diff --git a/generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.css.map b/src/main/resources/statics/libs/bootstrap/bootstrap.min.css.map similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.css.map rename to src/main/resources/statics/libs/bootstrap/bootstrap.min.css.map diff --git a/generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.js b/src/main/resources/statics/libs/bootstrap/bootstrap.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/bootstrap/bootstrap.min.js rename to src/main/resources/statics/libs/bootstrap/bootstrap.min.js diff --git a/generator-web/src/main/resources/statics/libs/codemirror/codemirror.min.css b/src/main/resources/statics/libs/codemirror/codemirror.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/codemirror/codemirror.min.css rename to src/main/resources/statics/libs/codemirror/codemirror.min.css diff --git a/generator-web/src/main/resources/statics/libs/codemirror/codemirror.min.js b/src/main/resources/statics/libs/codemirror/codemirror.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/codemirror/codemirror.min.js rename to src/main/resources/statics/libs/codemirror/codemirror.min.js diff --git a/generator-web/src/main/resources/statics/libs/codemirror/mode/clike/clike.min.js b/src/main/resources/statics/libs/codemirror/mode/clike/clike.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/codemirror/mode/clike/clike.min.js rename to src/main/resources/statics/libs/codemirror/mode/clike/clike.min.js diff --git a/generator-web/src/main/resources/statics/libs/codemirror/mode/sql/sql.min.js b/src/main/resources/statics/libs/codemirror/mode/sql/sql.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/codemirror/mode/sql/sql.min.js rename to src/main/resources/statics/libs/codemirror/mode/sql/sql.min.js diff --git a/generator-web/src/main/resources/statics/libs/codemirror/theme/idea.min.css b/src/main/resources/statics/libs/codemirror/theme/idea.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/codemirror/theme/idea.min.css rename to src/main/resources/statics/libs/codemirror/theme/idea.min.css diff --git a/generator-web/src/main/resources/statics/libs/element-ui/fonts/element-icons.woff b/src/main/resources/statics/libs/element-ui/fonts/element-icons.woff similarity index 100% rename from generator-web/src/main/resources/statics/libs/element-ui/fonts/element-icons.woff rename to src/main/resources/statics/libs/element-ui/fonts/element-icons.woff diff --git a/generator-web/src/main/resources/statics/libs/element-ui/index.min.css b/src/main/resources/statics/libs/element-ui/index.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/element-ui/index.min.css rename to src/main/resources/statics/libs/element-ui/index.min.css diff --git a/generator-web/src/main/resources/statics/libs/element-ui/index.min.js b/src/main/resources/statics/libs/element-ui/index.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/element-ui/index.min.js rename to src/main/resources/statics/libs/element-ui/index.min.js diff --git a/generator-web/src/main/resources/statics/libs/jquery/jquery.min.js b/src/main/resources/statics/libs/jquery/jquery.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/jquery/jquery.min.js rename to src/main/resources/statics/libs/jquery/jquery.min.js diff --git a/generator-web/src/main/resources/statics/libs/toastr.js/toastr.js.map b/src/main/resources/statics/libs/toastr.js/toastr.js.map similarity index 100% rename from generator-web/src/main/resources/statics/libs/toastr.js/toastr.js.map rename to src/main/resources/statics/libs/toastr.js/toastr.js.map diff --git a/generator-web/src/main/resources/statics/libs/toastr.js/toastr.min.css b/src/main/resources/statics/libs/toastr.js/toastr.min.css similarity index 100% rename from generator-web/src/main/resources/statics/libs/toastr.js/toastr.min.css rename to src/main/resources/statics/libs/toastr.js/toastr.min.css diff --git a/generator-web/src/main/resources/statics/libs/toastr.js/toastr.min.js b/src/main/resources/statics/libs/toastr.js/toastr.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/toastr.js/toastr.min.js rename to src/main/resources/statics/libs/toastr.js/toastr.min.js diff --git a/generator-web/src/main/resources/statics/libs/vue/vue.min.js b/src/main/resources/statics/libs/vue/vue.min.js similarity index 100% rename from generator-web/src/main/resources/statics/libs/vue/vue.min.js rename to src/main/resources/statics/libs/vue/vue.min.js diff --git a/generator-web/src/main/resources/template.json b/src/main/resources/template.json similarity index 100% rename from generator-web/src/main/resources/template.json rename to src/main/resources/template.json diff --git a/generator-web/src/main/resources/templates/404.html b/src/main/resources/templates/404.html similarity index 100% rename from generator-web/src/main/resources/templates/404.html rename to src/main/resources/templates/404.html diff --git a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl b/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl rename to src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl b/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl rename to src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlmd.ftl b/src/main/resources/templates/code-generator/beetlsql/beetlmd.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/beetlsql/beetlmd.ftl rename to src/main/resources/templates/code-generator/beetlsql/beetlmd.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/bi/qliksense.ftl b/src/main/resources/templates/code-generator/bi/qliksense.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/bi/qliksense.ftl rename to src/main/resources/templates/code-generator/bi/qliksense.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/cloud/bigquery.ftl b/src/main/resources/templates/code-generator/cloud/bigquery.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/cloud/bigquery.ftl rename to src/main/resources/templates/code-generator/cloud/bigquery.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/cloud/dataflowjjs.ftl b/src/main/resources/templates/code-generator/cloud/dataflowjjs.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/cloud/dataflowjjs.ftl rename to src/main/resources/templates/code-generator/cloud/dataflowjjs.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/common-mapper/tkentity.ftl b/src/main/resources/templates/code-generator/common-mapper/tkentity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/common-mapper/tkentity.ftl rename to src/main/resources/templates/code-generator/common-mapper/tkentity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/common-mapper/tkmapper.ftl b/src/main/resources/templates/code-generator/common-mapper/tkmapper.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/common-mapper/tkmapper.ftl rename to src/main/resources/templates/code-generator/common-mapper/tkmapper.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl b/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl rename to src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl b/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl rename to src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl b/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl rename to src/main/resources/templates/code-generator/jpa-starp/starp-entity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl b/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl rename to src/main/resources/templates/code-generator/jpa-starp/starp-jpa-controller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl b/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl rename to src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl b/src/main/resources/templates/code-generator/jpa/entity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl rename to src/main/resources/templates/code-generator/jpa/entity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl b/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl rename to src/main/resources/templates/code-generator/jpa/jpacontroller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl b/src/main/resources/templates/code-generator/jpa/repository.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl rename to src/main/resources/templates/code-generator/jpa/repository.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl b/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl rename to src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl rename to src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl b/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl rename to src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl b/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl rename to src/main/resources/templates/code-generator/mybatis-plus/plusservice.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl b/src/main/resources/templates/code-generator/mybatis/controller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl rename to src/main/resources/templates/code-generator/mybatis/controller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl b/src/main/resources/templates/code-generator/mybatis/mapper.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl rename to src/main/resources/templates/code-generator/mybatis/mapper.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl b/src/main/resources/templates/code-generator/mybatis/mapper2.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl rename to src/main/resources/templates/code-generator/mybatis/mapper2.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl b/src/main/resources/templates/code-generator/mybatis/model.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl rename to src/main/resources/templates/code-generator/mybatis/model.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl b/src/main/resources/templates/code-generator/mybatis/mybatis.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl rename to src/main/resources/templates/code-generator/mybatis/mybatis.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl b/src/main/resources/templates/code-generator/mybatis/service.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl rename to src/main/resources/templates/code-generator/mybatis/service.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl b/src/main/resources/templates/code-generator/mybatis/service_impl.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl rename to src/main/resources/templates/code-generator/mybatis/service_impl.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/menu-sql.ftl b/src/main/resources/templates/code-generator/renren-fast/menu-sql.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/menu-sql.ftl rename to src/main/resources/templates/code-generator/renren-fast/menu-sql.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/rr-controller.ftl b/src/main/resources/templates/code-generator/renren-fast/rr-controller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/rr-controller.ftl rename to src/main/resources/templates/code-generator/renren-fast/rr-controller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/rr-dao.ftl b/src/main/resources/templates/code-generator/renren-fast/rr-dao.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/rr-dao.ftl rename to src/main/resources/templates/code-generator/renren-fast/rr-dao.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/rr-daoxml.ftl b/src/main/resources/templates/code-generator/renren-fast/rr-daoxml.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/rr-daoxml.ftl rename to src/main/resources/templates/code-generator/renren-fast/rr-daoxml.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/rr-entity.ftl b/src/main/resources/templates/code-generator/renren-fast/rr-entity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/rr-entity.ftl rename to src/main/resources/templates/code-generator/renren-fast/rr-entity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/rr-service.ftl b/src/main/resources/templates/code-generator/renren-fast/rr-service.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/rr-service.ftl rename to src/main/resources/templates/code-generator/renren-fast/rr-service.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/vue-edit.ftl b/src/main/resources/templates/code-generator/renren-fast/vue-edit.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/vue-edit.ftl rename to src/main/resources/templates/code-generator/renren-fast/vue-edit.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/renren-fast/vue-list.ftl b/src/main/resources/templates/code-generator/renren-fast/vue-list.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/renren-fast/vue-list.ftl rename to src/main/resources/templates/code-generator/renren-fast/vue-list.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-controller.ftl b/src/main/resources/templates/code-generator/tk-mybatis/tk-controller.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-controller.ftl rename to src/main/resources/templates/code-generator/tk-mybatis/tk-controller.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-entity.ftl b/src/main/resources/templates/code-generator/tk-mybatis/tk-entity.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-entity.ftl rename to src/main/resources/templates/code-generator/tk-mybatis/tk-entity.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl b/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl rename to src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/ui/bootstrap-ui.ftl b/src/main/resources/templates/code-generator/ui/bootstrap-ui.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/ui/bootstrap-ui.ftl rename to src/main/resources/templates/code-generator/ui/bootstrap-ui.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl b/src/main/resources/templates/code-generator/ui/element-ui.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/ui/element-ui.ftl rename to src/main/resources/templates/code-generator/ui/element-ui.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/ui/layui-edit.ftl b/src/main/resources/templates/code-generator/ui/layui-edit.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/ui/layui-edit.ftl rename to src/main/resources/templates/code-generator/ui/layui-edit.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/ui/layui-list.ftl b/src/main/resources/templates/code-generator/ui/layui-list.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/ui/layui-list.ftl rename to src/main/resources/templates/code-generator/ui/layui-list.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/ui/swagger-ui.ftl b/src/main/resources/templates/code-generator/ui/swagger-ui.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/ui/swagger-ui.ftl rename to src/main/resources/templates/code-generator/ui/swagger-ui.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl b/src/main/resources/templates/code-generator/util/beanutil.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/util/beanutil.ftl rename to src/main/resources/templates/code-generator/util/beanutil.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/util/json.ftl b/src/main/resources/templates/code-generator/util/json.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/util/json.ftl rename to src/main/resources/templates/code-generator/util/json.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/util/sql.ftl b/src/main/resources/templates/code-generator/util/sql.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/util/sql.ftl rename to src/main/resources/templates/code-generator/util/sql.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/util/swagger-yml.ftl b/src/main/resources/templates/code-generator/util/swagger-yml.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/util/swagger-yml.ftl rename to src/main/resources/templates/code-generator/util/swagger-yml.ftl diff --git a/generator-web/src/main/resources/templates/code-generator/util/xml.ftl b/src/main/resources/templates/code-generator/util/xml.ftl similarity index 100% rename from generator-web/src/main/resources/templates/code-generator/util/xml.ftl rename to src/main/resources/templates/code-generator/util/xml.ftl diff --git a/generator-web/src/main/resources/templates/newui-header.html b/src/main/resources/templates/newui-header.html similarity index 100% rename from generator-web/src/main/resources/templates/newui-header.html rename to src/main/resources/templates/newui-header.html diff --git a/generator-web/src/main/resources/templates/newui-import-CDN.html b/src/main/resources/templates/newui-import-CDN.html similarity index 100% rename from generator-web/src/main/resources/templates/newui-import-CDN.html rename to src/main/resources/templates/newui-import-CDN.html diff --git a/generator-web/src/main/resources/templates/newui-import-local.html b/src/main/resources/templates/newui-import-local.html similarity index 100% rename from generator-web/src/main/resources/templates/newui-import-local.html rename to src/main/resources/templates/newui-import-local.html diff --git a/generator-web/src/main/resources/templates/newui2.html b/src/main/resources/templates/newui2.html similarity index 100% rename from generator-web/src/main/resources/templates/newui2.html rename to src/main/resources/templates/newui2.html diff --git a/generator-web/src/test/java/com/softdev/system/generator/util/StringUtilsPlusTest.java b/src/test/java/com/softdev/system/generator/util/StringUtilsPlusTest.java similarity index 100% rename from generator-web/src/test/java/com/softdev/system/generator/util/StringUtilsPlusTest.java rename to src/test/java/com/softdev/system/generator/util/StringUtilsPlusTest.java