From 99bd9ffa8a207ed1dd7316d841195af67decf918 Mon Sep 17 00:00:00 2001 From: Bunny Date: Tue, 22 Jul 2025 13:50:38 +0800 Subject: [PATCH] =?UTF-8?q?:bulb:=20=E4=BF=AE=E6=94=B9model=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E4=BF=A1=E6=81=AF=E5=92=8C=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/common/model/common/result/Result.java | 14 ++++++++++---- .../generator/controller/GeneratorController.java | 6 +++--- .../generator/controller/SqlParserController.java | 6 +++--- .../generator/controller/TableController.java | 10 +++++----- .../module/generator/controller/VmsController.java | 4 ++-- .../core/provider/DatabaseMetadataProvider.java | 6 +++--- .../generator/core/provider/IMetadataProvider.java | 4 ++-- .../core/provider/SqlMetadataProvider.java | 4 ++-- .../core/template/AbstractTemplateGenerator.java | 4 ++-- .../core/template/VmsTBaseTemplateGenerator.java | 4 ++-- .../exception/GeneratorCodeException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 ++-- .../{domain => model}/dto/VmsArgumentDto.java | 2 +- .../{domain => model}/entity/ColumnMetaData.java | 2 +- .../entity/DatabaseInfoMetaData.java | 2 +- .../{domain => model}/entity/TableMetaData.java | 4 ++-- .../{domain => model}/result/PageResult.java | 2 +- .../generator/{domain => model}/result/Result.java | 12 ++++++++---- .../{domain => model}/result/ResultCodeEnum.java | 2 +- .../{domain => model}/vo/GeneratorVo.java | 2 +- .../generator/{domain => model}/vo/VmsPathVo.java | 2 +- .../module/generator/service/GeneratorService.java | 4 ++-- .../module/generator/service/TableService.java | 2 +- .../auth/module/generator/service/VmsService.java | 2 +- .../service/impl/GeneratorServiceImpl.java | 8 ++++---- .../generator/service/impl/TableServiceImpl.java | 4 ++-- .../generator/service/impl/VmsServiceImpl.java | 2 +- .../auth/module/generator/utils/ZipFileUtil.java | 2 +- 28 files changed, 66 insertions(+), 56 deletions(-) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/dto/VmsArgumentDto.java (96%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/entity/ColumnMetaData.java (93%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/entity/DatabaseInfoMetaData.java (96%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/entity/TableMetaData.java (95%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/result/PageResult.java (94%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/result/Result.java (92%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/result/ResultCodeEnum.java (98%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/vo/GeneratorVo.java (94%) rename auth-module/module-generator-code/src/main/java/com/auth/module/generator/{domain => model}/vo/VmsPathVo.java (93%) diff --git a/auth-common/src/main/java/com/auth/common/model/common/result/Result.java b/auth-common/src/main/java/com/auth/common/model/common/result/Result.java index 7b1c6d6..95d5363 100644 --- a/auth-common/src/main/java/com/auth/common/model/common/result/Result.java +++ b/auth-common/src/main/java/com/auth/common/model/common/result/Result.java @@ -1,6 +1,7 @@ package com.auth.common.model.common.result; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,14 +12,19 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor +@Schema(name = "Result通用返回结果", title = "通用返回结果") public class Result { - // 状态码 + + @Schema(name = "code", title = "状态码") private Integer code; - // 返回消息 + + @Schema(name = "message", title = "返回消息") private String message; - // 返回数据 + + @Schema(name = "data", title = "返回数据") private T data; - // 权限范围 + + @Schema(name = "auths", title = "权限范围") private List auths; /** diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/GeneratorController.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/GeneratorController.java index 1894509..ec9be76 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/GeneratorController.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/GeneratorController.java @@ -1,8 +1,8 @@ package com.auth.module.generator.controller; -import com.auth.module.generator.domain.dto.VmsArgumentDto; -import com.auth.module.generator.domain.result.Result; -import com.auth.module.generator.domain.vo.GeneratorVo; +import com.auth.module.generator.model.dto.VmsArgumentDto; +import com.auth.module.generator.model.result.Result; +import com.auth.module.generator.model.vo.GeneratorVo; import com.auth.module.generator.service.GeneratorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/SqlParserController.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/SqlParserController.java index 40ca21e..a1be1e5 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/SqlParserController.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/SqlParserController.java @@ -1,9 +1,9 @@ package com.auth.module.generator.controller; import com.auth.module.generator.core.provider.SqlMetadataProvider; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; -import com.auth.module.generator.domain.result.Result; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.TableMetaData; +import com.auth.module.generator.model.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/TableController.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/TableController.java index aece089..8643ba4 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/TableController.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/TableController.java @@ -1,11 +1,11 @@ package com.auth.module.generator.controller; import com.auth.module.generator.core.provider.DatabaseMetadataProvider; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.DatabaseInfoMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; -import com.auth.module.generator.domain.result.Result; -import com.auth.module.generator.domain.result.ResultCodeEnum; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.DatabaseInfoMetaData; +import com.auth.module.generator.model.entity.TableMetaData; +import com.auth.module.generator.model.result.Result; +import com.auth.module.generator.model.result.ResultCodeEnum; import com.auth.module.generator.service.TableService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/VmsController.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/VmsController.java index 8352c96..33b75e7 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/VmsController.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/controller/VmsController.java @@ -1,7 +1,7 @@ package com.auth.module.generator.controller; -import com.auth.module.generator.domain.result.Result; -import com.auth.module.generator.domain.vo.VmsPathVo; +import com.auth.module.generator.model.result.Result; +import com.auth.module.generator.model.vo.VmsPathVo; import com.auth.module.generator.service.VmsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/DatabaseMetadataProvider.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/DatabaseMetadataProvider.java index e0b0935..a03826b 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/DatabaseMetadataProvider.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/DatabaseMetadataProvider.java @@ -1,11 +1,11 @@ package com.auth.module.generator.core.provider; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.DatabaseInfoMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; import com.auth.module.generator.exception.GeneratorCodeException; import com.auth.module.generator.exception.MetadataNotFoundException; import com.auth.module.generator.exception.MetadataProviderException; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.DatabaseInfoMetaData; +import com.auth.module.generator.model.entity.TableMetaData; import com.auth.module.generator.utils.MysqlTypeConvertUtil; import com.zaxxer.hikari.HikariDataSource; import lombok.RequiredArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/IMetadataProvider.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/IMetadataProvider.java index 60ff69b..d8e6a5b 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/IMetadataProvider.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/IMetadataProvider.java @@ -1,8 +1,8 @@ package com.auth.module.generator.core.provider; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.TableMetaData; import java.util.List; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/SqlMetadataProvider.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/SqlMetadataProvider.java index d8b762f..a4597d0 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/SqlMetadataProvider.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/provider/SqlMetadataProvider.java @@ -2,10 +2,10 @@ package com.auth.module.generator.core.provider; import com.auth.module.generator.core.dialect.DatabaseDialect; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; import com.auth.module.generator.exception.GeneratorCodeException; import com.auth.module.generator.exception.SqlParseException; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.TableMetaData; import com.auth.module.generator.utils.MysqlTypeConvertUtil; import lombok.RequiredArgsConstructor; import net.sf.jsqlparser.JSQLParserException; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/AbstractTemplateGenerator.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/AbstractTemplateGenerator.java index ab74d24..62820cf 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/AbstractTemplateGenerator.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/AbstractTemplateGenerator.java @@ -1,8 +1,8 @@ package com.auth.module.generator.core.template; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.TableMetaData; import org.apache.velocity.VelocityContext; import java.io.StringWriter; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/VmsTBaseTemplateGenerator.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/VmsTBaseTemplateGenerator.java index 9878639..18ba01e 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/VmsTBaseTemplateGenerator.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/core/template/VmsTBaseTemplateGenerator.java @@ -1,7 +1,7 @@ package com.auth.module.generator.core.template; -import com.auth.module.generator.domain.dto.VmsArgumentDto; -import com.auth.module.generator.domain.entity.TableMetaData; +import com.auth.module.generator.model.dto.VmsArgumentDto; +import com.auth.module.generator.model.entity.TableMetaData; import com.auth.module.generator.utils.MysqlTypeConvertUtil; import com.google.common.base.CaseFormat; import org.apache.velocity.Template; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GeneratorCodeException.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GeneratorCodeException.java index 226d0b1..6a68b3d 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GeneratorCodeException.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GeneratorCodeException.java @@ -1,6 +1,6 @@ package com.auth.module.generator.exception; -import com.auth.module.generator.domain.result.ResultCodeEnum; +import com.auth.module.generator.model.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GlobalExceptionHandler.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GlobalExceptionHandler.java index c6442fc..5d892fe 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GlobalExceptionHandler.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ package com.auth.module.generator.exception; -import com.auth.module.generator.domain.result.Result; -import com.auth.module.generator.domain.result.ResultCodeEnum; +import com.auth.module.generator.model.result.Result; +import com.auth.module.generator.model.result.ResultCodeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.util.StringUtils; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/dto/VmsArgumentDto.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/dto/VmsArgumentDto.java similarity index 96% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/dto/VmsArgumentDto.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/dto/VmsArgumentDto.java index bee3ad5..111a793 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/dto/VmsArgumentDto.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/dto/VmsArgumentDto.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.dto; +package com.auth.module.generator.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/ColumnMetaData.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java similarity index 93% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/ColumnMetaData.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java index a7abd69..0603dba 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/ColumnMetaData.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.entity; +package com.auth.module.generator.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/DatabaseInfoMetaData.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/DatabaseInfoMetaData.java similarity index 96% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/DatabaseInfoMetaData.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/DatabaseInfoMetaData.java index fb77b01..1078c49 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/DatabaseInfoMetaData.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/DatabaseInfoMetaData.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.entity; +package com.auth.module.generator.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/TableMetaData.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/TableMetaData.java similarity index 95% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/TableMetaData.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/TableMetaData.java index 0e386b1..1112ca3 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/entity/TableMetaData.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/TableMetaData.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.entity; +package com.auth.module.generator.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -37,5 +37,5 @@ public class TableMetaData implements Serializable { @Schema(name = "columns", description = "列名称") private List columns = new ArrayList<>(); - + } \ No newline at end of file diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/PageResult.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/PageResult.java similarity index 94% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/PageResult.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/PageResult.java index 9bebbe3..47c3701 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/PageResult.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/PageResult.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.result; +package com.auth.module.generator.model.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/Result.java similarity index 92% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/Result.java index d988465..d73a713 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/Result.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/Result.java @@ -1,5 +1,6 @@ -package com.auth.module.generator.domain.result; +package com.auth.module.generator.model.result; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,12 +8,15 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor +@Schema(name = "Result通用返回结果", title = "通用返回结果") public class Result { - // 状态码 + @Schema(name = "code", title = "状态码") private Integer code; - // 返回消息 + + @Schema(name = "message", title = "返回消息") private String message; - // 返回数据 + + @Schema(name = "data", title = "返回数据") private T data; /** diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/ResultCodeEnum.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/ResultCodeEnum.java similarity index 98% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/ResultCodeEnum.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/ResultCodeEnum.java index d188b79..186b716 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/result/ResultCodeEnum.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.result; +package com.auth.module.generator.model.result; import lombok.Getter; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/GeneratorVo.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/GeneratorVo.java similarity index 94% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/GeneratorVo.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/GeneratorVo.java index 017ba67..c987af3 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/GeneratorVo.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/GeneratorVo.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.vo; +package com.auth.module.generator.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/VmsPathVo.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/VmsPathVo.java similarity index 93% rename from auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/VmsPathVo.java rename to auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/VmsPathVo.java index a9f0a16..f0a7b41 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/domain/vo/VmsPathVo.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/vo/VmsPathVo.java @@ -1,4 +1,4 @@ -package com.auth.module.generator.domain.vo; +package com.auth.module.generator.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/GeneratorService.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/GeneratorService.java index 4fd95e1..1f5bddc 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/GeneratorService.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/GeneratorService.java @@ -1,7 +1,7 @@ package com.auth.module.generator.service; -import com.auth.module.generator.domain.dto.VmsArgumentDto; -import com.auth.module.generator.domain.vo.GeneratorVo; +import com.auth.module.generator.model.dto.VmsArgumentDto; +import com.auth.module.generator.model.vo.GeneratorVo; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/TableService.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/TableService.java index cec9899..4156594 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/TableService.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/TableService.java @@ -1,6 +1,6 @@ package com.auth.module.generator.service; -import com.auth.module.generator.domain.entity.DatabaseInfoMetaData; +import com.auth.module.generator.model.entity.DatabaseInfoMetaData; public interface TableService { diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/VmsService.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/VmsService.java index fc5d20e..7a6c5c8 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/VmsService.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/VmsService.java @@ -1,6 +1,6 @@ package com.auth.module.generator.service; -import com.auth.module.generator.domain.vo.VmsPathVo; +import com.auth.module.generator.model.vo.VmsPathVo; import java.util.List; import java.util.Map; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java index f22675f..df23815 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java @@ -2,10 +2,10 @@ package com.auth.module.generator.service.impl; import com.auth.module.generator.core.provider.IMetadataProvider; import com.auth.module.generator.core.template.VmsTBaseTemplateGenerator; -import com.auth.module.generator.domain.dto.VmsArgumentDto; -import com.auth.module.generator.domain.entity.ColumnMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; -import com.auth.module.generator.domain.vo.GeneratorVo; +import com.auth.module.generator.model.dto.VmsArgumentDto; +import com.auth.module.generator.model.entity.ColumnMetaData; +import com.auth.module.generator.model.entity.TableMetaData; +import com.auth.module.generator.model.vo.GeneratorVo; import com.auth.module.generator.service.GeneratorService; import com.auth.module.generator.service.helper.VmsGeneratorPathHelper; import com.auth.module.generator.utils.ZipFileUtil; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/TableServiceImpl.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/TableServiceImpl.java index 0388aa1..c127907 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/TableServiceImpl.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/TableServiceImpl.java @@ -1,8 +1,8 @@ package com.auth.module.generator.service.impl; import com.auth.module.generator.core.provider.DatabaseMetadataProvider; -import com.auth.module.generator.domain.entity.DatabaseInfoMetaData; -import com.auth.module.generator.domain.entity.TableMetaData; +import com.auth.module.generator.model.entity.DatabaseInfoMetaData; +import com.auth.module.generator.model.entity.TableMetaData; import com.auth.module.generator.service.TableService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/VmsServiceImpl.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/VmsServiceImpl.java index eea8f1c..e0844d7 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/VmsServiceImpl.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/VmsServiceImpl.java @@ -1,6 +1,6 @@ package com.auth.module.generator.service.impl; -import com.auth.module.generator.domain.vo.VmsPathVo; +import com.auth.module.generator.model.vo.VmsPathVo; import com.auth.module.generator.service.VmsService; import com.auth.module.generator.utils.ResourceFileUtil; import lombok.RequiredArgsConstructor; diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/utils/ZipFileUtil.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/utils/ZipFileUtil.java index 08a5abd..7ff0d1b 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/utils/ZipFileUtil.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/utils/ZipFileUtil.java @@ -1,7 +1,7 @@ package com.auth.module.generator.utils; -import com.auth.module.generator.domain.vo.GeneratorVo; +import com.auth.module.generator.model.vo.GeneratorVo; import java.io.ByteArrayOutputStream; import java.io.IOException;