From 87829d3ce8ab5a35091800900f7d7708f15ed9c2 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 5 Mar 2024 22:54:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8A=BD=E5=8F=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=8F=92=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=88=E5=90=8E=E7=BB=AD=E4=BC=9A=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E4=B8=BA=E7=8B=AC=E7=AB=8B=E6=8F=92=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 4 +-- .../properties/GeneratorProperties.java | 2 +- .../admin/generator}/enums/FormTypeEnum.java | 2 +- .../admin/generator}/enums/QueryTypeEnum.java | 2 +- .../generator}/mapper/FieldConfigMapper.java | 4 +-- .../generator}/mapper/GenConfigMapper.java | 4 +-- .../model/entity/FieldConfigDO.java | 6 ++-- .../generator}/model/entity/GenConfigDO.java | 2 +- .../generator}/model/query/TableQuery.java | 9 +++--- .../generator}/model/req/GenConfigReq.java | 6 ++-- .../model/resp/GeneratePreviewResp.java | 2 +- .../generator}/model/resp/TableResp.java | 2 +- .../generator}/service/GeneratorService.java | 14 ++++----- .../service/impl/GeneratorServiceImpl.java | 26 ++++++++-------- .../src/main/resources/generator.properties | 1 - .../templates/generator/Controller.ftl | 0 .../templates/generator/DetailResp.ftl | 0 .../resources/templates/generator/Entity.ftl | 0 .../resources/templates/generator/Mapper.ftl | 0 .../resources/templates/generator/Query.ftl | 0 .../resources/templates/generator/Req.ftl | 0 .../resources/templates/generator/Resp.ftl | 0 .../resources/templates/generator/Service.ftl | 0 .../templates/generator/ServiceImpl.ftl | 0 .../resources/templates/generator/api.ftl | 0 .../resources/templates/generator/index.ftl | 0 continew-admin-webapi/pom.xml | 8 ++--- .../webapi/tool/GeneratorController.java | 30 ++++++++----------- .../src/main/resources/config/application.yml | 26 ++++++++-------- pom.xml | 14 ++++----- 30 files changed, 78 insertions(+), 86 deletions(-) rename {continew-admin-tool => continew-admin-generator}/pom.xml (80%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/config/properties/GeneratorProperties.java (96%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/enums/FormTypeEnum.java (96%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/enums/QueryTypeEnum.java (97%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/mapper/FieldConfigMapper.java (90%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/mapper/GenConfigMapper.java (87%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/entity/FieldConfigDO.java (96%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/entity/GenConfigDO.java (98%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/query/TableQuery.java (95%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/req/GenConfigReq.java (88%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/resp/GeneratePreviewResp.java (96%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/model/resp/TableResp.java (96%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/service/GeneratorService.java (81%) rename {continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool => continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator}/service/impl/GeneratorServiceImpl.java (95%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/generator.properties (81%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Controller.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/DetailResp.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Entity.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Mapper.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Query.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Req.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Resp.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/Service.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/ServiceImpl.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/api.ftl (100%) rename {continew-admin-tool => continew-admin-generator}/src/main/resources/templates/generator/index.ftl (100%) diff --git a/continew-admin-tool/pom.xml b/continew-admin-generator/pom.xml similarity index 80% rename from continew-admin-tool/pom.xml rename to continew-admin-generator/pom.xml index dac6a2f3..4941dd66 100644 --- a/continew-admin-tool/pom.xml +++ b/continew-admin-generator/pom.xml @@ -9,8 +9,8 @@ ${revision} - continew-admin-tool - 系统工具模块（存放系统工具相关业务功能，例如：代码生成等） + continew-admin-generator + 代码生成器插件 diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/config/properties/GeneratorProperties.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java similarity index 96% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/config/properties/GeneratorProperties.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java index 928bb31b..546e6533 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/config/properties/GeneratorProperties.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/config/properties/GeneratorProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.config.properties; +package top.charles7c.continew.admin.generator.config.properties; import java.util.Map; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java similarity index 96% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java index a9e8febc..446211f8 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/FormTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/FormTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.enums; +package top.charles7c.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/QueryTypeEnum.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java similarity index 97% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/QueryTypeEnum.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java index 60107013..8d277d68 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/QueryTypeEnum.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/enums/QueryTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.enums; +package top.charles7c.continew.admin.generator.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java similarity index 90% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java index 23273270..420dc89b 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/FieldConfigMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.mapper; +package top.charles7c.continew.admin.generator.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; +import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; import java.util.List; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java similarity index 87% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java index 1c8a9dac..ace24ffa 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/mapper/GenConfigMapper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.mapper; +package top.charles7c.continew.admin.generator.mapper; -import top.charles7c.continew.admin.tool.model.entity.GenConfigDO; +import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; /** diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java similarity index 96% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java index 9b80c785..6f5950e8 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/FieldConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.entity; +package top.charles7c.continew.admin.generator.model.entity; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; @@ -29,8 +29,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; -import top.charles7c.continew.admin.tool.enums.FormTypeEnum; -import top.charles7c.continew.admin.tool.enums.QueryTypeEnum; +import top.charles7c.continew.admin.generator.enums.FormTypeEnum; +import top.charles7c.continew.admin.generator.enums.QueryTypeEnum; import top.charles7c.continew.starter.core.constant.StringConstants; import java.io.Serial; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/GenConfigDO.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java similarity index 98% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/GenConfigDO.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java index eb47bc06..29d2e8e1 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/GenConfigDO.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/entity/GenConfigDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.entity; +package top.charles7c.continew.admin.generator.model.entity; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/query/TableQuery.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java similarity index 95% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/query/TableQuery.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java index e29576df..b454da54 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/query/TableQuery.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/query/TableQuery.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.query; - -import java.io.Serial; -import java.io.Serializable; +package top.charles7c.continew.admin.generator.model.query; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serial; +import java.io.Serializable; /** * 表信息查询条件 diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/req/GenConfigReq.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java similarity index 88% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/req/GenConfigReq.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java index e5e0b3b6..287a32fa 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/req/GenConfigReq.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/req/GenConfigReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.req; +package top.charles7c.continew.admin.generator.model.req; import java.io.Serial; import java.io.Serializable; @@ -29,8 +29,8 @@ import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.tool.model.entity.GenConfigDO; +import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; +import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; /** * 代码生成配置信息 diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/GeneratePreviewResp.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java similarity index 96% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/GeneratePreviewResp.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java index e1a22d17..6eb6a956 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/GeneratePreviewResp.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/GeneratePreviewResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.resp; +package top.charles7c.continew.admin.generator.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/TableResp.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java similarity index 96% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/TableResp.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java index 3d61fa69..db573351 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/resp/TableResp.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/model/resp/TableResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.model.resp; +package top.charles7c.continew.admin.generator.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/GeneratorService.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java similarity index 81% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/GeneratorService.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java index 7706813a..dcf77a96 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/GeneratorService.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/GeneratorService.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.service; +package top.charles7c.continew.admin.generator.service; import java.sql.SQLException; import java.util.List; -import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.tool.model.entity.GenConfigDO; -import top.charles7c.continew.admin.tool.model.query.TableQuery; -import top.charles7c.continew.admin.tool.model.req.GenConfigReq; -import top.charles7c.continew.admin.tool.model.resp.GeneratePreviewResp; -import top.charles7c.continew.admin.tool.model.resp.TableResp; +import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; +import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; +import top.charles7c.continew.admin.generator.model.query.TableQuery; +import top.charles7c.continew.admin.generator.model.req.GenConfigReq; +import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; +import top.charles7c.continew.admin.generator.model.resp.TableResp; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java similarity index 95% rename from continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java rename to continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 9fc62e75..0cd23b97 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-generator/src/main/java/top/charles7c/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.admin.tool.service.impl; +package top.charles7c.continew.admin.generator.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -31,18 +31,18 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.charles7c.continew.admin.tool.config.properties.GeneratorProperties; -import top.charles7c.continew.admin.tool.config.properties.GeneratorProperties.TemplateConfig; -import top.charles7c.continew.admin.tool.enums.QueryTypeEnum; -import top.charles7c.continew.admin.tool.mapper.FieldConfigMapper; -import top.charles7c.continew.admin.tool.mapper.GenConfigMapper; -import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.tool.model.entity.GenConfigDO; -import top.charles7c.continew.admin.tool.model.query.TableQuery; -import top.charles7c.continew.admin.tool.model.req.GenConfigReq; -import top.charles7c.continew.admin.tool.model.resp.GeneratePreviewResp; -import top.charles7c.continew.admin.tool.model.resp.TableResp; -import top.charles7c.continew.admin.tool.service.GeneratorService; +import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties; +import top.charles7c.continew.admin.generator.config.properties.GeneratorProperties.TemplateConfig; +import top.charles7c.continew.admin.generator.enums.QueryTypeEnum; +import top.charles7c.continew.admin.generator.mapper.FieldConfigMapper; +import top.charles7c.continew.admin.generator.mapper.GenConfigMapper; +import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; +import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; +import top.charles7c.continew.admin.generator.model.query.TableQuery; +import top.charles7c.continew.admin.generator.model.req.GenConfigReq; +import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; +import top.charles7c.continew.admin.generator.model.resp.TableResp; +import top.charles7c.continew.admin.generator.service.GeneratorService; import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.core.exception.BusinessException; import top.charles7c.continew.starter.core.util.TemplateUtils; diff --git a/continew-admin-tool/src/main/resources/generator.properties b/continew-admin-generator/src/main/resources/generator.properties similarity index 81% rename from continew-admin-tool/src/main/resources/generator.properties rename to continew-admin-generator/src/main/resources/generator.properties index 81b7c395..a50f63c6 100644 --- a/continew-admin-tool/src/main/resources/generator.properties +++ b/continew-admin-generator/src/main/resources/generator.properties @@ -1,4 +1,3 @@ -# Database type to Java type（ELADMIN） tinyint=Integer smallint=Integer mediumint=Integer diff --git a/continew-admin-tool/src/main/resources/templates/generator/Controller.ftl b/continew-admin-generator/src/main/resources/templates/generator/Controller.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Controller.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Controller.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl b/continew-admin-generator/src/main/resources/templates/generator/DetailResp.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/DetailResp.ftl rename to continew-admin-generator/src/main/resources/templates/generator/DetailResp.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Entity.ftl b/continew-admin-generator/src/main/resources/templates/generator/Entity.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Entity.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Entity.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl b/continew-admin-generator/src/main/resources/templates/generator/Mapper.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Mapper.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-generator/src/main/resources/templates/generator/Query.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Query.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Query.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Req.ftl b/continew-admin-generator/src/main/resources/templates/generator/Req.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Req.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Req.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Resp.ftl b/continew-admin-generator/src/main/resources/templates/generator/Resp.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Resp.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Resp.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/Service.ftl b/continew-admin-generator/src/main/resources/templates/generator/Service.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/Service.ftl rename to continew-admin-generator/src/main/resources/templates/generator/Service.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/ServiceImpl.ftl b/continew-admin-generator/src/main/resources/templates/generator/ServiceImpl.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/ServiceImpl.ftl rename to continew-admin-generator/src/main/resources/templates/generator/ServiceImpl.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/api.ftl b/continew-admin-generator/src/main/resources/templates/generator/api.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/api.ftl rename to continew-admin-generator/src/main/resources/templates/generator/api.ftl diff --git a/continew-admin-tool/src/main/resources/templates/generator/index.ftl b/continew-admin-generator/src/main/resources/templates/generator/index.ftl similarity index 100% rename from continew-admin-tool/src/main/resources/templates/generator/index.ftl rename to continew-admin-generator/src/main/resources/templates/generator/index.ftl diff --git a/continew-admin-webapi/pom.xml b/continew-admin-webapi/pom.xml index 577becb8..ce5c55b3 100644 --- a/continew-admin-webapi/pom.xml +++ b/continew-admin-webapi/pom.xml @@ -37,16 +37,16 @@ test - + top.charles7c.continew - continew-admin-monitor + continew-admin-generator - + top.charles7c.continew - continew-admin-tool + continew-admin-monitor diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java index fe5b1648..ae5d0c31 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/tool/GeneratorController.java @@ -16,34 +16,30 @@ package top.charles7c.continew.admin.webapi.tool; -import java.sql.SQLException; -import java.util.List; - -import lombok.RequiredArgsConstructor; - +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; - +import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - -import cn.dev33.satoken.annotation.SaCheckPermission; - -import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO; -import top.charles7c.continew.admin.tool.model.entity.GenConfigDO; -import top.charles7c.continew.admin.tool.model.query.TableQuery; -import top.charles7c.continew.admin.tool.model.req.GenConfigReq; -import top.charles7c.continew.admin.tool.model.resp.GeneratePreviewResp; -import top.charles7c.continew.admin.tool.model.resp.TableResp; -import top.charles7c.continew.admin.tool.service.GeneratorService; +import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; +import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; +import top.charles7c.continew.admin.generator.model.query.TableQuery; +import top.charles7c.continew.admin.generator.model.req.GenConfigReq; +import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; +import top.charles7c.continew.admin.generator.model.resp.TableResp; +import top.charles7c.continew.admin.generator.service.GeneratorService; import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; import top.charles7c.continew.starter.web.model.R; +import java.sql.SQLException; +import java.util.List; + /** * 代码生成 API * @@ -54,7 +50,7 @@ @Validated @RestController @RequiredArgsConstructor -@RequestMapping("/tool/generator") +@RequestMapping("/generator") public class GeneratorController { private final ProjectProperties projectProperties; diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml index 1875382d..31450578 100644 --- a/continew-admin-webapi/src/main/resources/config/application.yml +++ b/continew-admin-webapi/src/main/resources/config/application.yml @@ -63,23 +63,21 @@ springdoc: default-flat-param-object: true # 分组配置 group-configs: - - group: 'all' - paths-to-match: '/**' - packages-to-scan: ${project.base-package}.webapi - - group: 'auth' - display-name: '系统认证' + - group: all + paths-to-match: /** + paths-to-exclude: + - /error + - group: auth + display-name: 系统认证 packages-to-scan: ${project.base-package}.webapi.auth - - group: 'common' - display-name: '通用接口' + - group: common + display-name: 通用接口 packages-to-scan: ${project.base-package}.webapi.common - - group: 'system' - display-name: '系统管理' + - group: system + display-name: 系统管理 packages-to-scan: ${project.base-package}.webapi.system - - group: 'tool' - display-name: '系统工具' - packages-to-scan: ${project.base-package}.webapi.tool - - group: 'monitor' - display-name: '系统监控' + - group: monitor + display-name: 系统监控 packages-to-scan: ${project.base-package}.webapi.monitor ## 组件配置 components: diff --git a/pom.xml b/pom.xml index e94156e2..b37a3c68 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ continew-admin-webapi continew-admin-monitor continew-admin-system - continew-admin-tool + continew-admin-generator continew-admin-common @@ -45,24 +45,24 @@ ${revision} - + top.charles7c.continew - continew-admin-monitor + continew-admin-generator ${revision} - + top.charles7c.continew - continew-admin-system + continew-admin-monitor ${revision} - + top.charles7c.continew - continew-admin-tool + continew-admin-system ${revision}