diff --git a/agt-framework/agt-common/pom.xml b/agt-framework/agt-common/pom.xml index 9579567..37f898f 100644 --- a/agt-framework/agt-common/pom.xml +++ b/agt-framework/agt-common/pom.xml @@ -64,6 +64,13 @@ provided + + + org.springframework.cloud + spring-cloud-openfeign-core + provided + + org.apache.skywalking diff --git a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java similarity index 71% rename from agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApi.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java index 870898d..cb60e0d 100644 --- a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApi.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java @@ -1,22 +1,21 @@ -package org.agt.module.infra.api.logger; +package org.agt.framework.common.biz.infra.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; +import org.agt.framework.common.enums.RpcConstants; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import org.agt.module.infra.enums.ApiConstants; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import jakarta.validation.Valid; - -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = +@FeignClient(name = RpcConstants.INFRA_NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - API 访问日志") -public interface ApiAccessLogApi { +public interface ApiAccessLogCommonApi { - String PREFIX = ApiConstants.PREFIX + "/api-access-log"; + String PREFIX = RpcConstants.INFRA_PREFIX + "/api-access-log"; @PostMapping(PREFIX + "/create") @Operation(summary = "创建 API 访问日志") diff --git a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java similarity index 71% rename from agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApi.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java index 4e284de..d5b9de4 100644 --- a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApi.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java @@ -1,22 +1,21 @@ -package org.agt.module.infra.api.logger; +package org.agt.framework.common.biz.infra.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; +import org.agt.framework.common.enums.RpcConstants; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import org.agt.module.infra.enums.ApiConstants; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import jakarta.validation.Valid; - -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = +@FeignClient(name = RpcConstants.INFRA_NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - API 异常日志") -public interface ApiErrorLogApi { +public interface ApiErrorLogCommonApi { - String PREFIX = ApiConstants.PREFIX + "/api-error-log"; + String PREFIX = RpcConstants.INFRA_PREFIX + "/api-error-log"; @PostMapping(PREFIX + "/create") @Operation(summary = "创建 API 异常日志") diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java new file mode 100644 index 0000000..ae876a1 --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java @@ -0,0 +1,103 @@ +package org.agt.framework.common.biz.infra.logger.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * API 访问日志 + * + * @author 千通源码 + */ +@Data +public class ApiAccessLogCreateReqDTO { + + /** + * 链路追踪编号 + */ + private String traceId; + /** + * 用户编号 + */ + private Long userId; + /** + * 用户类型 + */ + private Integer userType; + /** + * 应用名 + */ + @NotNull(message = "应用名不能为空") + private String applicationName; + + /** + * 请求方法名 + */ + @NotNull(message = "http 请求方法不能为空") + private String requestMethod; + /** + * 访问地址 + */ + @NotNull(message = "访问地址不能为空") + private String requestUrl; + /** + * 请求参数 + */ + private String requestParams; + /** + * 响应结果 + */ + private String responseBody; + /** + * 用户 IP + */ + @NotNull(message = "ip 不能为空") + private String userIp; + /** + * 浏览器 UA + */ + @NotNull(message = "User-Agent 不能为空") + private String userAgent; + + /** + * 操作模块 + */ + private String operateModule; + /** + * 操作名 + */ + private String operateName; + /** + * 操作分类 + * + * 枚举，参见 OperateTypeEnum 类 + */ + private Integer operateType; + + /** + * 开始请求时间 + */ + @NotNull(message = "开始请求时间不能为空") + private LocalDateTime beginTime; + /** + * 结束请求时间 + */ + @NotNull(message = "结束请求时间不能为空") + private LocalDateTime endTime; + /** + * 执行时长，单位：毫秒 + */ + @NotNull(message = "执行时长不能为空") + private Integer duration; + /** + * 结果码 + */ + @NotNull(message = "错误码不能为空") + private Integer resultCode; + /** + * 结果提示 + */ + private String resultMsg; + +} diff --git a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiErrorLogCreateReqDTO.java similarity index 98% rename from agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiErrorLogCreateReqDTO.java index 395992b..5a67e0b 100644 --- a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/logger/dto/ApiErrorLogCreateReqDTO.java @@ -1,9 +1,9 @@ -package org.agt.module.infra.api.logger.dto; +package org.agt.framework.common.biz.infra.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; @Schema(description = "RPC 服务 - API 错误日志创建 Request DTO") diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/package-info.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/package-info.java new file mode 100644 index 0000000..2876db9 --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/infra/package-info.java @@ -0,0 +1,4 @@ +/** + * 针对 infra 模块的 api 包 + */ +package org.agt.framework.common.biz.infra; \ No newline at end of file diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/package-info.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/package-info.java new file mode 100644 index 0000000..2c77ccd --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/package-info.java @@ -0,0 +1,4 @@ +/** + * 特殊：用于 framework 下，starter 需要调用 biz 业务模块的接口定义！ + */ +package org.agt.framework.common.biz; \ No newline at end of file diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/DictDataCommonApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/DictDataCommonApi.java new file mode 100644 index 0000000..ce5924f --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/DictDataCommonApi.java @@ -0,0 +1,26 @@ +package org.agt.framework.common.biz.system.dict; + +import org.agt.framework.common.biz.system.dict.dto.DictDataRespDTO; +import org.agt.framework.common.enums.RpcConstants; +import org.agt.framework.common.pojo.CommonResult; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(name = RpcConstants.SYSTEM_NAME, primary = false) // TODO 芋艿：fallbackFactory = +@Tag(name = "RPC 服务 - 字典数据") +public interface DictDataCommonApi { + + String PREFIX = RpcConstants.SYSTEM_PREFIX + "/dict-data"; + + @GetMapping(PREFIX + "/list") + @Operation(summary = "获得指定字典类型的字典数据列表") + @Parameter(name = "dictType", description = "字典类型", example = "SEX", required = true) + CommonResult> getDictDataList(@RequestParam("dictType") String dictType); + +} diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/dto/DictDataRespDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/dto/DictDataRespDTO.java similarity index 93% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/dto/DictDataRespDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/dto/DictDataRespDTO.java index 4159aa4..cfdbac5 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/dto/DictDataRespDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/dict/dto/DictDataRespDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.dict.dto; +package org.agt.framework.common.biz.system.dict.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/OperateLogCommonApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/OperateLogCommonApi.java new file mode 100644 index 0000000..3700a38 --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/OperateLogCommonApi.java @@ -0,0 +1,34 @@ +package org.agt.framework.common.biz.system.logger; + +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.enums.RpcConstants; +import org.agt.framework.common.pojo.CommonResult; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.scheduling.annotation.Async; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = RpcConstants.SYSTEM_NAME, primary = false) // TODO 芋艿：fallbackFactory = +@Tag(name = "RPC 服务 - 操作日志") +public interface OperateLogCommonApi { + + String PREFIX = RpcConstants.SYSTEM_PREFIX + "/operate-log"; + + @PostMapping(PREFIX + "/create") + @Operation(summary = "创建操作日志") + CommonResult createOperateLog(@Valid @RequestBody OperateLogCreateReqDTO createReqDTO); + + /** + * 【异步】创建操作日志 + * + * @param createReqDTO 请求 + */ + @Async + default void createOperateLogAsync(OperateLogCreateReqDTO createReqDTO) { + createOperateLog(createReqDTO).checkError(); + } + +} diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/dto/OperateLogCreateReqDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java similarity index 97% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/dto/OperateLogCreateReqDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java index ec01da8..1233ff7 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/dto/OperateLogCreateReqDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.logger.dto; +package org.agt.framework.common.biz.system.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java similarity index 75% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApi.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java index 727db5d..4ffc30f 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApi.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java @@ -1,10 +1,10 @@ -package org.agt.module.system.api.oauth2; +package org.agt.framework.common.biz.system.oauth2; +import org.agt.framework.common.enums.RpcConstants; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; -import org.agt.module.system.enums.ApiConstants; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCreateReqDTO; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -14,17 +14,17 @@ import org.springframework.web.bind.annotation.*; import jakarta.validation.Valid; -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = +@FeignClient(name = RpcConstants.SYSTEM_NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - OAuth2.0 令牌") -public interface OAuth2TokenApi { +public interface OAuth2TokenCommonApi { - String PREFIX = ApiConstants.PREFIX + "/oauth2/token"; + String PREFIX = RpcConstants.SYSTEM_PREFIX + "/oauth2/token"; /** * 校验 Token 的 URL 地址，主要是提供给 Gateway 使用 */ @SuppressWarnings("HttpUrlsUsage") - String URL_CHECK = "http://" + ApiConstants.NAME + PREFIX + "/check"; + String URL_CHECK = "http://" + RpcConstants.SYSTEM_NAME + PREFIX + "/check"; @PostMapping(PREFIX + "/create") @Operation(summary = "创建访问令牌") diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java similarity index 95% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java index 8526ebd..3e2c5c5 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.oauth2.dto; +package org.agt.framework.common.biz.system.oauth2.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java similarity index 95% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java index b18c6c7..9274905 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.oauth2.dto; +package org.agt.framework.common.biz.system.oauth2.dto; import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.validation.InEnum; diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenRespDTO.java similarity index 94% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenRespDTO.java index eed0e62..fab8c14 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenRespDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.oauth2.dto; +package org.agt.framework.common.biz.system.oauth2.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/package-info.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/package-info.java new file mode 100644 index 0000000..3f9fc81 --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/package-info.java @@ -0,0 +1,4 @@ +/** + * 针对 system 模块的 api 包 + */ +package org.agt.framework.common.biz.system; \ No newline at end of file diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/PermissionCommonApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/PermissionCommonApi.java new file mode 100644 index 0000000..97af135 --- /dev/null +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/PermissionCommonApi.java @@ -0,0 +1,43 @@ +package org.agt.framework.common.biz.system.permission; + +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.enums.RpcConstants; +import org.agt.framework.common.pojo.CommonResult; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient(name = RpcConstants.SYSTEM_NAME, primary = false) // TODO 芋艿：fallbackFactory = +@Tag(name = "RPC 服务 - 权限") +public interface PermissionCommonApi { + + String PREFIX = RpcConstants.SYSTEM_PREFIX + "/permission"; + + @GetMapping(PREFIX + "/has-any-permissions") + @Operation(summary = "判断是否有权限，任一一个即可") + @Parameters({ + @Parameter(name = "userId", description = "用户编号", example = "1", required = true), + @Parameter(name = "permissions", description = "权限", example = "read,write", required = true) + }) + CommonResult hasAnyPermissions(@RequestParam("userId") Long userId, + @RequestParam("permissions") String... permissions); + + @GetMapping(PREFIX + "/has-any-roles") + @Operation(summary = "判断是否有角色，任一一个即可") + @Parameters({ + @Parameter(name = "userId", description = "用户编号", example = "1", required = true), + @Parameter(name = "roles", description = "角色数组", example = "2", required = true) + }) + CommonResult hasAnyRoles(@RequestParam("userId") Long userId, + @RequestParam("roles") String... roles); + + @GetMapping(PREFIX + "/get-dept-data-permission") + @Operation(summary = "获得登陆用户的部门数据权限") + @Parameter(name = "userId", description = "用户编号", example = "2", required = true) + CommonResult getDeptDataPermission(@RequestParam("userId") Long userId); + +} \ No newline at end of file diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/dto/DeptDataPermissionRespDTO.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/dto/DeptDataPermissionRespDTO.java similarity index 93% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/dto/DeptDataPermissionRespDTO.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/dto/DeptDataPermissionRespDTO.java index 92d8a4c..8bb4f0f 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/dto/DeptDataPermissionRespDTO.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/permission/dto/DeptDataPermissionRespDTO.java @@ -1,4 +1,4 @@ -package org.agt.module.system.api.permission.dto; +package org.agt.framework.common.biz.system.permission.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/tenant/TenantApi.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/tenant/TenantCommonApi.java similarity index 74% rename from agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/tenant/TenantApi.java rename to agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/tenant/TenantCommonApi.java index ac1c866..2a18237 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/tenant/TenantApi.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/biz/system/tenant/TenantCommonApi.java @@ -1,7 +1,7 @@ -package org.agt.module.system.api.tenant; +package org.agt.framework.common.biz.system.tenant; +import org.agt.framework.common.enums.RpcConstants; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = +@FeignClient(name = RpcConstants.SYSTEM_NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - 多租户") -public interface TenantApi { +public interface TenantCommonApi { - String PREFIX = ApiConstants.PREFIX + "/tenant"; + String PREFIX = RpcConstants.SYSTEM_PREFIX + "/tenant"; @GetMapping(PREFIX + "/id-list") @Operation(summary = "获得所有租户编号") diff --git a/agt-framework/agt-common/src/main/java/org/agt/framework/common/enums/RpcConstants.java b/agt-framework/agt-common/src/main/java/org/agt/framework/common/enums/RpcConstants.java index 5017aaf..938aca4 100644 --- a/agt-framework/agt-common/src/main/java/org/agt/framework/common/enums/RpcConstants.java +++ b/agt-framework/agt-common/src/main/java/org/agt/framework/common/enums/RpcConstants.java @@ -7,11 +7,34 @@ package org.agt.framework.common.enums; * * @author 千通源码 */ -public class RpcConstants { +public interface RpcConstants { /** * RPC API 的前缀 */ - public static final String RPC_API_PREFIX = "/rpc-api"; + String RPC_API_PREFIX = "/rpc-api"; + + /** + * system 服务名 + * + * 注意，需要保证和 spring.application.name 保持一致 + */ + String SYSTEM_NAME = "system-server"; + + /** + * system 服务的前缀 + */ + String SYSTEM_PREFIX = RPC_API_PREFIX + "/system"; + + /** + * infra 服务名 + * + * 注意，需要保证和 spring.application.name 保持一致 + */ + String INFRA_NAME = "infra-server"; + /** + * infra 服务的前缀 + */ + String INFRA_PREFIX = RPC_API_PREFIX + "/infra"; } diff --git a/agt-framework/agt-spring-boot-starter-biz-data-permission/pom.xml b/agt-framework/agt-spring-boot-starter-biz-data-permission/pom.xml index 3177944..8e62d25 100644 --- a/agt-framework/agt-spring-boot-starter-biz-data-permission/pom.xml +++ b/agt-framework/agt-spring-boot-starter-biz-data-permission/pom.xml @@ -41,13 +41,6 @@ true - - - org.agt - agt-module-system-api - ${revision} - - org.agt diff --git a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/config/AgtDeptDataPermissionAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/config/AgtDeptDataPermissionAutoConfiguration.java index 52eb5bb..b3062a1 100644 --- a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/config/AgtDeptDataPermissionAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/config/AgtDeptDataPermissionAutoConfiguration.java @@ -1,10 +1,11 @@ package org.agt.framework.datapermission.config; import cn.hutool.extra.spring.SpringUtil; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.datapermission.core.rule.dept.DeptDataPermissionRule; import org.agt.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; import org.agt.framework.security.core.LoginUser; -import org.agt.module.system.api.permission.PermissionApi; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -19,16 +20,16 @@ import java.util.List; */ @AutoConfiguration @ConditionalOnClass(LoginUser.class) -@ConditionalOnBean(value = DeptDataPermissionRuleCustomizer.class) +@ConditionalOnBean(value = {PermissionCommonApi.class, DeptDataPermissionRuleCustomizer.class}) public class AgtDeptDataPermissionAutoConfiguration { @Bean - public DeptDataPermissionRule deptDataPermissionRule(PermissionApi permissionApi, + public DeptDataPermissionRule deptDataPermissionRule(PermissionCommonApi permissionApi, List customizers) { // Cloud 专属逻辑：优先使用本地的 PermissionApi 实现类，而不是 Feign 调用 // 原因：在创建租户时，租户还没创建好，导致 Feign 调用获取数据权限时，报“租户不存在”的错误 try { - PermissionApi permissionApiImpl = SpringUtil.getBean("permissionApiImpl", PermissionApi.class); + PermissionCommonApi permissionApiImpl = SpringUtil.getBean("permissionApiImpl", PermissionCommonApi.class); if (permissionApiImpl != null) { permissionApi = permissionApiImpl; } diff --git a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java index e9caebc..ca617c9 100644 --- a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java +++ b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/main/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java @@ -3,6 +3,7 @@ package org.agt.framework.datapermission.core.rule.dept; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.util.collection.CollectionUtils; import org.agt.framework.common.util.json.JsonUtils; @@ -11,8 +12,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; import org.agt.framework.mybatis.core.util.MyBatisUtils; import org.agt.framework.security.core.LoginUser; import org.agt.framework.security.core.util.SecurityFrameworkUtils; -import org.agt.module.system.api.permission.PermissionApi; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -59,7 +59,7 @@ public class DeptDataPermissionRule implements DataPermissionRule { static final Expression EXPRESSION_NULL = new NullValue(); - private final PermissionApi permissionApi; + private final PermissionCommonApi permissionApi; /** * 基于部门的表字段配置 diff --git a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/test/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/test/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java index db2dd1b..2e1cf34 100644 --- a/agt-framework/agt-spring-boot-starter-biz-data-permission/src/test/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java +++ b/agt-framework/agt-spring-boot-starter-biz-data-permission/src/test/java/org/agt/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java @@ -2,13 +2,13 @@ package org.agt.framework.datapermission.core.rule.dept; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.util.collection.SetUtils; import org.agt.framework.security.core.LoginUser; import org.agt.framework.security.core.util.SecurityFrameworkUtils; import org.agt.framework.test.core.ut.BaseMockitoUnitTest; -import org.agt.module.system.api.permission.PermissionApi; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import org.junit.jupiter.api.BeforeEach; @@ -40,7 +40,7 @@ class DeptDataPermissionRuleTest extends BaseMockitoUnitTest { private DeptDataPermissionRule rule; @Mock - private PermissionApi permissionApi; + private PermissionCommonApi permissionApi; @BeforeEach @SuppressWarnings("unchecked") diff --git a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantAutoConfiguration.java index 4b5c448..f862a2d 100644 --- a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantAutoConfiguration.java @@ -20,7 +20,7 @@ import org.agt.framework.tenant.core.web.TenantContextWebFilter; import org.agt.framework.tenant.core.web.TenantVisitContextInterceptor; import org.agt.framework.web.config.WebProperties; import org.agt.framework.web.core.handler.GlobalExceptionHandler; -import org.agt.module.system.api.tenant.TenantApi; +import org.agt.framework.common.biz.system.tenant.TenantCommonApi; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import jakarta.annotation.Resource; @@ -60,10 +60,10 @@ public class AgtTenantAutoConfiguration { private ApplicationContext applicationContext; @Bean - public TenantFrameworkService tenantFrameworkService(TenantApi tenantApi) { + public TenantFrameworkService tenantFrameworkService(TenantCommonApi tenantApi) { // 参见 https://gitee.com/zhijiantianya/agt-cloud/issues/IC6YZF try { - TenantApi tenantApiImpl = SpringUtil.getBean("tenantApiImpl", TenantApi.class); + TenantCommonApi tenantApiImpl = SpringUtil.getBean("tenantApiImpl", TenantCommonApi.class); if (tenantApiImpl != null) { tenantApi = tenantApiImpl; } diff --git a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantRpcAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantRpcAutoConfiguration.java index ef89926..ec4556a 100644 --- a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantRpcAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/config/AgtTenantRpcAutoConfiguration.java @@ -1,16 +1,15 @@ package org.agt.framework.tenant.config; import org.agt.framework.tenant.core.rpc.TenantRequestInterceptor; -import org.agt.module.system.api.tenant.TenantApi; +import org.agt.framework.common.biz.system.tenant.TenantCommonApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; @AutoConfiguration @ConditionalOnProperty(prefix = "agt.tenant", value = "enable", matchIfMissing = true) // 允许使用 agt.tenant.enable=false 禁用多租户 -@EnableFeignClients(clients = TenantApi.class) // 主要是引入相关的 API 服务 +@EnableFeignClients(clients = TenantCommonApi.class) // 主要是引入相关的 API 服务 public class AgtTenantRpcAutoConfiguration { @Bean diff --git a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/core/service/TenantFrameworkServiceImpl.java b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/core/service/TenantFrameworkServiceImpl.java index c49810b..b4b000f 100644 --- a/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/core/service/TenantFrameworkServiceImpl.java +++ b/agt-framework/agt-spring-boot-starter-biz-tenant/src/main/java/org/agt/framework/tenant/core/service/TenantFrameworkServiceImpl.java @@ -1,8 +1,7 @@ package org.agt.framework.tenant.core.service; import org.agt.framework.common.pojo.CommonResult; -import org.agt.framework.common.util.cache.CacheUtils; -import org.agt.module.system.api.tenant.TenantApi; +import org.agt.framework.common.biz.system.tenant.TenantCommonApi; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import lombok.RequiredArgsConstructor; @@ -21,7 +20,7 @@ import static org.agt.framework.common.util.cache.CacheUtils.buildAsyncReloading @RequiredArgsConstructor public class TenantFrameworkServiceImpl implements TenantFrameworkService { - private final TenantApi tenantApi; + private final TenantCommonApi tenantApi; /** * 针对 {@link #getTenantIds()} 的缓存 diff --git a/agt-framework/agt-spring-boot-starter-excel/pom.xml b/agt-framework/agt-spring-boot-starter-excel/pom.xml index 194f8ff..27a39d0 100644 --- a/agt-framework/agt-spring-boot-starter-excel/pom.xml +++ b/agt-framework/agt-spring-boot-starter-excel/pom.xml @@ -34,13 +34,6 @@ true - - - org.agt - agt-module-system-api - ${revision} - - org.springframework diff --git a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictAutoConfiguration.java index eda6f68..c6f7ea1 100644 --- a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictAutoConfiguration.java @@ -1,7 +1,7 @@ package org.agt.framework.dict.config; +import org.agt.framework.common.biz.system.dict.DictDataCommonApi; import org.agt.framework.dict.core.DictFrameworkUtils; -import org.agt.module.system.api.dict.DictDataApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ public class AgtDictAutoConfiguration { @Bean @SuppressWarnings("InstantiationOfUtilityClass") - public DictFrameworkUtils dictUtils(DictDataApi dictDataApi) { + public DictFrameworkUtils dictUtils(DictDataCommonApi dictDataApi) { DictFrameworkUtils.init(dictDataApi); return new DictFrameworkUtils(); } diff --git a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictRpcAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictRpcAutoConfiguration.java index f08029e..5eb4630 100644 --- a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictRpcAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/config/AgtDictRpcAutoConfiguration.java @@ -1,6 +1,6 @@ package org.agt.framework.dict.config; -import org.agt.module.system.api.dict.DictDataApi; +import org.agt.framework.common.biz.system.dict.DictDataCommonApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -10,6 +10,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author 千通源码 */ @AutoConfiguration -@EnableFeignClients(clients = DictDataApi.class) // 主要是引入相关的 API 服务 +@EnableFeignClients(clients = DictDataCommonApi.class) // 主要是引入相关的 API 服务 public class AgtDictRpcAutoConfiguration { } diff --git a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/core/DictFrameworkUtils.java b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/core/DictFrameworkUtils.java index 30945d1..2f69d43 100644 --- a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/core/DictFrameworkUtils.java +++ b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/dict/core/DictFrameworkUtils.java @@ -1,10 +1,9 @@ package org.agt.framework.dict.core; -import cn.hutool.core.util.ObjectUtil; -import org.agt.framework.common.core.KeyValue; +import cn.hutool.core.collection.CollUtil; +import org.agt.framework.common.biz.system.dict.DictDataCommonApi; import org.agt.framework.common.util.cache.CacheUtils; -import org.agt.module.system.api.dict.DictDataApi; -import org.agt.module.system.api.dict.dto.DictDataRespDTO; +import org.agt.framework.common.biz.system.dict.dto.DictDataRespDTO; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import lombok.SneakyThrows; @@ -12,6 +11,9 @@ import lombok.extern.slf4j.Slf4j; import java.time.Duration; import java.util.List; +import java.util.Objects; + +import static org.agt.framework.common.util.collection.CollectionUtils.convertList; /** * 字典工具类 @@ -21,76 +23,57 @@ import java.util.List; @Slf4j public class DictFrameworkUtils { - private static DictDataApi dictDataApi; + private static DictDataCommonApi dictDataApi; - private static final DictDataRespDTO DICT_DATA_NULL = new DictDataRespDTO(); - - // TODO @puhui999：GET_DICT_DATA_CACHE、GET_DICT_DATA_LIST_CACHE、PARSE_DICT_DATA_CACHE 这 3 个缓存是有点重叠，可以思考下，有没可能减少 1 个。微信讨论好私聊，再具体改哈 /** - * 针对 {@link #getDictDataLabel(String, String)} 的缓存 + * 针对 dictType 的字段数据缓存 */ - private static final LoadingCache, DictDataRespDTO> GET_DICT_DATA_CACHE = CacheUtils.buildAsyncReloadingCache( + private static final LoadingCache> GET_DICT_DATA_CACHE = CacheUtils.buildAsyncReloadingCache( Duration.ofMinutes(1L), // 过期时间 1 分钟 - new CacheLoader, DictDataRespDTO>() { + new CacheLoader>() { @Override - public DictDataRespDTO load(KeyValue key) { - return ObjectUtil.defaultIfNull(dictDataApi.getDictData(key.getKey(), key.getValue()).getCheckedData(), DICT_DATA_NULL); + public List load(String dictType) { + return dictDataApi.getDictDataList(dictType).getCheckedData(); } }); - /** - * 针对 {@link #getDictDataLabelList(String)} 的缓存 - */ - private static final LoadingCache> GET_DICT_DATA_LIST_CACHE = CacheUtils.buildAsyncReloadingCache( - Duration.ofMinutes(1L), // 过期时间 1 分钟 - new CacheLoader>() { - - @Override - public List load(String dictType) { - return dictDataApi.getDictDataLabelList(dictType); - } - - }); - - /** - * 针对 {@link #parseDictDataValue(String, String)} 的缓存 - */ - private static final LoadingCache, DictDataRespDTO> PARSE_DICT_DATA_CACHE = CacheUtils.buildAsyncReloadingCache( - Duration.ofMinutes(1L), // 过期时间 1 分钟 - new CacheLoader, DictDataRespDTO>() { - - @Override - public DictDataRespDTO load(KeyValue key) { - return ObjectUtil.defaultIfNull(dictDataApi.parseDictData(key.getKey(), key.getValue()).getCheckedData(), DICT_DATA_NULL); - } - - }); - - public static void init(DictDataApi dictDataApi) { + public static void init(DictDataCommonApi dictDataApi) { DictFrameworkUtils.dictDataApi = dictDataApi; log.info("[init][初始化 DictFrameworkUtils 成功]"); } - @SneakyThrows - public static String getDictDataLabel(String dictType, Integer value) { - return GET_DICT_DATA_CACHE.get(new KeyValue<>(dictType, String.valueOf(value))).getLabel(); + public static void clearCache() { + GET_DICT_DATA_CACHE.invalidateAll(); } @SneakyThrows - public static String getDictDataLabel(String dictType, String value) { - return GET_DICT_DATA_CACHE.get(new KeyValue<>(dictType, value)).getLabel(); + public static String parseDictDataLabel(String dictType, Integer value) { + if (value == null) { + return null; + } + return parseDictDataLabel(dictType, String.valueOf(value)); + } + + @SneakyThrows + public static String parseDictDataLabel(String dictType, String value) { + List dictDatas = GET_DICT_DATA_CACHE.get(dictType); + DictDataRespDTO dictData = CollUtil.findOne(dictDatas, data -> Objects.equals(data.getValue(), value)); + return dictData != null ? dictData.getLabel(): null; } @SneakyThrows public static List getDictDataLabelList(String dictType) { - return GET_DICT_DATA_LIST_CACHE.get(dictType); + List dictDatas = GET_DICT_DATA_CACHE.get(dictType); + return convertList(dictDatas, DictDataRespDTO::getLabel); } @SneakyThrows public static String parseDictDataValue(String dictType, String label) { - return PARSE_DICT_DATA_CACHE.get(new KeyValue<>(dictType, label)).getValue(); + List dictDatas = GET_DICT_DATA_CACHE.get(dictType); + DictDataRespDTO dictData = CollUtil.findOne(dictDatas, data -> Objects.equals(data.getLabel(), label)); + return dictData!= null ? dictData.getValue(): null; } } diff --git a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/excel/core/convert/DictConvert.java b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/excel/core/convert/DictConvert.java index 90d5c23..e1db653 100644 --- a/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/excel/core/convert/DictConvert.java +++ b/agt-framework/agt-spring-boot-starter-excel/src/main/java/org/agt/framework/excel/core/convert/DictConvert.java @@ -56,7 +56,7 @@ public class DictConvert implements Converter { // 使用字典格式化 String type = getType(contentProperty); String value = String.valueOf(object); - String label = DictFrameworkUtils.getDictDataLabel(type, value); + String label = DictFrameworkUtils.parseDictDataLabel(type, value); if (label == null) { log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); return new WriteCellData<>(""); diff --git a/agt-framework/agt-spring-boot-starter-excel/src/test/java/org/agt/framework/dict/core/util/DictFrameworkUtilsTest.java b/agt-framework/agt-spring-boot-starter-excel/src/test/java/org/agt/framework/dict/core/util/DictFrameworkUtilsTest.java index 103f0d7..5689df2 100644 --- a/agt-framework/agt-spring-boot-starter-excel/src/test/java/org/agt/framework/dict/core/util/DictFrameworkUtilsTest.java +++ b/agt-framework/agt-spring-boot-starter-excel/src/test/java/org/agt/framework/dict/core/util/DictFrameworkUtilsTest.java @@ -1,17 +1,19 @@ package org.agt.framework.dict.core.util; -import org.agt.framework.common.enums.CommonStatusEnum; +import org.agt.framework.common.biz.system.dict.DictDataCommonApi; import org.agt.framework.dict.core.DictFrameworkUtils; import org.agt.framework.test.core.ut.BaseMockitoUnitTest; -import org.agt.module.system.api.dict.DictDataApi; -import org.agt.module.system.api.dict.dto.DictDataRespDTO; +import org.agt.framework.common.biz.system.dict.dto.DictDataRespDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; +import java.util.List; + import static org.agt.framework.common.pojo.CommonResult.success; import static org.agt.framework.test.core.util.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; /** @@ -20,32 +22,40 @@ import static org.mockito.Mockito.when; public class DictFrameworkUtilsTest extends BaseMockitoUnitTest { @Mock - private DictDataApi dictDataApi; + private DictDataCommonApi dictDataApi; @BeforeEach public void setUp() { DictFrameworkUtils.init(dictDataApi); + DictFrameworkUtils.clearCache(); } @Test - public void testGetDictDataLabel() { + public void testParseDictDataLabel() { // mock 数据 - DictDataRespDTO dataRespDTO = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); + List dictDatas = List.of( + randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("cat").setLabel("猫")), + randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("dog").setLabel("狗")) + ); // mock 方法 - when(dictDataApi.getDictData(dataRespDTO.getDictType(), dataRespDTO.getValue())).thenReturn(success(dataRespDTO)); + when(dictDataApi.getDictDataList(eq("animal"))).thenReturn(success(dictDatas)); // 断言返回值 - assertEquals(dataRespDTO.getLabel(), DictFrameworkUtils.getDictDataLabel(dataRespDTO.getDictType(), dataRespDTO.getValue())); + assertEquals("狗", DictFrameworkUtils.parseDictDataLabel("animal", "dog")); } @Test public void testParseDictDataValue() { // mock 数据 - DictDataRespDTO resp = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); + List dictDatas = List.of( + randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("cat").setLabel("猫")), + randomPojo(DictDataRespDTO.class, o -> o.setDictType("animal").setValue("dog").setLabel("狗")) + ); // mock 方法 - when(dictDataApi.parseDictData(resp.getDictType(), resp.getLabel())).thenReturn(success(resp)); + when(dictDataApi.getDictDataList(eq("animal"))).thenReturn(success(dictDatas)); + // 断言返回值 - assertEquals(resp.getValue(), DictFrameworkUtils.parseDictDataValue(resp.getDictType(), resp.getLabel())); + assertEquals("dog", DictFrameworkUtils.parseDictDataValue("animal", "狗")); } } diff --git a/agt-framework/agt-spring-boot-starter-security/pom.xml b/agt-framework/agt-spring-boot-starter-security/pom.xml index 200d01d..940a3af 100644 --- a/agt-framework/agt-spring-boot-starter-security/pom.xml +++ b/agt-framework/agt-spring-boot-starter-security/pom.xml @@ -54,13 +54,6 @@ true - - - org.agt - agt-module-system-api - ${revision} - - com.google.guava diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/config/AgtOperateLogRpcAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/config/AgtOperateLogRpcAutoConfiguration.java index 7e279e1..16c4a24 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/config/AgtOperateLogRpcAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/config/AgtOperateLogRpcAutoConfiguration.java @@ -1,6 +1,6 @@ package org.agt.framework.operatelog.config; -import org.agt.module.system.api.logger.OperateLogApi; +import org.agt.framework.common.biz.system.logger.OperateLogCommonApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -10,6 +10,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author 千通源码 */ @AutoConfiguration -@EnableFeignClients(clients = {OperateLogApi.class}) // 主要是引入相关的 API 服务 +@EnableFeignClients(clients = {OperateLogCommonApi.class}) // 主要是引入相关的 API 服务 public class AgtOperateLogRpcAutoConfiguration { } diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/core/service/LogRecordServiceImpl.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/core/service/LogRecordServiceImpl.java index a1de19c..c6fa6b5 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/core/service/LogRecordServiceImpl.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/operatelog/core/service/LogRecordServiceImpl.java @@ -1,23 +1,24 @@ package org.agt.framework.operatelog.core.service; +import org.agt.framework.common.biz.system.logger.OperateLogCommonApi; import org.agt.framework.common.util.monitor.TracerUtils; import org.agt.framework.common.util.servlet.ServletUtils; import org.agt.framework.security.core.LoginUser; import org.agt.framework.security.core.util.SecurityFrameworkUtils; -import org.agt.module.system.api.logger.OperateLogApi; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; import com.mzt.logapi.beans.LogRecord; import com.mzt.logapi.service.ILogRecordService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Qualifier; import java.util.List; /** * 操作日志 ILogRecordService 实现类 * - * 基于 {@link OperateLogApi} 实现，记录操作日志 + * 基于 {@link OperateLogCommonApi} 实现，记录操作日志 * * @author HUIHUI */ @@ -25,7 +26,7 @@ import java.util.List; public class LogRecordServiceImpl implements ILogRecordService { @Resource - private OperateLogApi operateLogApi; + private OperateLogCommonApi operateLogApi; @Override public void record(LogRecord logRecord) { diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityAutoConfiguration.java index eb73eea..aef2ce1 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityAutoConfiguration.java @@ -1,5 +1,6 @@ package org.agt.framework.security.config; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; import org.agt.framework.security.core.filter.TokenAuthenticationFilter; import org.agt.framework.security.core.handler.AccessDeniedHandlerImpl; @@ -7,8 +8,7 @@ import org.agt.framework.security.core.handler.AuthenticationEntryPointImpl; import org.agt.framework.security.core.service.SecurityFrameworkService; import org.agt.framework.security.core.service.SecurityFrameworkServiceImpl; import org.agt.framework.web.core.handler.GlobalExceptionHandler; -import org.agt.module.system.api.oauth2.OAuth2TokenApi; -import org.agt.module.system.api.permission.PermissionApi; +import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import jakarta.annotation.Resource; import org.springframework.beans.factory.config.MethodInvokingFactoryBean; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -69,12 +69,12 @@ public class AgtSecurityAutoConfiguration { */ @Bean public TokenAuthenticationFilter authenticationTokenFilter(GlobalExceptionHandler globalExceptionHandler, - OAuth2TokenApi oauth2TokenApi) { + OAuth2TokenCommonApi oauth2TokenApi) { return new TokenAuthenticationFilter(securityProperties, globalExceptionHandler, oauth2TokenApi); } @Bean("ss") // 使用 Spring Security 的缩写，方便使用 - public SecurityFrameworkService securityFrameworkService(PermissionApi permissionApi) { + public SecurityFrameworkService securityFrameworkService(PermissionCommonApi permissionApi) { return new SecurityFrameworkServiceImpl(permissionApi); } diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityRpcAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityRpcAutoConfiguration.java index 8c8f35e..6136927 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityRpcAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/config/AgtSecurityRpcAutoConfiguration.java @@ -1,8 +1,8 @@ package org.agt.framework.security.config; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.security.core.rpc.LoginUserRequestInterceptor; -import org.agt.module.system.api.oauth2.OAuth2TokenApi; -import org.agt.module.system.api.permission.PermissionApi; +import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Bean; * @author 千通源码 */ @AutoConfiguration -@EnableFeignClients(clients = {OAuth2TokenApi.class, // 主要是引入相关的 API 服务 - PermissionApi.class}) +@EnableFeignClients(clients = {OAuth2TokenCommonApi.class, // 主要是引入相关的 API 服务 + PermissionCommonApi.class}) public class AgtSecurityRpcAutoConfiguration { @Bean diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/filter/TokenAuthenticationFilter.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/filter/TokenAuthenticationFilter.java index c2430fe..bf8b50f 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/filter/TokenAuthenticationFilter.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/filter/TokenAuthenticationFilter.java @@ -11,8 +11,8 @@ import org.agt.framework.security.core.LoginUser; import org.agt.framework.security.core.util.SecurityFrameworkUtils; import org.agt.framework.web.core.handler.GlobalExceptionHandler; import org.agt.framework.web.core.util.WebFrameworkUtils; -import org.agt.module.system.api.oauth2.OAuth2TokenApi; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -40,7 +40,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { private final GlobalExceptionHandler globalExceptionHandler; - private final OAuth2TokenApi oauth2TokenApi; + private final OAuth2TokenCommonApi oauth2TokenApi; @Override @SuppressWarnings("NullableProblems") diff --git a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/service/SecurityFrameworkServiceImpl.java b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/service/SecurityFrameworkServiceImpl.java index ba75bd2..68cf4f1 100644 --- a/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/service/SecurityFrameworkServiceImpl.java +++ b/agt-framework/agt-spring-boot-starter-security/src/main/java/org/agt/framework/security/core/service/SecurityFrameworkServiceImpl.java @@ -1,10 +1,10 @@ package org.agt.framework.security.core.service; import cn.hutool.core.collection.CollUtil; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.common.core.KeyValue; import org.agt.framework.security.core.LoginUser; import org.agt.framework.security.core.util.SecurityFrameworkUtils; -import org.agt.module.system.api.permission.PermissionApi; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import lombok.AllArgsConstructor; @@ -26,7 +26,7 @@ import static org.agt.framework.security.core.util.SecurityFrameworkUtils.skipPe @AllArgsConstructor public class SecurityFrameworkServiceImpl implements SecurityFrameworkService { - private final PermissionApi permissionApi; + private final PermissionCommonApi permissionApi; /** * 针对 {@link #hasAnyRoles(String...)} 的缓存 diff --git a/agt-framework/agt-spring-boot-starter-web/pom.xml b/agt-framework/agt-spring-boot-starter-web/pom.xml index 6f65d64..fcb7da4 100644 --- a/agt-framework/agt-spring-boot-starter-web/pom.xml +++ b/agt-framework/agt-spring-boot-starter-web/pom.xml @@ -61,18 +61,6 @@ true - - - org.agt - agt-module-infra-api - ${revision} - - - org.agt - agt-module-system-api - ${revision} - - org.jsoup diff --git a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogAutoConfiguration.java index a0b15db..54239d2 100644 --- a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogAutoConfiguration.java @@ -2,10 +2,10 @@ package org.agt.framework.apilog.config; import org.agt.framework.apilog.core.filter.ApiAccessLogFilter; import org.agt.framework.apilog.core.interceptor.ApiAccessLogInterceptor; +import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi; import org.agt.framework.common.enums.WebFilterOrderEnum; import org.agt.framework.web.config.WebProperties; import org.agt.framework.web.config.AgtWebAutoConfiguration; -import org.agt.module.infra.api.logger.ApiAccessLogApi; import jakarta.servlet.Filter; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -23,10 +23,9 @@ public class AgtApiLogAutoConfiguration implements WebMvcConfigurer { */ @Bean @ConditionalOnProperty(prefix = "agt.access-log", value = "enable", matchIfMissing = true) // 允许使用 agt.access-log.enable=false 禁用访问日志 - @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") public FilterRegistrationBean apiAccessLogFilter(WebProperties webProperties, @Value("${spring.application.name}") String applicationName, - ApiAccessLogApi apiAccessLogApi) { + ApiAccessLogCommonApi apiAccessLogApi) { ApiAccessLogFilter filter = new ApiAccessLogFilter(webProperties, applicationName, apiAccessLogApi); return createFilterBean(filter, WebFilterOrderEnum.API_ACCESS_LOG_FILTER); } diff --git a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogRpcAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogRpcAutoConfiguration.java index d7c9932..93de795 100644 --- a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogRpcAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/config/AgtApiLogRpcAutoConfiguration.java @@ -1,7 +1,7 @@ package org.agt.framework.apilog.config; -import org.agt.module.infra.api.logger.ApiAccessLogApi; -import org.agt.module.infra.api.logger.ApiErrorLogApi; +import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi; +import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -11,6 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @author 千通源码 */ @AutoConfiguration -@EnableFeignClients(clients = {ApiAccessLogApi.class, ApiErrorLogApi.class}) // 主要是引入相关的 API 服务 +@EnableFeignClients(clients = {ApiAccessLogCommonApi.class, ApiErrorLogCommonApi.class}) // 主要是引入相关的 API 服务 public class AgtApiLogRpcAutoConfiguration { } diff --git a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/core/filter/ApiAccessLogFilter.java b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/core/filter/ApiAccessLogFilter.java index 2ec740e..04d9af7 100644 --- a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/core/filter/ApiAccessLogFilter.java +++ b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/apilog/core/filter/ApiAccessLogFilter.java @@ -9,6 +9,8 @@ import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import org.agt.framework.apilog.core.annotation.ApiAccessLog; import org.agt.framework.apilog.core.enums.OperateTypeEnum; +import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.framework.common.exception.enums.GlobalErrorCodeConstants; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.util.json.JsonUtils; @@ -17,8 +19,6 @@ import org.agt.framework.common.util.servlet.ServletUtils; import org.agt.framework.web.config.WebProperties; import org.agt.framework.web.core.filter.ApiRequestFilter; import org.agt.framework.web.core.util.WebFrameworkUtils; -import org.agt.module.infra.api.logger.ApiAccessLogApi; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -53,9 +53,9 @@ public class ApiAccessLogFilter extends ApiRequestFilter { private final String applicationName; - private final ApiAccessLogApi apiAccessLogApi; + private final ApiAccessLogCommonApi apiAccessLogApi; - public ApiAccessLogFilter(WebProperties webProperties, String applicationName, ApiAccessLogApi apiAccessLogApi) { + public ApiAccessLogFilter(WebProperties webProperties, String applicationName, ApiAccessLogCommonApi apiAccessLogApi) { super(webProperties); this.applicationName = applicationName; this.apiAccessLogApi = apiAccessLogApi; diff --git a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/config/AgtWebAutoConfiguration.java b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/config/AgtWebAutoConfiguration.java index 0c6ff13..88d7cb0 100644 --- a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/config/AgtWebAutoConfiguration.java +++ b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/config/AgtWebAutoConfiguration.java @@ -1,12 +1,12 @@ package org.agt.framework.web.config; +import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi; import org.agt.framework.common.enums.WebFilterOrderEnum; import org.agt.framework.web.core.filter.CacheRequestBodyFilter; import org.agt.framework.web.core.filter.DemoFilter; import org.agt.framework.web.core.handler.GlobalExceptionHandler; import org.agt.framework.web.core.handler.GlobalResponseBodyHandler; import org.agt.framework.web.core.util.WebFrameworkUtils; -import org.agt.module.infra.api.logger.ApiErrorLogApi; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -59,8 +59,7 @@ public class AgtWebAutoConfiguration implements WebMvcConfigurer { } @Bean - @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") - public GlobalExceptionHandler globalExceptionHandler(ApiErrorLogApi apiErrorLogApi) { + public GlobalExceptionHandler globalExceptionHandler(ApiErrorLogCommonApi apiErrorLogApi) { return new GlobalExceptionHandler(applicationName, apiErrorLogApi); } diff --git a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/core/handler/GlobalExceptionHandler.java b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/core/handler/GlobalExceptionHandler.java index 19973b9..e694376 100644 --- a/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/core/handler/GlobalExceptionHandler.java +++ b/agt-framework/agt-spring-boot-starter-web/src/main/java/org/agt/framework/web/core/handler/GlobalExceptionHandler.java @@ -6,6 +6,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; +import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.framework.common.exception.ServiceException; import org.agt.framework.common.exception.util.ServiceExceptionUtil; import org.agt.framework.common.pojo.CommonResult; @@ -14,8 +16,6 @@ import org.agt.framework.common.util.json.JsonUtils; import org.agt.framework.common.util.monitor.TracerUtils; import org.agt.framework.common.util.servlet.ServletUtils; import org.agt.framework.web.core.util.WebFrameworkUtils; -import org.agt.module.infra.api.logger.ApiErrorLogApi; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import com.fasterxml.jackson.databind.exc.InvalidFormatException; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolation; @@ -63,7 +63,7 @@ public class GlobalExceptionHandler { @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") private final String applicationName; - private final ApiErrorLogApi apiErrorLogApi; + private final ApiErrorLogCommonApi apiErrorLogApi; /** * 处理所有异常，主要是提供给 Filter 使用 diff --git a/agt-gateway/pom.xml b/agt-gateway/pom.xml index 3898fa2..8412d86 100644 --- a/agt-gateway/pom.xml +++ b/agt-gateway/pom.xml @@ -13,7 +13,7 @@ ${project.artifactId} API 服务网关，基于 Spring Cloud Gateway 实现 - https://github.com/YunaiV/agt-cloud + https://github.com/agt/agt-cloud diff --git a/agt-gateway/src/main/java/org/agt/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java b/agt-gateway/src/main/java/org/agt/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java index b61729f..71af19d 100644 --- a/agt-gateway/src/main/java/org/agt/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java +++ b/agt-gateway/src/main/java/org/agt/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java @@ -47,7 +47,7 @@ public class GrayReactiveLoadBalancerClientFilter implements GlobalFilter, Order @Override public int getOrder() { - // https://github.com/YunaiV/agt-cloud/pull/213 + // https://github.com/agt/agt-cloud/pull/213 return ReactiveLoadBalancerClientFilter.LOAD_BALANCER_CLIENT_FILTER_ORDER - 50; } diff --git a/agt-gateway/src/main/java/org/agt/gateway/filter/security/TokenAuthenticationFilter.java b/agt-gateway/src/main/java/org/agt/gateway/filter/security/TokenAuthenticationFilter.java index a1d9077..69b2eb9 100644 --- a/agt-gateway/src/main/java/org/agt/gateway/filter/security/TokenAuthenticationFilter.java +++ b/agt-gateway/src/main/java/org/agt/gateway/filter/security/TokenAuthenticationFilter.java @@ -7,8 +7,8 @@ import org.agt.framework.common.util.date.LocalDateTimeUtils; import org.agt.framework.common.util.json.JsonUtils; import org.agt.gateway.util.SecurityFrameworkUtils; import org.agt.gateway.util.WebFrameworkUtils; -import org.agt.module.system.api.oauth2.OAuth2TokenApi; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -133,7 +133,7 @@ public class TokenAuthenticationFilter implements GlobalFilter, Ordered { private Mono checkAccessToken(Long tenantId, String token) { return webClient.get() - .uri(OAuth2TokenApi.URL_CHECK, uriBuilder -> uriBuilder.queryParam("accessToken", token).build()) + .uri(OAuth2TokenCommonApi.URL_CHECK, uriBuilder -> uriBuilder.queryParam("accessToken", token).build()) .headers(httpHeaders -> WebFrameworkUtils.setTenantIdHeader(tenantId, httpHeaders)) // 设置租户的 Header .retrieve().bodyToMono(String.class); } diff --git a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java deleted file mode 100644 index 21c6130..0000000 --- a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.agt.module.infra.api.logger.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Schema(description = "RPC 服务 - API 访问日志创建 Request DTO") -@Data -public class ApiAccessLogCreateReqDTO { - - @Schema(description = "链路追踪编号", example = "89aca178-a370-411c-ae02-3f0d672be4ab") - private String traceId; - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long userId; - @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer userType; - @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system-server") - @NotNull(message = "应用名不能为空") - private String applicationName; - - @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET") - @NotNull(message = "http 请求方法不能为空") - private String requestMethod; - @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xxx/yyy") - @NotNull(message = "访问地址不能为空") - private String requestUrl; - @Schema(description = "请求参数") - private String requestParams; - @Schema(description = "响应结果") - private String responseBody; - @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1") - @NotNull(message = "ip 不能为空") - private String userIp; - @Schema(description = "浏览器 UserAgent", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0") - @NotNull(message = "User-Agent 不能为空") - private String userAgent; - - @Schema(description = "操作模块", requiredMode = Schema.RequiredMode.REQUIRED, example = "商品模块") - private String operateModule; - @Schema(description = "操作名", requiredMode = Schema.RequiredMode.REQUIRED, example = "商品新增") - private String operateName; - @Schema(description = "操作分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer operateType; // 参见 OperateTypeEnum 枚举 - - @Schema(description = "开始时间",requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "开始请求时间不能为空") - private LocalDateTime beginTime; - @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "结束请求时间不能为空") - private LocalDateTime endTime; - @Schema(description = "执行时长，单位：毫秒", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "执行时长不能为空") - private Integer duration; - @Schema(description = "结果码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "错误码不能为空") - private Integer resultCode; - @Schema(description = "结果提示") - private String resultMsg; - -} diff --git a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/DictTypeConstants.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/DictTypeConstants.java index 1ef52d0..c138f41 100644 --- a/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/DictTypeConstants.java +++ b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/DictTypeConstants.java @@ -7,6 +7,8 @@ package org.agt.module.infra.enums; */ public interface DictTypeConstants { + String USER_TYPE = "user_type"; // 用户类型 + String JOB_STATUS = "infra_job_status"; // 定时任务状态的枚举 String JOB_LOG_STATUS = "infra_job_log_status"; // 定时任务日志状态的枚举 diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnListConditionEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnListConditionEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnListConditionEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenColumnListConditionEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenFrontTypeEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenFrontTypeEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenFrontTypeEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenSceneEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenSceneEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenSceneEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenSceneEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenTemplateTypeEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenTemplateTypeEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/codegen/CodegenTemplateTypeEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/codegen/CodegenTemplateTypeEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/config/ConfigTypeEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/config/ConfigTypeEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/config/ConfigTypeEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/config/ConfigTypeEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/package-info.java b/agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/enums/package-info.java rename to agt-module-infra/agt-module-infra-api/src/main/java/org/agt/module/infra/enums/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO deleted file mode 100644 index 22541b5..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO +++ /dev/null @@ -1,67 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生 DO - * - * @author sys - */ -@TableName("infra_student") -@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper deleted file mode 100644 index 0e8d4e8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper +++ /dev/null @@ -1,30 +0,0 @@ -package org.agt.module.infra.dal.mysql.demo; - -import java.util.*; - -import org.agt.framework.common.pojo.PageResult; -import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; -import org.agt.framework.mybatis.core.mapper.BaseMapperX; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.apache.ibatis.annotations.Mapper; -import org.agt.module.infra.controller.admin.demo.vo.*; - -/** - * 学生 Mapper - * - * @author sys - */ -@Mapper -public interface InfraStudentMapper extends BaseMapperX { - - default PageResult selectPage(InfraStudentPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) - .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) - .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) - .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) - .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InfraStudentDO::getId)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest deleted file mode 100644 index 3c17aa8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest +++ /dev/null @@ -1,146 +0,0 @@ -package org.agt.module.infra.service.demo; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import org.agt.framework.test.core.ut.BaseDbUnitTest; - -import org.agt.module.infra.controller.admin.demo.vo.*; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; -import org.agt.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static org.agt.module.infra.enums.ErrorCodeConstants.*; -import static org.agt.framework.test.core.util.AssertUtils.*; -import static org.agt.framework.test.core.util.RandomUtils.*; -import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; -import static org.agt.framework.common.util.object.ObjectUtils.*; -import static org.agt.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link InfraStudentServiceImpl} 的单元测试类 - * - * @author sys - */ -@Import(InfraStudentServiceImpl.class) -public class InfraStudentServiceImplTest extends BaseDbUnitTest { - - @Resource - private InfraStudentServiceImpl studentService; - - @Resource - private InfraStudentMapper studentMapper; - - @Test - public void testCreateStudent_success() { - // 准备参数 - InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); - - // 调用 - Long studentId = studentService.createStudent(createReqVO); - // 断言 - assertNotNull(studentId); - // 校验记录的属性是否正确 - InfraStudentDO student = studentMapper.selectById(studentId); - assertPojoEquals(createReqVO, student, "id"); - } - - @Test - public void testUpdateStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { - o.setId(dbStudent.getId()); // 设置更新的 ID - }); - - // 调用 - studentService.updateStudent(updateReqVO); - // 校验是否更新正确 - InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 - assertPojoEquals(updateReqVO, student); - } - - @Test - public void testUpdateStudent_notExists() { - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); - } - - @Test - public void testDeleteStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbStudent.getId(); - - // 调用 - studentService.deleteStudent(id); - // 校验数据不存在了 - assertNull(studentMapper.selectById(id)); - } - - @Test - public void testDeleteStudent_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetStudentPage() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 - o.setName(null); - o.setBirthday(null); - o.setSex(null); - o.setEnabled(null); - o.setCreateTime(null); - }); - studentMapper.insert(dbStudent); - // 测试 name 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); - // 测试 birthday 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); - // 测试 sex 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); - // 测试 enabled 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); - // 测试 createTime 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); - // 准备参数 - InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); - reqVO.setName(null); - reqVO.setBirthday(null); - reqVO.setSex(null); - reqVO.setEnabled(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = studentService.getStudentPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbStudent, pageResult.getList().get(0)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO deleted file mode 100644 index 6e02616..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO +++ /dev/null @@ -1,71 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生联系人 DO - * - * @author sys - */ -@TableName("infra_student_contact") -@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentContactDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 学生编号 - */ - private Long studentId; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO deleted file mode 100644 index 22541b5..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO +++ /dev/null @@ -1,67 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生 DO - * - * @author sys - */ -@TableName("infra_student") -@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper deleted file mode 100644 index 0e8d4e8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper +++ /dev/null @@ -1,30 +0,0 @@ -package org.agt.module.infra.dal.mysql.demo; - -import java.util.*; - -import org.agt.framework.common.pojo.PageResult; -import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; -import org.agt.framework.mybatis.core.mapper.BaseMapperX; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.apache.ibatis.annotations.Mapper; -import org.agt.module.infra.controller.admin.demo.vo.*; - -/** - * 学生 Mapper - * - * @author sys - */ -@Mapper -public interface InfraStudentMapper extends BaseMapperX { - - default PageResult selectPage(InfraStudentPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) - .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) - .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) - .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) - .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InfraStudentDO::getId)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest deleted file mode 100644 index 3c17aa8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest +++ /dev/null @@ -1,146 +0,0 @@ -package org.agt.module.infra.service.demo; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import org.agt.framework.test.core.ut.BaseDbUnitTest; - -import org.agt.module.infra.controller.admin.demo.vo.*; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; -import org.agt.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static org.agt.module.infra.enums.ErrorCodeConstants.*; -import static org.agt.framework.test.core.util.AssertUtils.*; -import static org.agt.framework.test.core.util.RandomUtils.*; -import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; -import static org.agt.framework.common.util.object.ObjectUtils.*; -import static org.agt.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link InfraStudentServiceImpl} 的单元测试类 - * - * @author sys - */ -@Import(InfraStudentServiceImpl.class) -public class InfraStudentServiceImplTest extends BaseDbUnitTest { - - @Resource - private InfraStudentServiceImpl studentService; - - @Resource - private InfraStudentMapper studentMapper; - - @Test - public void testCreateStudent_success() { - // 准备参数 - InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); - - // 调用 - Long studentId = studentService.createStudent(createReqVO); - // 断言 - assertNotNull(studentId); - // 校验记录的属性是否正确 - InfraStudentDO student = studentMapper.selectById(studentId); - assertPojoEquals(createReqVO, student, "id"); - } - - @Test - public void testUpdateStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { - o.setId(dbStudent.getId()); // 设置更新的 ID - }); - - // 调用 - studentService.updateStudent(updateReqVO); - // 校验是否更新正确 - InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 - assertPojoEquals(updateReqVO, student); - } - - @Test - public void testUpdateStudent_notExists() { - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); - } - - @Test - public void testDeleteStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbStudent.getId(); - - // 调用 - studentService.deleteStudent(id); - // 校验数据不存在了 - assertNull(studentMapper.selectById(id)); - } - - @Test - public void testDeleteStudent_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetStudentPage() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 - o.setName(null); - o.setBirthday(null); - o.setSex(null); - o.setEnabled(null); - o.setCreateTime(null); - }); - studentMapper.insert(dbStudent); - // 测试 name 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); - // 测试 birthday 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); - // 测试 sex 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); - // 测试 enabled 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); - // 测试 createTime 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); - // 准备参数 - InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); - reqVO.setName(null); - reqVO.setBirthday(null); - reqVO.setSex(null); - reqVO.setEnabled(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = studentService.getStudentPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbStudent, pageResult.getList().get(0)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO deleted file mode 100644 index 44194e6..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO +++ /dev/null @@ -1,71 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生班主任 DO - * - * @author sys - */ -@TableName("infra_student_teacher") -@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentTeacherDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 学生编号 - */ - private Long studentId; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO deleted file mode 100644 index 6e02616..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO +++ /dev/null @@ -1,71 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生联系人 DO - * - * @author sys - */ -@TableName("infra_student_contact") -@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentContactDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 学生编号 - */ - private Long studentId; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO deleted file mode 100644 index 22541b5..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO +++ /dev/null @@ -1,67 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生 DO - * - * @author sys - */ -@TableName("infra_student") -@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper deleted file mode 100644 index 0e8d4e8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper +++ /dev/null @@ -1,30 +0,0 @@ -package org.agt.module.infra.dal.mysql.demo; - -import java.util.*; - -import org.agt.framework.common.pojo.PageResult; -import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; -import org.agt.framework.mybatis.core.mapper.BaseMapperX; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.apache.ibatis.annotations.Mapper; -import org.agt.module.infra.controller.admin.demo.vo.*; - -/** - * 学生 Mapper - * - * @author sys - */ -@Mapper -public interface InfraStudentMapper extends BaseMapperX { - - default PageResult selectPage(InfraStudentPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) - .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) - .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) - .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) - .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InfraStudentDO::getId)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest deleted file mode 100644 index 3c17aa8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest +++ /dev/null @@ -1,146 +0,0 @@ -package org.agt.module.infra.service.demo; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import org.agt.framework.test.core.ut.BaseDbUnitTest; - -import org.agt.module.infra.controller.admin.demo.vo.*; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; -import org.agt.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static org.agt.module.infra.enums.ErrorCodeConstants.*; -import static org.agt.framework.test.core.util.AssertUtils.*; -import static org.agt.framework.test.core.util.RandomUtils.*; -import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; -import static org.agt.framework.common.util.object.ObjectUtils.*; -import static org.agt.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link InfraStudentServiceImpl} 的单元测试类 - * - * @author sys - */ -@Import(InfraStudentServiceImpl.class) -public class InfraStudentServiceImplTest extends BaseDbUnitTest { - - @Resource - private InfraStudentServiceImpl studentService; - - @Resource - private InfraStudentMapper studentMapper; - - @Test - public void testCreateStudent_success() { - // 准备参数 - InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); - - // 调用 - Long studentId = studentService.createStudent(createReqVO); - // 断言 - assertNotNull(studentId); - // 校验记录的属性是否正确 - InfraStudentDO student = studentMapper.selectById(studentId); - assertPojoEquals(createReqVO, student, "id"); - } - - @Test - public void testUpdateStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { - o.setId(dbStudent.getId()); // 设置更新的 ID - }); - - // 调用 - studentService.updateStudent(updateReqVO); - // 校验是否更新正确 - InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 - assertPojoEquals(updateReqVO, student); - } - - @Test - public void testUpdateStudent_notExists() { - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); - } - - @Test - public void testDeleteStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbStudent.getId(); - - // 调用 - studentService.deleteStudent(id); - // 校验数据不存在了 - assertNull(studentMapper.selectById(id)); - } - - @Test - public void testDeleteStudent_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetStudentPage() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 - o.setName(null); - o.setBirthday(null); - o.setSex(null); - o.setEnabled(null); - o.setCreateTime(null); - }); - studentMapper.insert(dbStudent); - // 测试 name 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); - // 测试 birthday 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); - // 测试 sex 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); - // 测试 enabled 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); - // 测试 createTime 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); - // 准备参数 - InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); - reqVO.setName(null); - reqVO.setBirthday(null); - reqVO.setSex(null); - reqVO.setEnabled(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = studentService.getStudentPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbStudent, pageResult.getList().get(0)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO deleted file mode 100644 index 44194e6..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO +++ /dev/null @@ -1,71 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生班主任 DO - * - * @author sys - */ -@TableName("infra_student_teacher") -@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentTeacherDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 学生编号 - */ - private Long studentId; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO deleted file mode 100644 index 22541b5..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO +++ /dev/null @@ -1,67 +0,0 @@ -package org.agt.module.infra.dal.dataobject.demo; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import org.agt.framework.mybatis.core.dataobject.BaseDO; - -/** - * 学生 DO - * - * @author sys - */ -@TableName("infra_student") -@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InfraStudentDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 名字 - */ - private String name; - /** - * 简介 - */ - private String description; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 性别 - * - * 枚举 {@link TODO system_user_sex 对应的类} - */ - private Integer sex; - /** - * 是否有效 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean enabled; - /** - * 头像 - */ - private String avatar; - /** - * 附件 - */ - private String video; - /** - * 备注 - */ - private String memo; - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper deleted file mode 100644 index 0e8d4e8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper +++ /dev/null @@ -1,30 +0,0 @@ -package org.agt.module.infra.dal.mysql.demo; - -import java.util.*; - -import org.agt.framework.common.pojo.PageResult; -import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; -import org.agt.framework.mybatis.core.mapper.BaseMapperX; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.apache.ibatis.annotations.Mapper; -import org.agt.module.infra.controller.admin.demo.vo.*; - -/** - * 学生 Mapper - * - * @author sys - */ -@Mapper -public interface InfraStudentMapper extends BaseMapperX { - - default PageResult selectPage(InfraStudentPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) - .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) - .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) - .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) - .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InfraStudentDO::getId)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest deleted file mode 100644 index 3c17aa8..0000000 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest +++ /dev/null @@ -1,146 +0,0 @@ -package org.agt.module.infra.service.demo; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import org.agt.framework.test.core.ut.BaseDbUnitTest; - -import org.agt.module.infra.controller.admin.demo.vo.*; -import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; -import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; -import org.agt.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static org.agt.module.infra.enums.ErrorCodeConstants.*; -import static org.agt.framework.test.core.util.AssertUtils.*; -import static org.agt.framework.test.core.util.RandomUtils.*; -import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; -import static org.agt.framework.common.util.object.ObjectUtils.*; -import static org.agt.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** - * {@link InfraStudentServiceImpl} 的单元测试类 - * - * @author sys - */ -@Import(InfraStudentServiceImpl.class) -public class InfraStudentServiceImplTest extends BaseDbUnitTest { - - @Resource - private InfraStudentServiceImpl studentService; - - @Resource - private InfraStudentMapper studentMapper; - - @Test - public void testCreateStudent_success() { - // 准备参数 - InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); - - // 调用 - Long studentId = studentService.createStudent(createReqVO); - // 断言 - assertNotNull(studentId); - // 校验记录的属性是否正确 - InfraStudentDO student = studentMapper.selectById(studentId); - assertPojoEquals(createReqVO, student, "id"); - } - - @Test - public void testUpdateStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { - o.setId(dbStudent.getId()); // 设置更新的 ID - }); - - // 调用 - studentService.updateStudent(updateReqVO); - // 校验是否更新正确 - InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 - assertPojoEquals(updateReqVO, student); - } - - @Test - public void testUpdateStudent_notExists() { - // 准备参数 - InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); - } - - @Test - public void testDeleteStudent_success() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); - studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbStudent.getId(); - - // 调用 - studentService.deleteStudent(id); - // 校验数据不存在了 - assertNull(studentMapper.selectById(id)); - } - - @Test - public void testDeleteStudent_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetStudentPage() { - // mock 数据 - InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 - o.setName(null); - o.setBirthday(null); - o.setSex(null); - o.setEnabled(null); - o.setCreateTime(null); - }); - studentMapper.insert(dbStudent); - // 测试 name 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); - // 测试 birthday 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); - // 测试 sex 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); - // 测试 enabled 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); - // 测试 createTime 不匹配 - studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); - // 准备参数 - InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); - reqVO.setName(null); - reqVO.setBirthday(null); - reqVO.setSex(null); - reqVO.setEnabled(null); - reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = studentService.getStudentPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbStudent, pageResult.getList().get(0)); - } - -} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/Dockerfile b/agt-module-infra/agt-module-infra-server/Dockerfile similarity index 100% rename from agt-module-infra/agt-module-infra-biz/Dockerfile rename to agt-module-infra/agt-module-infra-server/Dockerfile diff --git a/agt-module-infra/agt-module-infra-biz/pom.xml b/agt-module-infra/agt-module-infra-server/pom.xml similarity index 99% rename from agt-module-infra/agt-module-infra-biz/pom.xml rename to agt-module-infra/agt-module-infra-server/pom.xml index 1996702..773ec83 100644 --- a/agt-module-infra/agt-module-infra-biz/pom.xml +++ b/agt-module-infra/agt-module-infra-server/pom.xml @@ -8,7 +8,7 @@ ${revision} 4.0.0 - agt-module-infra-biz + agt-module-infra-server jar ${project.artifactId} diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/AgtInfraApplication.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/AgtInfraApplication.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/AgtInfraApplication.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/AgtInfraApplication.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/config/ConfigApiImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/config/ConfigApiImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/config/ConfigApiImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/config/ConfigApiImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/file/FileApiImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/file/FileApiImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/file/FileApiImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/file/FileApiImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java similarity index 76% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java index 581ee2b..0267c76 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiAccessLogApiImpl.java @@ -1,7 +1,8 @@ package org.agt.module.infra.api.logger; +import org.agt.framework.common.biz.infra.logger.ApiAccessLogCommonApi; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.module.infra.service.logger.ApiAccessLogService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,7 +13,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated -public class ApiAccessLogApiImpl implements ApiAccessLogApi { +public class ApiAccessLogApiImpl implements ApiAccessLogCommonApi { @Resource private ApiAccessLogService apiAccessLogService; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java similarity index 77% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java index 65783c4..ffce8bf 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/logger/ApiErrorLogApiImpl.java @@ -1,7 +1,8 @@ package org.agt.module.infra.api.logger; +import org.agt.framework.common.biz.infra.logger.ApiErrorLogCommonApi; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.module.infra.service.logger.ApiErrorLogService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,7 +13,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated -public class ApiErrorLogApiImpl implements ApiErrorLogApi { +public class ApiErrorLogApiImpl implements ApiErrorLogCommonApi { @Resource private ApiErrorLogService apiErrorLogService; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/websocket/WebSocketSenderApiImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/websocket/WebSocketSenderApiImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/api/websocket/WebSocketSenderApiImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/api/websocket/WebSocketSenderApiImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java index cdbdf9a..e21397e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/CodegenController.java @@ -35,6 +35,7 @@ import java.util.Map; import static org.agt.framework.common.pojo.CommonResult.success; import static org.agt.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static org.agt.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname; import static org.agt.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment; @Tag(name = "管理后台 - 代码生成器") @@ -93,7 +94,7 @@ public class CodegenController { @PostMapping("/create-list") @PreAuthorize("@ss.hasPermission('infra:codegen:create')") public CommonResult> createCodegenList(@Valid @RequestBody CodegenCreateListReqVO reqVO) { - return success(codegenService.createCodegenList(getLoginUserId(), reqVO)); + return success(codegenService.createCodegenList(getLoginUserNickname(), reqVO)); } @Operation(summary = "更新数据库的表和字段定义") diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/ConfigController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/ConfigController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/ConfigController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/ConfigController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/DataSourceConfigController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/DataSourceConfigController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/DataSourceConfigController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/DataSourceConfigController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/Demo01ContactController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/Demo01ContactController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/Demo01ContactController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/Demo01ContactController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/Demo03StudentController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/Demo03StudentController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/Demo03StudentController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/Demo03StudentController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/demo/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/demo/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.http b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.http similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.http rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.http diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileConfigController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/FileController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/FileController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/job/JobController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/job/JobController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/job/JobController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/job/JobController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/ApiAccessLogController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/ApiAccessLogController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/ApiAccessLogController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/ApiAccessLogController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/ApiErrorLogController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/ApiErrorLogController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/ApiErrorLogController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/ApiErrorLogController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java index 0d593ca..346b851 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java @@ -2,7 +2,7 @@ package org.agt.module.infra.controller.admin.logger.vo.apiaccesslog; import org.agt.framework.excel.core.annotations.DictFormat; import org.agt.framework.excel.core.convert.DictConvert; -import org.agt.module.system.enums.DictTypeConstants; +import org.agt.module.infra.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java index c61f243..6da9d9f 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java @@ -29,7 +29,7 @@ public class ApiErrorLogRespVO { @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(org.agt.module.system.enums.DictTypeConstants.USER_TYPE) + @DictFormat(DictTypeConstants.USER_TYPE) private Integer userType; @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard") diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.http b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.http similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.http rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.http diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/RedisController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/file/AppFileController.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/file/AppFileController.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/file/AppFileController.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/file/AppFileController.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/file/vo/AppFileUploadReqVO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/file/vo/AppFileUploadReqVO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/file/vo/AppFileUploadReqVO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/file/vo/AppFileUploadReqVO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/app/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/app/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/controller/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/controller/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/codegen/CodegenConvert.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/codegen/CodegenConvert.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/codegen/CodegenConvert.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/codegen/CodegenConvert.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/config/ConfigConvert.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/config/ConfigConvert.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/config/ConfigConvert.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/config/ConfigConvert.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/file/FileConfigConvert.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/file/FileConfigConvert.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/file/FileConfigConvert.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/file/FileConfigConvert.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/redis/RedisConvert.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/redis/RedisConvert.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/redis/RedisConvert.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/redis/RedisConvert.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenColumnDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenColumnDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenColumnDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenColumnDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenTableDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenTableDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenTableDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/codegen/CodegenTableDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/config/ConfigDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/config/ConfigDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/config/ConfigDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/config/ConfigDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/db/DataSourceConfigDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/db/DataSourceConfigDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/db/DataSourceConfigDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/db/DataSourceConfigDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileConfigDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileConfigDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileConfigDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileConfigDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileContentDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileContentDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileContentDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileContentDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/file/FileDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/file/FileDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiAccessLogDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiAccessLogDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiAccessLogDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiAccessLogDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiErrorLogDO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiErrorLogDO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiErrorLogDO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/dataobject/logger/ApiErrorLogDO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenColumnMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenColumnMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenColumnMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenColumnMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenTableMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenTableMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenTableMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/codegen/CodegenTableMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/config/ConfigMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/config/ConfigMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/config/ConfigMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/config/ConfigMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/db/DataSourceConfigMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/db/DataSourceConfigMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/db/DataSourceConfigMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/db/DataSourceConfigMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileConfigMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileConfigMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileConfigMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileConfigMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileContentMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileContentMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileContentMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileContentMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/file/FileMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/file/FileMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiAccessLogMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiAccessLogMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiAccessLogMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiAccessLogMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiErrorLogMapper.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiErrorLogMapper.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiErrorLogMapper.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/dal/mysql/logger/ApiErrorLogMapper.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenConfiguration.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenConfiguration.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenConfiguration.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenConfiguration.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenProperties.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenProperties.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenProperties.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/config/CodegenProperties.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/codegen/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/codegen/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/config/AgtFileAutoConfiguration.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/config/AgtFileAutoConfiguration.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/config/AgtFileAutoConfiguration.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/config/AgtFileAutoConfiguration.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/AbstractFileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/AbstractFileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/AbstractFileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/AbstractFileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactory.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactory.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactory.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactory.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactoryImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactoryImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactoryImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/FileClientFactoryImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/db/DBFileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/local/LocalFileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/s3/S3FileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClient.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClient.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClient.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClient.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/enums/FileStorageEnum.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/enums/FileStorageEnum.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/enums/FileStorageEnum.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/enums/FileStorageEnum.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/utils/FileTypeUtils.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/utils/FileTypeUtils.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/core/utils/FileTypeUtils.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/core/utils/FileTypeUtils.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/file/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/file/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/config/AdminServerConfiguration.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/config/AdminServerConfiguration.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/config/AdminServerConfiguration.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/config/AdminServerConfiguration.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java similarity index 73% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java index 076fd52..427fa18 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/rpc/config/RpcConfiguration.java @@ -1,10 +1,9 @@ package org.agt.module.infra.framework.rpc.config; -import org.agt.module.system.api.user.AdminUserApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @Configuration(value = "infraRpcConfiguration", proxyBeanMethods = false) -@EnableFeignClients(clients = AdminUserApi.class) +@EnableFeignClients() public class RpcConfiguration { } diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/rpc/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/rpc/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/rpc/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/rpc/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/security/config/SecurityConfiguration.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/security/config/SecurityConfiguration.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/security/config/SecurityConfiguration.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/security/config/SecurityConfiguration.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/security/core/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/security/core/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/framework/security/core/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/framework/security/core/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/logger/AccessLogCleanJob.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/logger/AccessLogCleanJob.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/logger/AccessLogCleanJob.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/logger/AccessLogCleanJob.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/logger/ErrorLogCleanJob.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/logger/ErrorLogCleanJob.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/logger/ErrorLogCleanJob.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/logger/ErrorLogCleanJob.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/job/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/job/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/consumer/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/consumer/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/consumer/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/consumer/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/message/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/message/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/message/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/message/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/producer/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/producer/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/mq/producer/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/mq/producer/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/package-info.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/package-info.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/package-info.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/package-info.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java similarity index 96% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java index 1e8cdbc..a221527 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenService.java @@ -21,11 +21,11 @@ public interface CodegenService { /** * 基于数据库的表结构，创建代码生成器的表定义 * - * @param userId 用户编号 + * @param author 作者 * @param reqVO 表信息 * @return 创建的表定义的编号数组 */ - List createCodegenList(Long userId, CodegenCreateListReqVO reqVO); + List createCodegenList(String author, CodegenCreateListReqVO reqVO); /** * 更新数据库的表和字段定义 diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java similarity index 95% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java index 4085f20..f3a1f72 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/CodegenServiceImpl.java @@ -18,7 +18,6 @@ import org.agt.module.infra.framework.codegen.config.CodegenProperties; import org.agt.module.infra.service.codegen.inner.CodegenBuilder; import org.agt.module.infra.service.codegen.inner.CodegenEngine; import org.agt.module.infra.service.db.DatabaseTableService; -import org.agt.module.system.api.user.AdminUserApi; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.google.common.annotations.VisibleForTesting; @@ -52,9 +51,6 @@ public class CodegenServiceImpl implements CodegenService { @Resource private CodegenColumnMapper codegenColumnMapper; - @Resource - private AdminUserApi userApi; - @Resource private CodegenBuilder codegenBuilder; @Resource @@ -65,21 +61,21 @@ public class CodegenServiceImpl implements CodegenService { @Override @Transactional(rollbackFor = Exception.class) - public List createCodegenList(Long userId, CodegenCreateListReqVO reqVO) { + public List createCodegenList(String author, CodegenCreateListReqVO reqVO) { List ids = new ArrayList<>(reqVO.getTableNames().size()); // 遍历添加。虽然效率会低一点，但是没必要做成完全批量，因为不会这么大量 - reqVO.getTableNames().forEach(tableName -> ids.add(createCodegen(userId, reqVO.getDataSourceConfigId(), tableName))); + reqVO.getTableNames().forEach(tableName -> ids.add(createCodegen(author, reqVO.getDataSourceConfigId(), tableName))); return ids; } - private Long createCodegen(Long userId, Long dataSourceConfigId, String tableName) { + private Long createCodegen(String author, Long dataSourceConfigId, String tableName) { // 从数据库中，获得数据库表结构 TableInfo tableInfo = databaseTableService.getTable(dataSourceConfigId, tableName); // 导入 - return createCodegen0(userId, dataSourceConfigId, tableInfo); + return createCodegen0(author, dataSourceConfigId, tableInfo); } - private Long createCodegen0(Long userId, Long dataSourceConfigId, TableInfo tableInfo) { + private Long createCodegen0(String author, Long dataSourceConfigId, TableInfo tableInfo) { // 校验导入的表和字段非空 validateTableInfo(tableInfo); // 校验是否已经存在 @@ -93,7 +89,7 @@ public class CodegenServiceImpl implements CodegenService { table.setDataSourceConfigId(dataSourceConfigId); table.setScene(CodegenSceneEnum.ADMIN.getScene()); // 默认配置下，使用管理后台的模板 table.setFrontType(codegenProperties.getFrontType()); - table.setAuthor(userApi.getUser(userId).getCheckedData().getNickname()); + table.setAuthor(author); codegenTableMapper.insert(table); // 构建 CodegenColumnDO 数组，插入到 DB 中 diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenBuilder.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenBuilder.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenBuilder.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenBuilder.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java similarity index 95% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java index ef4c89e..513e029 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/codegen/inner/CodegenEngine.java @@ -40,6 +40,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.Setter; import org.springframework.stereotype.Component; +import org.springframework.util.ClassUtils; import java.util.*; @@ -64,7 +65,7 @@ public class CodegenEngine { * value：生成的路径 */ private static final Map SERVER_TEMPLATES = MapUtil.builder(new LinkedHashMap<>()) // 有序 - // Java module-biz Main + // Java module-biz(server) Main .put(javaTemplatePath("controller/vo/pageReqVO"), javaModuleImplVOFilePath("PageReqVO")) .put(javaTemplatePath("controller/vo/listReqVO"), javaModuleImplVOFilePath("ListReqVO")) .put(javaTemplatePath("controller/vo/respVO"), javaModuleImplVOFilePath("RespVO")) @@ -83,7 +84,7 @@ public class CodegenEngine { javaModuleImplMainFilePath("service/${table.businessName}/${table.className}ServiceImpl")) .put(javaTemplatePath("service/service"), javaModuleImplMainFilePath("service/${table.businessName}/${table.className}Service")) - // Java module-biz Test + // Java module-biz(server) Test .put(javaTemplatePath("test/serviceTest"), javaModuleImplTestFilePath("service/${table.businessName}/${table.className}ServiceImplTest")) // Java module-api Main @@ -194,6 +195,15 @@ public class CodegenEngine { @Setter // 允许设置的原因，是因为单测需要手动改变 private Boolean jakartaEnable; + /** + * 是否为 agt-cloud 项目，用于解决 Boot 和 Cloud 的 api 模块兼容性问题 + * + * true - 需要有 agt-module-xxx-api 模块 + * false - 不需要有，使用 api、enum 包即可 + */ + @Setter + private Boolean cloudEnable; + /** * 模板引擎，由 hutool 实现 */ @@ -209,7 +219,11 @@ public class CodegenEngine { config.setResourceMode(TemplateConfig.ResourceMode.CLASSPATH); this.templateEngine = new VelocityEngine(config); // 设置 javaxEnable，按照是否使用 JDK17 来判断 - this.jakartaEnable = SystemUtil.getJavaInfo().isJavaVersionAtLeast(1700); // 17.00 * 100 + this.jakartaEnable = SystemUtil.getJavaInfo().isJavaVersionAtLeast(1700) // 17.00 * 100 + && ClassUtils.isPresent("jakarta.annotation.Resource", ClassUtils.getDefaultClassLoader()); + // 设置 cloudEnable，按照是否使用 Spring Cloud 来判断 + this.cloudEnable = ClassUtils.isPresent("org.agt.module.infra.framework.rpc.config.RpcConfiguration", + ClassUtils.getDefaultClassLoader()); } @PostConstruct @@ -434,6 +448,14 @@ public class CodegenEngine { Map templates = new LinkedHashMap<>(); templates.putAll(SERVER_TEMPLATES); templates.putAll(FRONT_TEMPLATES.row(frontType)); + // 如果是 Boot 项目，则不使用 api/server 模块 + if (Boolean.FALSE.equals(cloudEnable)) { + SERVER_TEMPLATES.forEach((templatePath, filePath) -> { + filePath = StrUtil.replace(filePath, "/agt-module-${table.moduleName}-api", ""); + filePath = StrUtil.replace(filePath, "/agt-module-${table.moduleName}-server", ""); + templates.put(templatePath, filePath); + }); + } // 如果禁用单元测试，则移除对应的模版 if (Boolean.FALSE.equals(codegenProperties.getUnitTestEnable())) { templates.remove(javaTemplatePath("test/serviceTest")); @@ -480,16 +502,16 @@ public class CodegenEngine { private static String javaModuleImplVOFilePath(String path) { return javaModuleFilePath("controller/${sceneEnum.basePackage}/${table.businessName}/" + - "vo/${sceneEnum.prefixClass}${table.className}" + path, "biz", "main"); + "vo/${sceneEnum.prefixClass}${table.className}" + path, "server", "main"); } private static String javaModuleImplControllerFilePath() { return javaModuleFilePath("controller/${sceneEnum.basePackage}/${table.businessName}/" + - "${sceneEnum.prefixClass}${table.className}Controller", "biz", "main"); + "${sceneEnum.prefixClass}${table.className}Controller", "server", "main"); } private static String javaModuleImplMainFilePath(String path) { - return javaModuleFilePath(path, "biz", "main"); + return javaModuleFilePath(path, "server", "main"); } private static String javaModuleApiMainFilePath(String path) { @@ -497,7 +519,7 @@ public class CodegenEngine { } private static String javaModuleImplTestFilePath(String path) { - return javaModuleFilePath(path, "biz", "test"); + return javaModuleFilePath(path, "server", "test"); } private static String javaModuleFilePath(String path, String module, String src) { @@ -508,7 +530,7 @@ public class CodegenEngine { private static String mapperXmlFilePath() { return "agt-module-${table.moduleName}/" + // 顶级模块 - "agt-module-${table.moduleName}-biz/" + // 子模块 + "agt-module-${table.moduleName}-server/" + // 子模块 "src/main/resources/mapper/${table.businessName}/${table.className}Mapper.xml"; } diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/config/ConfigService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/config/ConfigService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/config/ConfigService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/config/ConfigService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/config/ConfigServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/config/ConfigServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/config/ConfigServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/config/ConfigServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DataSourceConfigService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DataSourceConfigService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DataSourceConfigService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DataSourceConfigService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DataSourceConfigServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DataSourceConfigServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DataSourceConfigServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DataSourceConfigServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DatabaseTableService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DatabaseTableService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DatabaseTableService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DatabaseTableService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DatabaseTableServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DatabaseTableServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/db/DatabaseTableServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/db/DatabaseTableServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/demo/demo03/Demo03StudentServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileConfigService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileConfigService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileConfigService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileConfigService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileConfigServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileConfigServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileConfigServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileConfigServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileService.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileService.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileServiceImpl.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/file/FileServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/file/FileServiceImpl.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java similarity index 92% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java index 1769cd5..5320333 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogService.java @@ -1,7 +1,7 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.framework.common.pojo.PageResult; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiAccessLogDO; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java index 3631e0d..ff77d03 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImpl.java @@ -1,11 +1,11 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.common.util.string.StrUtils; import org.agt.framework.tenant.core.context.TenantContextHolder; import org.agt.framework.tenant.core.util.TenantUtils; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiAccessLogDO; import org.agt.module.infra.dal.mysql.logger.ApiAccessLogMapper; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java similarity index 94% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java index ca36289..ad8b0b0 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogService.java @@ -1,7 +1,7 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.framework.common.pojo.PageResult; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiErrorLogDO; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java index 243313d..791ed42 100644 --- a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java +++ b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImpl.java @@ -1,11 +1,11 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.common.util.string.StrUtils; import org.agt.framework.tenant.core.context.TenantContextHolder; import org.agt.framework.tenant.core.util.TenantUtils; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiErrorLogDO; import org.agt.module.infra.dal.mysql.logger.ApiErrorLogMapper; diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/DemoWebSocketMessageListener.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/DemoWebSocketMessageListener.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/DemoWebSocketMessageListener.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/DemoWebSocketMessageListener.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/message/DemoReceiveMessage.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/message/DemoReceiveMessage.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/message/DemoReceiveMessage.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/message/DemoReceiveMessage.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/message/DemoSendMessage.java b/agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/message/DemoSendMessage.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/java/org/agt/module/infra/websocket/message/DemoSendMessage.java rename to agt-module-infra/agt-module-infra-server/src/main/java/org/agt/module/infra/websocket/message/DemoSendMessage.java diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/application-dev.yaml b/agt-module-infra/agt-module-infra-server/src/main/resources/application-dev.yaml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/application-dev.yaml rename to agt-module-infra/agt-module-infra-server/src/main/resources/application-dev.yaml diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/application-local.yaml b/agt-module-infra/agt-module-infra-server/src/main/resources/application-local.yaml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/application-local.yaml rename to agt-module-infra/agt-module-infra-server/src/main/resources/application-local.yaml diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/application.yaml b/agt-module-infra/agt-module-infra-server/src/main/resources/application.yaml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/application.yaml rename to agt-module-infra/agt-module-infra-server/src/main/resources/application.yaml diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/controller.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/controller.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/listReqVO.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/listReqVO.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/pageReqVO.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/pageReqVO.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/respVO.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/respVO.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/saveReqVO.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/controller/vo/saveReqVO.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/do.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/do.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/do.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/do.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/do_sub.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/do_sub.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/do_sub.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/do_sub.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper.xml.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper.xml.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper_sub.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/dal/mapper_sub.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/enums/errorcode.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/enums/errorcode.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/service/service.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/service/service.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/service/service.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/service/service.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/service/serviceImpl.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/test/serviceTest.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/java/test/serviceTest.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/sql/h2.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/sql/h2.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/sql/h2.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/sql/h2.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/sql/sql.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/sql/sql.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/sql/sql.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/sql/sql.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/api/api.js.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/api/api.js.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/form.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/form.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/index.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue/views/index.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/api/api.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/api/api.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/form.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/form.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/index.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3/views/index.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/api/api.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/api/api.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/data.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/data.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/form.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/form.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/index.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben/views/index.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/form.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/form.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/form.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/form.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/form_sub_normal.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/form.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/form.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/form.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/form.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_normal.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_inner.vue.vm b/agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_inner.vue.vm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_inner.vue.vm rename to agt-module-infra/agt-module-infra-server/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_inner.vue.vm diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/file/erweima.jpg b/agt-module-infra/agt-module-infra-server/src/main/resources/file/erweima.jpg similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/file/erweima.jpg rename to agt-module-infra/agt-module-infra-server/src/main/resources/file/erweima.jpg diff --git a/agt-module-infra/agt-module-infra-biz/src/main/resources/logback-spring.xml b/agt-module-infra/agt-module-infra-server/src/main/resources/logback-spring.xml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/main/resources/logback-spring.xml rename to agt-module-infra/agt-module-infra-server/src/main/resources/logback-spring.xml diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/ftp/FtpFileClientTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/ftp/FtpFileClientTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/ftp/FtpFileClientTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/ftp/FtpFileClientTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/local/LocalFileClientTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/local/LocalFileClientTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/local/LocalFileClientTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/local/LocalFileClientTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/s3/S3FileClientTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/s3/S3FileClientTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/s3/S3FileClientTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/s3/S3FileClientTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/sftp/SftpFileClientTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/sftp/SftpFileClientTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/framework/file/core/sftp/SftpFileClientTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/framework/file/core/sftp/SftpFileClientTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/DefaultDatabaseQueryTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/DefaultDatabaseQueryTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/DefaultDatabaseQueryTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/DefaultDatabaseQueryTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java index 37c0445..2f6fbf8 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java +++ b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/CodegenServiceImplTest.java @@ -20,8 +20,6 @@ import org.agt.module.infra.framework.codegen.config.CodegenProperties; import org.agt.module.infra.service.codegen.inner.CodegenBuilder; import org.agt.module.infra.service.codegen.inner.CodegenEngine; import org.agt.module.infra.service.db.DatabaseTableService; -import org.agt.module.system.api.user.AdminUserApi; -import org.agt.module.system.api.user.dto.AdminUserRespDTO; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import jakarta.annotation.Resource; @@ -34,7 +32,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.agt.framework.common.pojo.CommonResult.success; import static org.agt.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; import static org.agt.framework.common.util.date.LocalDateTimeUtils.buildTime; import static org.agt.framework.common.util.object.ObjectUtils.cloneIgnoreId; @@ -66,9 +63,6 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { @MockBean private DatabaseTableService databaseTableService; - @MockBean - private AdminUserApi userApi; - @MockBean private CodegenBuilder codegenBuilder; @MockBean @@ -80,7 +74,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { @Test public void testCreateCodegenList() { // 准备参数 - Long userId = randomLongId(); + String author = randomString(); CodegenCreateListReqVO reqVO = randomPojo(CodegenCreateListReqVO.class, o -> o.setDataSourceConfigId(1L).setTableNames(Collections.singletonList("t_yunai"))); // mock 方法（TableInfo） @@ -98,9 +92,6 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { // mock 方法（CodegenTableDO） CodegenTableDO table = randomPojo(CodegenTableDO.class); when(codegenBuilder.buildTable(same(tableInfo))).thenReturn(table); - // mock 方法（AdminUserRespDTO） - AdminUserRespDTO user = randomPojo(AdminUserRespDTO.class, o -> o.setNickname("芋头")); - when(userApi.getUser(eq(userId))).thenReturn(success(user)); // mock 方法（CodegenColumnDO） List columns = randomPojoList(CodegenColumnDO.class); when(codegenBuilder.buildColumns(eq(table.getId()), same(fields))) @@ -109,7 +100,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { when(codegenProperties.getFrontType()).thenReturn(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType()); // 调用 - List result = codegenService.createCodegenList(userId, reqVO); + List result = codegenService.createCodegenList(author, reqVO); // 断言 assertEquals(1, result.size()); // 断言（CodegenTableDO） @@ -118,7 +109,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { assertEquals(1L, dbTable.getDataSourceConfigId()); assertEquals(CodegenSceneEnum.ADMIN.getScene(), dbTable.getScene()); assertEquals(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), dbTable.getFrontType()); - assertEquals("芋头", dbTable.getAuthor()); + assertEquals(author, dbTable.getAuthor()); // 断言（CodegenColumnDO） List dbColumns = codegenColumnMapper.selectList(); assertEquals(columns.size(), dbColumns.size()); diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenBuilderTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenBuilderTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenBuilderTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenBuilderTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue2Test.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue2Test.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue2Test.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue3Test.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue3Test.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/codegen/inner/CodegenEngineVue3Test.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/config/ConfigServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/config/ConfigServiceImplTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/config/ConfigServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/config/ConfigServiceImplTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/db/DataSourceConfigServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/db/DataSourceConfigServiceImplTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/db/DataSourceConfigServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/db/DataSourceConfigServiceImplTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/db/DatabaseTableServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/db/DatabaseTableServiceImplTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/db/DatabaseTableServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/db/DatabaseTableServiceImplTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/file/FileConfigServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/file/FileConfigServiceImplTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/file/FileConfigServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/file/FileConfigServiceImplTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/file/FileServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/file/FileServiceImplTest.java similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/file/FileServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/file/FileServiceImplTest.java diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java index 42d4293..48fa211 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java +++ b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiAccessLogServiceImplTest.java @@ -1,10 +1,10 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.exception.enums.GlobalErrorCodeConstants; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.test.core.ut.BaseDbUnitTest; -import org.agt.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiAccessLogDO; import org.agt.module.infra.dal.mysql.logger.ApiAccessLogMapper; diff --git a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java rename to agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java index 14f7975..d2baeea 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java +++ b/agt-module-infra/agt-module-infra-server/src/test/java/org/agt/module/infra/service/logger/ApiErrorLogServiceImplTest.java @@ -1,9 +1,9 @@ package org.agt.module.infra.service.logger; +import org.agt.framework.common.biz.infra.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.test.core.ut.BaseDbUnitTest; -import org.agt.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import org.agt.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; import org.agt.module.infra.dal.dataobject.logger.ApiErrorLogDO; import org.agt.module.infra.dal.mysql.logger.ApiErrorLogMapper; diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/application-unit-test.yaml b/agt-module-infra/agt-module-infra-server/src/test/resources/application-unit-test.yaml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/application-unit-test.yaml rename to agt-module-infra/agt-module-infra-server/src/test/resources/application-unit-test.yaml diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/category.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/category.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/category.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/category.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/contact.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/contact.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/contact.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/contact.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/student.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/student.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/student.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/student.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/teacher.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/teacher.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/table/teacher.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/table/teacher.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO index 6e02616..6385745 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生联系人 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_contact") @KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper index 6cf0bb4..d500150 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO index 22541b5..a3faabb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student") @KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper index 0e8d4e8..4afe8bd 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 学生 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService index 7625b32..f944459 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl index f1c510b..7397d2c 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest index 3c17aa8..4c55c4e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraStudentServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraStudentServiceImpl.class) public class InfraStudentServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO index 44194e6..3284dd4 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生班主任 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_teacher") @KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper index 222ac3a..8923e8e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/js/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/js/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/js/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/js/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO index 6e02616..6385745 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生联系人 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_contact") @KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper index 600502c..c289edb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO index 22541b5..a3faabb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student") @KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper index 0e8d4e8..4afe8bd 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 学生 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService index 7bcd1ba..ce5bcde 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl index 1a4f438..e76252b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest index 3c17aa8..4c55c4e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraStudentServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraStudentServiceImpl.class) public class InfraStudentServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO index 44194e6..3284dd4 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生班主任 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_teacher") @KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper index e7a73bd..057cfad 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/js/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/js/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/js/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/js/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO index 6e02616..6385745 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生联系人 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_contact") @KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper index 600502c..c289edb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO index 22541b5..a3faabb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student") @KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper index 0e8d4e8..4afe8bd 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 学生 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService index 7bcd1ba..ce5bcde 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl index 1a4f438..e76252b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest index 3c17aa8..4c55c4e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraStudentServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraStudentServiceImpl.class) public class InfraStudentServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO index 44194e6..3284dd4 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生班主任 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_teacher") @KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper index e7a73bd..057cfad 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/js/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/js/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/js/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/js/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO index 22541b5..a3faabb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student") @KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper index 0e8d4e8..4afe8bd 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 学生 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService index 3e72aa9..232401b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService @@ -10,7 +10,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl index 215961a..733dfef 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl @@ -20,7 +20,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest index 3c17aa8..4c55c4e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraStudentServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraStudentServiceImpl.class) public class InfraStudentServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/js/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/js/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/js/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/js/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO index 75e2eb8..d36671a 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO @@ -8,7 +8,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 分类 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_category") @KeySequence("infra_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper index 9d548ef..ce0c2bb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 分类 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraCategoryMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService index bfb05a2..f6c1baf 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService @@ -10,7 +10,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 分类 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraCategoryService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl index 1049b19..d7fc9a9 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl @@ -20,7 +20,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 分类 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest index ca78da7..58383ea 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraCategoryServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraCategoryServiceImpl.class) public class InfraCategoryServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/js/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/js/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/js/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/js/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO index 6e02616..6385745 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生联系人 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_contact") @KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper index 6cf0bb4..d500150 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO new file mode 100644 index 0000000..a3faabb --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO @@ -0,0 +1,67 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生 DO + * + * @author 千通源码 + */ +@TableName("infra_student") +@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper new file mode 100644 index 0000000..4afe8bd --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper @@ -0,0 +1,30 @@ +package org.agt.module.infra.dal.mysql.demo; + +import java.util.*; + +import org.agt.framework.common.pojo.PageResult; +import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; +import org.agt.framework.mybatis.core.mapper.BaseMapperX; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.apache.ibatis.annotations.Mapper; +import org.agt.module.infra.controller.admin.demo.vo.*; + +/** + * 学生 Mapper + * + * @author 千通源码 + */ +@Mapper +public interface InfraStudentMapper extends BaseMapperX { + + default PageResult selectPage(InfraStudentPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) + .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) + .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) + .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) + .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(InfraStudentDO::getId)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService index 7625b32..f944459 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl index f1c510b..7397d2c 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest new file mode 100644 index 0000000..4c55c4e --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest @@ -0,0 +1,146 @@ +package org.agt.module.infra.service.demo; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import org.agt.framework.test.core.ut.BaseDbUnitTest; + +import org.agt.module.infra.controller.admin.demo.vo.*; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; +import org.agt.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static org.agt.module.infra.enums.ErrorCodeConstants.*; +import static org.agt.framework.test.core.util.AssertUtils.*; +import static org.agt.framework.test.core.util.RandomUtils.*; +import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; +import static org.agt.framework.common.util.object.ObjectUtils.*; +import static org.agt.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link InfraStudentServiceImpl} 的单元测试类 + * + * @author 千通源码 + */ +@Import(InfraStudentServiceImpl.class) +public class InfraStudentServiceImplTest extends BaseDbUnitTest { + + @Resource + private InfraStudentServiceImpl studentService; + + @Resource + private InfraStudentMapper studentMapper; + + @Test + public void testCreateStudent_success() { + // 准备参数 + InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); + + // 调用 + Long studentId = studentService.createStudent(createReqVO); + // 断言 + assertNotNull(studentId); + // 校验记录的属性是否正确 + InfraStudentDO student = studentMapper.selectById(studentId); + assertPojoEquals(createReqVO, student, "id"); + } + + @Test + public void testUpdateStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { + o.setId(dbStudent.getId()); // 设置更新的 ID + }); + + // 调用 + studentService.updateStudent(updateReqVO); + // 校验是否更新正确 + InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, student); + } + + @Test + public void testUpdateStudent_notExists() { + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); + } + + @Test + public void testDeleteStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbStudent.getId(); + + // 调用 + studentService.deleteStudent(id); + // 校验数据不存在了 + assertNull(studentMapper.selectById(id)); + } + + @Test + public void testDeleteStudent_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetStudentPage() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 + o.setName(null); + o.setBirthday(null); + o.setSex(null); + o.setEnabled(null); + o.setCreateTime(null); + }); + studentMapper.insert(dbStudent); + // 测试 name 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); + // 测试 birthday 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); + // 测试 sex 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); + // 测试 enabled 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); + // 测试 createTime 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); + // 准备参数 + InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); + reqVO.setName(null); + reqVO.setBirthday(null); + reqVO.setSex(null); + reqVO.setEnabled(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = studentService.getStudentPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbStudent, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO index 44194e6..3284dd4 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO @@ -10,7 +10,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 学生班主任 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_student_teacher") @KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper index 222ac3a..8923e8e 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/ts/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/ts/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/ts/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/ts/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO new file mode 100644 index 0000000..6385745 --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO @@ -0,0 +1,71 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生联系人 DO + * + * @author 千通源码 + */ +@TableName("infra_student_contact") +@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentContactDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 学生编号 + */ + private Long studentId; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper index 600502c..c289edb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO new file mode 100644 index 0000000..a3faabb --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO @@ -0,0 +1,67 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生 DO + * + * @author 千通源码 + */ +@TableName("infra_student") +@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper new file mode 100644 index 0000000..4afe8bd --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper @@ -0,0 +1,30 @@ +package org.agt.module.infra.dal.mysql.demo; + +import java.util.*; + +import org.agt.framework.common.pojo.PageResult; +import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; +import org.agt.framework.mybatis.core.mapper.BaseMapperX; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.apache.ibatis.annotations.Mapper; +import org.agt.module.infra.controller.admin.demo.vo.*; + +/** + * 学生 Mapper + * + * @author 千通源码 + */ +@Mapper +public interface InfraStudentMapper extends BaseMapperX { + + default PageResult selectPage(InfraStudentPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) + .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) + .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) + .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) + .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(InfraStudentDO::getId)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService index 7bcd1ba..ce5bcde 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl index 1a4f438..e76252b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest new file mode 100644 index 0000000..4c55c4e --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest @@ -0,0 +1,146 @@ +package org.agt.module.infra.service.demo; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import org.agt.framework.test.core.ut.BaseDbUnitTest; + +import org.agt.module.infra.controller.admin.demo.vo.*; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; +import org.agt.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static org.agt.module.infra.enums.ErrorCodeConstants.*; +import static org.agt.framework.test.core.util.AssertUtils.*; +import static org.agt.framework.test.core.util.RandomUtils.*; +import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; +import static org.agt.framework.common.util.object.ObjectUtils.*; +import static org.agt.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link InfraStudentServiceImpl} 的单元测试类 + * + * @author 千通源码 + */ +@Import(InfraStudentServiceImpl.class) +public class InfraStudentServiceImplTest extends BaseDbUnitTest { + + @Resource + private InfraStudentServiceImpl studentService; + + @Resource + private InfraStudentMapper studentMapper; + + @Test + public void testCreateStudent_success() { + // 准备参数 + InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); + + // 调用 + Long studentId = studentService.createStudent(createReqVO); + // 断言 + assertNotNull(studentId); + // 校验记录的属性是否正确 + InfraStudentDO student = studentMapper.selectById(studentId); + assertPojoEquals(createReqVO, student, "id"); + } + + @Test + public void testUpdateStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { + o.setId(dbStudent.getId()); // 设置更新的 ID + }); + + // 调用 + studentService.updateStudent(updateReqVO); + // 校验是否更新正确 + InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, student); + } + + @Test + public void testUpdateStudent_notExists() { + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); + } + + @Test + public void testDeleteStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbStudent.getId(); + + // 调用 + studentService.deleteStudent(id); + // 校验数据不存在了 + assertNull(studentMapper.selectById(id)); + } + + @Test + public void testDeleteStudent_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetStudentPage() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 + o.setName(null); + o.setBirthday(null); + o.setSex(null); + o.setEnabled(null); + o.setCreateTime(null); + }); + studentMapper.insert(dbStudent); + // 测试 name 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); + // 测试 birthday 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); + // 测试 sex 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); + // 测试 enabled 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); + // 测试 createTime 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); + // 准备参数 + InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); + reqVO.setName(null); + reqVO.setBirthday(null); + reqVO.setSex(null); + reqVO.setEnabled(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = studentService.getStudentPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbStudent, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO new file mode 100644 index 0000000..3284dd4 --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO @@ -0,0 +1,71 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生班主任 DO + * + * @author 千通源码 + */ +@TableName("infra_student_teacher") +@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentTeacherDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 学生编号 + */ + private Long studentId; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper index e7a73bd..057cfad 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/ts/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/ts/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/ts/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/ts/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO new file mode 100644 index 0000000..6385745 --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO @@ -0,0 +1,71 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生联系人 DO + * + * @author 千通源码 + */ +@TableName("infra_student_contact") +@KeySequence("infra_student_contact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentContactDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 学生编号 + */ + private Long studentId; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper index 600502c..c289edb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生联系人 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentContactMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO new file mode 100644 index 0000000..a3faabb --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO @@ -0,0 +1,67 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生 DO + * + * @author 千通源码 + */ +@TableName("infra_student") +@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper new file mode 100644 index 0000000..4afe8bd --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper @@ -0,0 +1,30 @@ +package org.agt.module.infra.dal.mysql.demo; + +import java.util.*; + +import org.agt.framework.common.pojo.PageResult; +import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; +import org.agt.framework.mybatis.core.mapper.BaseMapperX; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.apache.ibatis.annotations.Mapper; +import org.agt.module.infra.controller.admin.demo.vo.*; + +/** + * 学生 Mapper + * + * @author 千通源码 + */ +@Mapper +public interface InfraStudentMapper extends BaseMapperX { + + default PageResult selectPage(InfraStudentPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) + .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) + .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) + .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) + .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(InfraStudentDO::getId)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService index 7bcd1ba..ce5bcde 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService @@ -12,7 +12,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl index 1a4f438..e76252b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl @@ -24,7 +24,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest new file mode 100644 index 0000000..4c55c4e --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest @@ -0,0 +1,146 @@ +package org.agt.module.infra.service.demo; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import org.agt.framework.test.core.ut.BaseDbUnitTest; + +import org.agt.module.infra.controller.admin.demo.vo.*; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; +import org.agt.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static org.agt.module.infra.enums.ErrorCodeConstants.*; +import static org.agt.framework.test.core.util.AssertUtils.*; +import static org.agt.framework.test.core.util.RandomUtils.*; +import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; +import static org.agt.framework.common.util.object.ObjectUtils.*; +import static org.agt.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link InfraStudentServiceImpl} 的单元测试类 + * + * @author 千通源码 + */ +@Import(InfraStudentServiceImpl.class) +public class InfraStudentServiceImplTest extends BaseDbUnitTest { + + @Resource + private InfraStudentServiceImpl studentService; + + @Resource + private InfraStudentMapper studentMapper; + + @Test + public void testCreateStudent_success() { + // 准备参数 + InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); + + // 调用 + Long studentId = studentService.createStudent(createReqVO); + // 断言 + assertNotNull(studentId); + // 校验记录的属性是否正确 + InfraStudentDO student = studentMapper.selectById(studentId); + assertPojoEquals(createReqVO, student, "id"); + } + + @Test + public void testUpdateStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { + o.setId(dbStudent.getId()); // 设置更新的 ID + }); + + // 调用 + studentService.updateStudent(updateReqVO); + // 校验是否更新正确 + InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, student); + } + + @Test + public void testUpdateStudent_notExists() { + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); + } + + @Test + public void testDeleteStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbStudent.getId(); + + // 调用 + studentService.deleteStudent(id); + // 校验数据不存在了 + assertNull(studentMapper.selectById(id)); + } + + @Test + public void testDeleteStudent_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetStudentPage() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 + o.setName(null); + o.setBirthday(null); + o.setSex(null); + o.setEnabled(null); + o.setCreateTime(null); + }); + studentMapper.insert(dbStudent); + // 测试 name 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); + // 测试 birthday 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); + // 测试 sex 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); + // 测试 enabled 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); + // 测试 createTime 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); + // 准备参数 + InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); + reqVO.setName(null); + reqVO.setBirthday(null); + reqVO.setSex(null); + reqVO.setEnabled(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = studentService.getStudentPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbStudent, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO new file mode 100644 index 0000000..3284dd4 --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO @@ -0,0 +1,71 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生班主任 DO + * + * @author 千通源码 + */ +@TableName("infra_student_teacher") +@KeySequence("infra_student_teacher_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentTeacherDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 学生编号 + */ + private Long studentId; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper index e7a73bd..057cfad 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 学生班主任 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraStudentTeacherMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/ts/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/ts/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/ts/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/ts/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO new file mode 100644 index 0000000..a3faabb --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO @@ -0,0 +1,67 @@ +package org.agt.module.infra.dal.dataobject.demo; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import org.agt.framework.mybatis.core.dataobject.BaseDO; + +/** + * 学生 DO + * + * @author 千通源码 + */ +@TableName("infra_student") +@KeySequence("infra_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InfraStudentDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 名字 + */ + private String name; + /** + * 简介 + */ + private String description; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} + */ + private Integer sex; + /** + * 是否有效 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean enabled; + /** + * 头像 + */ + private String avatar; + /** + * 附件 + */ + private String video; + /** + * 备注 + */ + private String memo; + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper new file mode 100644 index 0000000..4afe8bd --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper @@ -0,0 +1,30 @@ +package org.agt.module.infra.dal.mysql.demo; + +import java.util.*; + +import org.agt.framework.common.pojo.PageResult; +import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; +import org.agt.framework.mybatis.core.mapper.BaseMapperX; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.apache.ibatis.annotations.Mapper; +import org.agt.module.infra.controller.admin.demo.vo.*; + +/** + * 学生 Mapper + * + * @author 千通源码 + */ +@Mapper +public interface InfraStudentMapper extends BaseMapperX { + + default PageResult selectPage(InfraStudentPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(InfraStudentDO::getName, reqVO.getName()) + .eqIfPresent(InfraStudentDO::getBirthday, reqVO.getBirthday()) + .eqIfPresent(InfraStudentDO::getSex, reqVO.getSex()) + .eqIfPresent(InfraStudentDO::getEnabled, reqVO.getEnabled()) + .betweenIfPresent(InfraStudentDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(InfraStudentDO::getId)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService index 3e72aa9..232401b 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService @@ -10,7 +10,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 学生 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraStudentService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl similarity index 98% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl index 215961a..733dfef 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl @@ -20,7 +20,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest new file mode 100644 index 0000000..4c55c4e --- /dev/null +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest @@ -0,0 +1,146 @@ +package org.agt.module.infra.service.demo; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import org.agt.framework.test.core.ut.BaseDbUnitTest; + +import org.agt.module.infra.controller.admin.demo.vo.*; +import org.agt.module.infra.dal.dataobject.demo.InfraStudentDO; +import org.agt.module.infra.dal.mysql.demo.InfraStudentMapper; +import org.agt.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static org.agt.module.infra.enums.ErrorCodeConstants.*; +import static org.agt.framework.test.core.util.AssertUtils.*; +import static org.agt.framework.test.core.util.RandomUtils.*; +import static org.agt.framework.common.util.date.LocalDateTimeUtils.*; +import static org.agt.framework.common.util.object.ObjectUtils.*; +import static org.agt.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link InfraStudentServiceImpl} 的单元测试类 + * + * @author 千通源码 + */ +@Import(InfraStudentServiceImpl.class) +public class InfraStudentServiceImplTest extends BaseDbUnitTest { + + @Resource + private InfraStudentServiceImpl studentService; + + @Resource + private InfraStudentMapper studentMapper; + + @Test + public void testCreateStudent_success() { + // 准备参数 + InfraStudentSaveReqVO createReqVO = randomPojo(InfraStudentSaveReqVO.class).setId(null); + + // 调用 + Long studentId = studentService.createStudent(createReqVO); + // 断言 + assertNotNull(studentId); + // 校验记录的属性是否正确 + InfraStudentDO student = studentMapper.selectById(studentId); + assertPojoEquals(createReqVO, student, "id"); + } + + @Test + public void testUpdateStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class, o -> { + o.setId(dbStudent.getId()); // 设置更新的 ID + }); + + // 调用 + studentService.updateStudent(updateReqVO); + // 校验是否更新正确 + InfraStudentDO student = studentMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, student); + } + + @Test + public void testUpdateStudent_notExists() { + // 准备参数 + InfraStudentSaveReqVO updateReqVO = randomPojo(InfraStudentSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.updateStudent(updateReqVO), STUDENT_NOT_EXISTS); + } + + @Test + public void testDeleteStudent_success() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class); + studentMapper.insert(dbStudent);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbStudent.getId(); + + // 调用 + studentService.deleteStudent(id); + // 校验数据不存在了 + assertNull(studentMapper.selectById(id)); + } + + @Test + public void testDeleteStudent_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> studentService.deleteStudent(id), STUDENT_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetStudentPage() { + // mock 数据 + InfraStudentDO dbStudent = randomPojo(InfraStudentDO.class, o -> { // 等会查询到 + o.setName(null); + o.setBirthday(null); + o.setSex(null); + o.setEnabled(null); + o.setCreateTime(null); + }); + studentMapper.insert(dbStudent); + // 测试 name 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setName(null))); + // 测试 birthday 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setBirthday(null))); + // 测试 sex 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setSex(null))); + // 测试 enabled 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setEnabled(null))); + // 测试 createTime 不匹配 + studentMapper.insert(cloneIgnoreId(dbStudent, o -> o.setCreateTime(null))); + // 准备参数 + InfraStudentPageReqVO reqVO = new InfraStudentPageReqVO(); + reqVO.setName(null); + reqVO.setBirthday(null); + reqVO.setSex(null); + reqVO.setEnabled(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = studentService.getStudentPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbStudent, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/ts/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/ts/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/ts/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/ts/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/assert.json b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/assert.json similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/assert.json rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/assert.json diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO index 75e2eb8..d36671a 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO @@ -8,7 +8,7 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; /** * 分类 DO * - * @author sys + * @author 千通源码 */ @TableName("infra_category") @KeySequence("infra_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper index 9d548ef..ce0c2bb 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper @@ -12,7 +12,7 @@ import org.agt.module.infra.controller.admin.demo.vo.*; /** * 分类 Mapper * - * @author sys + * @author 千通源码 */ @Mapper public interface InfraCategoryMapper extends BaseMapperX { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService similarity index 97% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService index bfb05a2..f6c1baf 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService @@ -10,7 +10,7 @@ import org.agt.framework.common.pojo.PageParam; /** * 分类 Service 接口 * - * @author sys + * @author 千通源码 */ public interface InfraCategoryService { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl index 1049b19..d7fc9a9 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl @@ -20,7 +20,7 @@ import static org.agt.module.infra.enums.ErrorCodeConstants.*; /** * 分类 Service 实现类 * - * @author sys + * @author 千通源码 */ @Service @Validated diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest similarity index 99% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest index ca78da7..58383ea 100644 --- a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest +++ b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest @@ -31,7 +31,7 @@ import static org.mockito.Mockito.*; /** * {@link InfraCategoryServiceImpl} 的单元测试类 * - * @author sys + * @author 千通源码 */ @Import(InfraCategoryServiceImpl.class) public class InfraCategoryServiceImplTest extends BaseDbUnitTest { diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/h2 b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/sql/h2 similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/h2 rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/sql/h2 diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/sql b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/sql/sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/sql/sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/ts/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/ts/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/ts/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/ts/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/index b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/vue/index similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/index rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/vue/index diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper b/agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper rename to agt-module-infra/agt-module-infra-server/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/logback.xml b/agt-module-infra/agt-module-infra-server/src/test/resources/logback.xml similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/logback.xml rename to agt-module-infra/agt-module-infra-server/src/test/resources/logback.xml diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/sql/clean.sql b/agt-module-infra/agt-module-infra-server/src/test/resources/sql/clean.sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/sql/clean.sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/sql/clean.sql diff --git a/agt-module-infra/agt-module-infra-biz/src/test/resources/sql/create_tables.sql b/agt-module-infra/agt-module-infra-server/src/test/resources/sql/create_tables.sql similarity index 100% rename from agt-module-infra/agt-module-infra-biz/src/test/resources/sql/create_tables.sql rename to agt-module-infra/agt-module-infra-server/src/test/resources/sql/create_tables.sql diff --git a/agt-module-infra/pom.xml b/agt-module-infra/pom.xml index 6b4e8ff..508feb1 100644 --- a/agt-module-infra/pom.xml +++ b/agt-module-infra/pom.xml @@ -10,7 +10,7 @@ 4.0.0 agt-module-infra-api - agt-module-infra-biz + agt-module-infra-server agt-module-infra pom diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/DictDataApi.java b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/DictDataApi.java index cd71522..b20c16d 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/DictDataApi.java +++ b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/dict/DictDataApi.java @@ -1,26 +1,21 @@ package org.agt.module.system.api.dict; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.StrUtil; +import org.agt.framework.common.biz.system.dict.DictDataCommonApi; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Operation; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.system.api.dict.dto.DictDataRespDTO; import org.agt.module.system.enums.ApiConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.Collection; -import java.util.List; - -import static org.agt.framework.common.util.collection.CollectionUtils.convertList; @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - 字典数据") -public interface DictDataApi { +public interface DictDataApi extends DictDataCommonApi { String PREFIX = ApiConstants.PREFIX + "/dict-data"; @@ -33,53 +28,4 @@ public interface DictDataApi { CommonResult validateDictDataList(@RequestParam("dictType") String dictType, @RequestParam("values") Collection values); - @GetMapping(PREFIX + "/get") - @Operation(summary = "获得指定的字典数据") - @Parameters({ - @Parameter(name = "dictType", description = "字典类型", example = "SEX", required = true), - @Parameter(name = "description", description = "字典数据值", example = "1", required = true) - }) - CommonResult getDictData(@RequestParam("dictType") String dictType, - @RequestParam("value") String value); - - /** - * 获得指定的字典标签，从缓存中 - * - * @param type 字典类型 - * @param value 字典数据值 - * @return 字典标签 - */ - default String getDictDataLabel(String type, Integer value) { - DictDataRespDTO dictData = getDictData(type, String.valueOf(value)).getData(); - if (ObjUtil.isNull(dictData)) { - return StrUtil.EMPTY; - } - return dictData.getLabel(); - } - - @GetMapping(PREFIX + "/parse") - @Operation(summary = "解析获得指定的字典数据") - @Parameters({ - @Parameter(name = "dictType", description = "字典类型", example = "SEX", required = true), - @Parameter(name = "label", description = "字典标签", example = "男", required = true) - }) - CommonResult parseDictData(@RequestParam("dictType") String dictType, - @RequestParam("label") String label); - - @GetMapping(PREFIX + "/list") - @Operation(summary = "获得指定字典类型的字典数据列表") - @Parameter(name = "dictType", description = "字典类型", example = "SEX", required = true) - CommonResult> getDictDataList(@RequestParam("dictType") String dictType); - - /** - * 获得字典数据标签列表 - * - * @param dictType 字典类型 - * @return 字典数据标签列表 - */ - default List getDictDataLabelList(String dictType) { - List list = getDictDataList(dictType).getData(); - return convertList(list, DictDataRespDTO::getLabel); - } - } diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/OperateLogApi.java b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/OperateLogApi.java index 689c69d..8526edf 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/OperateLogApi.java +++ b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/logger/OperateLogApi.java @@ -1,41 +1,23 @@ package org.agt.module.system.api.logger; +import org.agt.framework.common.biz.system.logger.OperateLogCommonApi; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.pojo.PageResult; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; import org.agt.module.system.api.logger.dto.OperateLogPageReqDTO; import org.agt.module.system.api.logger.dto.OperateLogRespDTO; import org.agt.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - 操作日志") -public interface OperateLogApi { +public interface OperateLogApi extends OperateLogCommonApi { String PREFIX = ApiConstants.PREFIX + "/operate-log"; - @PostMapping(PREFIX + "/create") - @Operation(summary = "创建操作日志") - CommonResult createOperateLog(@Valid @RequestBody OperateLogCreateReqDTO createReqDTO); - - /** - * 【异步】创建操作日志 - * - * @param createReqDTO 请求 - */ - @Async - default void createOperateLogAsync(OperateLogCreateReqDTO createReqDTO) { - createOperateLog(createReqDTO).checkError(); - } - @GetMapping(PREFIX + "/page") @Operation(summary = "获取指定模块的指定数据的操作日志分页") CommonResult> getOperateLogPage(@SpringQueryMap OperateLogPageReqDTO pageReqDTO); diff --git a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/PermissionApi.java b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/PermissionApi.java index c3c6304..f0d39a2 100644 --- a/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/PermissionApi.java +++ b/agt-module-system/agt-module-system-api/src/main/java/org/agt/module/system/api/permission/PermissionApi.java @@ -1,11 +1,10 @@ package org.agt.module.system.api.permission; +import org.agt.framework.common.biz.system.permission.PermissionCommonApi; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; import org.agt.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -16,7 +15,7 @@ import java.util.Set; @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = @Tag(name = "RPC 服务 - 权限") -public interface PermissionApi { +public interface PermissionApi extends PermissionCommonApi { String PREFIX = ApiConstants.PREFIX + "/permission"; @@ -25,27 +24,4 @@ public interface PermissionApi { @Parameter(name = "roleIds", description = "角色编号集合", example = "1,2", required = true) CommonResult> getUserRoleIdListByRoleIds(@RequestParam("roleIds") Collection roleIds); - @GetMapping(PREFIX + "/has-any-permissions") - @Operation(summary = "判断是否有权限，任一一个即可") - @Parameters({ - @Parameter(name = "userId", description = "用户编号", example = "1", required = true), - @Parameter(name = "permissions", description = "权限", example = "read,write", required = true) - }) - CommonResult hasAnyPermissions(@RequestParam("userId") Long userId, - @RequestParam("permissions") String... permissions); - - @GetMapping(PREFIX + "/has-any-roles") - @Operation(summary = "判断是否有角色，任一一个即可") - @Parameters({ - @Parameter(name = "userId", description = "用户编号", example = "1", required = true), - @Parameter(name = "roles", description = "角色数组", example = "2", required = true) - }) - CommonResult hasAnyRoles(@RequestParam("userId") Long userId, - @RequestParam("roles") String... roles); - - @GetMapping(PREFIX + "/get-dept-data-permission") - @Operation(summary = "获得登陆用户的部门数据权限") - @Parameter(name = "userId", description = "用户编号", example = "2", required = true) - CommonResult getDeptDataPermission(@RequestParam("userId") Long userId); - } \ No newline at end of file diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/social/SocialUserConvert.java b/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/social/SocialUserConvert.java deleted file mode 100644 index 72b27c4..0000000 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/social/SocialUserConvert.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.agt.module.system.convert.social; - -import org.agt.module.system.api.social.dto.SocialUserBindReqDTO; -import org.agt.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface SocialUserConvert { - - SocialUserConvert INSTANCE = Mappers.getMapper(SocialUserConvert.class); - - @Mapping(source = "reqVO.type", target = "socialType") - SocialUserBindReqDTO convert(Long userId, Integer userType, SocialUserBindReqVO reqVO); - -} diff --git a/agt-module-system/agt-module-system-biz/Dockerfile b/agt-module-system/agt-module-system-server/Dockerfile similarity index 83% rename from agt-module-system/agt-module-system-biz/Dockerfile rename to agt-module-system/agt-module-system-server/Dockerfile index ddf9fef..b9ab72a 100644 --- a/agt-module-system/agt-module-system-biz/Dockerfile +++ b/agt-module-system/agt-module-system-server/Dockerfile @@ -3,10 +3,10 @@ FROM eclipse-temurin:21-jre ## 创建目录，并使用它作为工作目录 -RUN mkdir -p /agt-module-system-biz -WORKDIR /agt-module-system-biz +RUN mkdir -p /agt-module-system-server +WORKDIR /agt-module-system-server ## 将后端项目的 Jar 文件，复制到镜像中 -COPY ./target/agt-module-system-biz.jar app.jar +COPY ./target/agt-module-system-server.jar app.jar ## 设置 TZ 时区 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 diff --git a/agt-module-system/agt-module-system-biz/pom.xml b/agt-module-system/agt-module-system-server/pom.xml similarity index 99% rename from agt-module-system/agt-module-system-biz/pom.xml rename to agt-module-system/agt-module-system-server/pom.xml index a000172..8811a29 100644 --- a/agt-module-system/agt-module-system-biz/pom.xml +++ b/agt-module-system/agt-module-system-server/pom.xml @@ -8,7 +8,7 @@ ${revision} 4.0.0 - agt-module-system-biz + agt-module-system-server jar ${project.artifactId} diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/AgtSystemApplication.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/AgtSystemApplication.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/AgtSystemApplication.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/AgtSystemApplication.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dept/DeptApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dept/DeptApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dept/DeptApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dept/DeptApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dept/PostApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dept/PostApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dept/PostApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dept/PostApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java similarity index 67% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java index 97acb69..68f471b 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/dict/DictDataApiImpl.java @@ -2,9 +2,10 @@ package org.agt.module.system.api.dict; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.util.object.BeanUtils; -import org.agt.module.system.api.dict.dto.DictDataRespDTO; +import org.agt.framework.common.biz.system.dict.dto.DictDataRespDTO; import org.agt.module.system.dal.dataobject.dict.DictDataDO; import org.agt.module.system.service.dict.DictDataService; +import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Primary // 由于 DictDataCommonApi 的存在，必须声明为 @Primary Bean public class DictDataApiImpl implements DictDataApi { @Resource @@ -27,18 +29,6 @@ public class DictDataApiImpl implements DictDataApi { return success(true); } - @Override - public CommonResult getDictData(String dictType, String value) { - DictDataDO dictData = dictDataService.getDictData(dictType, value); - return success(BeanUtils.toBean(dictData, DictDataRespDTO.class)); - } - - @Override - public CommonResult parseDictData(String dictType, String label) { - DictDataDO dictData = dictDataService.parseDictData(dictType, label); - return success(BeanUtils.toBean(dictData, DictDataRespDTO.class)); - } - @Override public CommonResult> getDictDataList(String dictType) { List list = dictDataService.getDictDataListByDictType(dictType); diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/logger/LoginLogApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/logger/LoginLogApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/logger/LoginLogApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/logger/LoginLogApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java similarity index 86% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java index 6cd7e36..7c79882 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/logger/OperateLogApiImpl.java @@ -3,12 +3,13 @@ package org.agt.module.system.api.logger; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; import org.agt.module.system.api.logger.dto.OperateLogPageReqDTO; import org.agt.module.system.api.logger.dto.OperateLogRespDTO; import org.agt.module.system.dal.dataobject.logger.OperateLogDO; import org.agt.module.system.service.logger.OperateLogService; import jakarta.annotation.Resource; +import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Primary // 由于 OperateLogCommonApi 的存在，必须声明为 @Primary Bean public class OperateLogApiImpl implements OperateLogApi { @Resource diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/mail/MailSendApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/mail/MailSendApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/mail/MailSendApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/mail/MailSendApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/notify/NotifyMessageSendApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/notify/NotifyMessageSendApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/notify/NotifyMessageSendApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/notify/NotifyMessageSendApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java similarity index 84% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java index cbe5f8d..0554aad 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/oauth2/OAuth2TokenApiImpl.java @@ -1,11 +1,12 @@ package org.agt.module.system.api.oauth2; +import org.agt.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.tenant.core.aop.TenantIgnore; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; -import org.agt.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCreateReqDTO; +import org.agt.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO; import org.agt.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import org.agt.module.system.service.oauth2.OAuth2TokenService; import jakarta.annotation.Resource; @@ -16,7 +17,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated -public class OAuth2TokenApiImpl implements OAuth2TokenApi { +public class OAuth2TokenApiImpl implements OAuth2TokenCommonApi { @Resource private OAuth2TokenService oauth2TokenService; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java similarity index 86% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java index 1630096..33cea12 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/permission/PermissionApiImpl.java @@ -1,8 +1,9 @@ package org.agt.module.system.api.permission; import org.agt.framework.common.pojo.CommonResult; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import org.agt.module.system.service.permission.PermissionService; +import org.springframework.context.annotation.Primary; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -14,6 +15,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated +@Primary // 由于 PermissionCommonApi 的存在，必须声明为 @Primary Bean public class PermissionApiImpl implements PermissionApi { @Resource diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/permission/RoleApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/permission/RoleApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/permission/RoleApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/permission/RoleApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/sms/SmsCodeApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/sms/SmsCodeApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/sms/SmsCodeApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/sms/SmsCodeApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/sms/SmsSendApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/sms/SmsSendApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/sms/SmsSendApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/sms/SmsSendApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/social/SocialClientApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/social/SocialClientApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/social/SocialClientApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/social/SocialClientApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/social/SocialUserApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/social/SocialUserApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/social/SocialUserApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/social/SocialUserApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java similarity index 89% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java index 1fe7e74..920e9cc 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/tenant/TenantApiImpl.java @@ -1,10 +1,10 @@ package org.agt.module.system.api.tenant; +import org.agt.framework.common.biz.system.tenant.TenantCommonApi; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.tenant.core.aop.TenantIgnore; import org.agt.module.system.service.tenant.TenantService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import jakarta.annotation.Resource; @@ -14,7 +14,7 @@ import static org.agt.framework.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated -public class TenantApiImpl implements TenantApi { +public class TenantApiImpl implements TenantCommonApi { @Resource private TenantService tenantService; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/user/AdminUserApiImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/user/AdminUserApiImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/api/user/AdminUserApiImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/api/user/AdminUserApiImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/AuthController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthLoginRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthMenuRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthMenuRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthMenuRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthMenuRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/captcha/CaptchaController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/captcha/CaptchaController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/captcha/CaptchaController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/captcha/CaptchaController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/DeptController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/DeptController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/DeptController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/DeptController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/PostController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/PostController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/PostController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/PostController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictDataController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictTypeController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictTypeController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/DictTypeController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/DictTypeController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/AreaController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/vo/AreaNodeRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/vo/AreaNodeRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/ip/vo/AreaNodeRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/ip/vo/AreaNodeRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/LoginLogController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/LoginLogController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/LoginLogController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/LoginLogController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/OperateLogController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailAccountController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailAccountController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailAccountController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailAccountController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailLogController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailLogController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailLogController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailLogController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/MailTemplateController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/log/MailLogRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/NoticeController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/NoticeController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/NoticeController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/NoticeController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/NotifyMessageController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/NotifyMessageController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/NotifyMessageController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/NotifyMessageController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/NotifyTemplateController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/NotifyTemplateController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/NotifyTemplateController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/NotifyTemplateController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2ClientController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2TokenController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2TokenController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2TokenController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2TokenController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/OAuth2UserController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/MenuController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/PermissionController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/PermissionController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/PermissionController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/PermissionController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/RoleController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RolePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RolePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RolePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsCallbackController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsCallbackController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsCallbackController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsCallbackController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsChannelController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsChannelController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsChannelController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsChannelController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsLogController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsLogController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsLogController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsLogController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/SmsTemplateController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialClientController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java similarity index 93% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java index ca4c3b7..68bd00b 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/SocialUserController.java @@ -4,11 +4,11 @@ import org.agt.framework.common.enums.UserTypeEnum; import org.agt.framework.common.pojo.CommonResult; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; +import org.agt.module.system.api.social.dto.SocialUserBindReqDTO; import org.agt.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO; import org.agt.module.system.controller.admin.socail.vo.user.SocialUserPageReqVO; import org.agt.module.system.controller.admin.socail.vo.user.SocialUserRespVO; import org.agt.module.system.controller.admin.socail.vo.user.SocialUserUnbindReqVO; -import org.agt.module.system.convert.social.SocialUserConvert; import org.agt.module.system.dal.dataobject.social.SocialUserDO; import org.agt.module.system.service.social.SocialUserService; import io.swagger.v3.oas.annotations.Operation; @@ -38,8 +38,8 @@ public class SocialUserController { @PostMapping("/bind") @Operation(summary = "社交绑定，使用 code 授权码") public CommonResult socialBind(@RequestBody @Valid SocialUserBindReqVO reqVO) { - socialUserService.bindSocialUser(SocialUserConvert.INSTANCE.convert( - getLoginUserId(), UserTypeEnum.ADMIN.getValue(), reqVO)); + socialUserService.bindSocialUser(BeanUtils.toBean(reqVO, SocialUserBindReqDTO.class) + .setUserId(getLoginUserId()).setUserType(UserTypeEnum.ADMIN.getValue())); return CommonResult.success(true); } diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantPackageController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantPackageController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/TenantPackageController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/TenantPackageController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.http b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.http similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.http rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.http diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/UserProfileController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportExcelVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportExcelVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportExcelVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserImportRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserPageReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserPageReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserPageReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSaveReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSaveReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSaveReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/dict/AppDictDataController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/dict/AppDictDataController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/dict/AppDictDataController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/dict/AppDictDataController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/dict/vo/AppDictDataRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/dict/vo/AppDictDataRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/dict/vo/AppDictDataRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/dict/vo/AppDictDataRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/ip/AppAreaController.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/ip/AppAreaController.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/ip/AppAreaController.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/ip/AppAreaController.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/ip/vo/AppAreaNodeRespVO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/ip/vo/AppAreaNodeRespVO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/ip/vo/AppAreaNodeRespVO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/ip/vo/AppAreaNodeRespVO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/app/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/app/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/controller/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/controller/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/auth/AuthConvert.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/auth/AuthConvert.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/auth/AuthConvert.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/auth/AuthConvert.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/oauth2/OAuth2OpenConvert.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/oauth2/OAuth2OpenConvert.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/oauth2/OAuth2OpenConvert.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/oauth2/OAuth2OpenConvert.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/tenant/TenantConvert.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/tenant/TenantConvert.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/tenant/TenantConvert.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/tenant/TenantConvert.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/user/UserConvert.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/user/UserConvert.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/user/UserConvert.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/user/UserConvert.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/DeptDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/DeptDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/DeptDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/DeptDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/PostDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/PostDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/PostDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/PostDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/UserPostDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/UserPostDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dept/UserPostDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dept/UserPostDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dict/DictDataDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dict/DictDataDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dict/DictDataDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dict/DictDataDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dict/DictTypeDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dict/DictTypeDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/dict/DictTypeDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/dict/DictTypeDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/logger/LoginLogDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/logger/LoginLogDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/logger/LoginLogDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/logger/LoginLogDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/logger/OperateLogDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/logger/OperateLogDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/logger/OperateLogDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/logger/OperateLogDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailAccountDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailAccountDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailAccountDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailAccountDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailLogDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailLogDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailLogDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailLogDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailTemplateDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailTemplateDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/mail/MailTemplateDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/mail/MailTemplateDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notice/NoticeDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notice/NoticeDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notice/NoticeDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notice/NoticeDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyMessageDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyMessageDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyMessageDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyMessageDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyTemplateDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyTemplateDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/notify/NotifyTemplateDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/MenuDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/MenuDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/MenuDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/MenuDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleMenuDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleMenuDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleMenuDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/RoleMenuDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/UserRoleDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/UserRoleDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/permission/UserRoleDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/permission/UserRoleDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsChannelDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsChannelDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsChannelDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsChannelDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsCodeDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsCodeDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsCodeDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsCodeDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsLogDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsLogDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsLogDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsLogDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsTemplateDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsTemplateDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsTemplateDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/sms/SmsTemplateDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialClientDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialClientDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialClientDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialClientDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserBindDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserBindDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserBindDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserBindDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/social/SocialUserDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantPackageDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantPackageDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantPackageDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/tenant/TenantPackageDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/user/AdminUserDO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/user/AdminUserDO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/dataobject/user/AdminUserDO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/dataobject/user/AdminUserDO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/DeptMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/DeptMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/DeptMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/DeptMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/PostMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/PostMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/PostMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/PostMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/UserPostMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/UserPostMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dept/UserPostMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dept/UserPostMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dict/DictDataMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dict/DictDataMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dict/DictDataMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dict/DictDataMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dict/DictTypeMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dict/DictTypeMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/dict/DictTypeMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/dict/DictTypeMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/logger/LoginLogMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/logger/LoginLogMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/logger/LoginLogMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/logger/LoginLogMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/logger/OperateLogMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/logger/OperateLogMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/logger/OperateLogMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/logger/OperateLogMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailAccountMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailAccountMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailAccountMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailAccountMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailLogMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailLogMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailLogMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailLogMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailTemplateMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailTemplateMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/mail/MailTemplateMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/mail/MailTemplateMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notice/NoticeMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notice/NoticeMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notice/NoticeMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notice/NoticeMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyMessageMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyMessageMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyMessageMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyMessageMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyTemplateMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyTemplateMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyTemplateMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/notify/NotifyTemplateMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/MenuMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/MenuMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/MenuMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/MenuMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMenuMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMenuMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMenuMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMenuMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/UserRoleMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/UserRoleMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/permission/UserRoleMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/UserRoleMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsChannelMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsChannelMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsChannelMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsChannelMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsCodeMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsCodeMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsCodeMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsCodeMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsLogMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsLogMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsLogMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsLogMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsTemplateMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsTemplateMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/sms/SmsTemplateMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/sms/SmsTemplateMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialClientMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialClientMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialClientMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialClientMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserBindMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserBindMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserBindMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserBindMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/social/SocialUserMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantPackageMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantPackageMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantPackageMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/tenant/TenantPackageMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/user/AdminUserMapper.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/redis/RedisKeyConstants.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/redis/RedisKeyConstants.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/redis/RedisKeyConstants.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/redis/RedisKeyConstants.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/config/AgtCaptchaConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/config/AgtCaptchaConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/config/AgtCaptchaConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/config/AgtCaptchaConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/captcha/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/captcha/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/datapermission/config/DataPermissionConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/datapermission/config/DataPermissionConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/datapermission/config/DataPermissionConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/datapermission/config/DataPermissionConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/datapermission/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/datapermission/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/datapermission/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/datapermission/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/config/AgtJustAuthConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/config/AgtJustAuthConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/config/AgtJustAuthConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/config/AgtJustAuthConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/core/AuthRequestFactory.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/core/AuthRequestFactory.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/core/AuthRequestFactory.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/core/AuthRequestFactory.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/justauth/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/justauth/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/AdminUserParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/AdminUserParseFunction.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/AdminUserParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/AdminUserParseFunction.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/AreaParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/AreaParseFunction.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/AreaParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/AreaParseFunction.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java similarity index 89% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java index 8e6edb8..b49b2b5 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/BooleanParseFunction.java @@ -33,7 +33,7 @@ public class BooleanParseFunction implements IParseFunction { if (StrUtil.isEmptyIfStr(value)) { return ""; } - return DictFrameworkUtils.getDictDataLabel(DictTypeConstants.BOOLEAN_STRING, value.toString()); + return DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.BOOLEAN_STRING, value.toString()); } } diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/DeptParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/DeptParseFunction.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/DeptParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/DeptParseFunction.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/PostParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/PostParseFunction.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/PostParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/PostParseFunction.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java similarity index 89% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java index 830650d..a4e4cfa 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/core/SexParseFunction.java @@ -33,7 +33,7 @@ public class SexParseFunction implements IParseFunction { if (StrUtil.isEmptyIfStr(value)) { return ""; } - return DictFrameworkUtils.getDictDataLabel(DictTypeConstants.USER_SEX, value.toString()); + return DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.USER_SEX, value.toString()); } } diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/operatelog/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/operatelog/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/rpc/config/RpcConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/rpc/config/RpcConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/rpc/config/RpcConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/rpc/config/RpcConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/rpc/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/rpc/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/rpc/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/rpc/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/security/config/SecurityConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/security/config/SecurityConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/security/config/SecurityConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/security/config/SecurityConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/security/core/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/security/core/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/security/core/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/security/core/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/config/SmsCodeProperties.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/config/SmsCodeProperties.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/config/SmsCodeProperties.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/config/SmsCodeProperties.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/config/SmsConfiguration.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/config/SmsConfiguration.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/config/SmsConfiguration.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/config/SmsConfiguration.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClientFactory.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClientFactory.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClientFactory.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/SmsClientFactory.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsSendRespDTO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AbstractSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AbstractSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AbstractSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClient.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClient.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClient.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClient.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsChannelEnum.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsChannelEnum.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsChannelEnum.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsChannelEnum.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/property/SmsChannelProperties.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/property/SmsChannelProperties.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/framework/sms/core/property/SmsChannelProperties.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/framework/sms/core/property/SmsChannelProperties.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/job/demo/DemoJob.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/job/demo/DemoJob.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/job/demo/DemoJob.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/job/demo/DemoJob.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/job/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/job/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/job/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/job/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/consumer/mail/MailSendConsumer.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/consumer/mail/MailSendConsumer.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/consumer/mail/MailSendConsumer.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/consumer/mail/MailSendConsumer.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/consumer/sms/SmsSendConsumer.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/consumer/sms/SmsSendConsumer.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/consumer/sms/SmsSendConsumer.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/consumer/sms/SmsSendConsumer.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/message/mail/MailSendMessage.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/message/mail/MailSendMessage.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/message/mail/MailSendMessage.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/message/mail/MailSendMessage.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/message/sms/SmsSendMessage.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/message/sms/SmsSendMessage.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/message/sms/SmsSendMessage.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/message/sms/SmsSendMessage.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/producer/mail/MailProducer.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/producer/mail/MailProducer.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/producer/mail/MailProducer.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/producer/mail/MailProducer.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/producer/sms/SmsProducer.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/producer/sms/SmsProducer.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/mq/producer/sms/SmsProducer.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/mq/producer/sms/SmsProducer.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/auth/AdminAuthService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/auth/AdminAuthService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/DeptService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/DeptService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/DeptService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/DeptService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/DeptServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/DeptServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/DeptServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/DeptServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/PostService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/PostService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/PostService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/PostService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/PostServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/PostServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dept/PostServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dept/PostServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictDataService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictDataService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictDataService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictDataService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictDataServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictDataServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictDataServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictDataServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictTypeService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictTypeService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictTypeService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictTypeService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictTypeServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictTypeServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/dict/DictTypeServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/dict/DictTypeServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/LoginLogService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/LoginLogService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/LoginLogService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/LoginLogService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/LoginLogServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/LoginLogServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/LoginLogServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/LoginLogServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogService.java similarity index 92% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogService.java index 3435ef7..f3a4910 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogService.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogService.java @@ -1,7 +1,7 @@ package org.agt.module.system.service.logger; import org.agt.framework.common.pojo.PageResult; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; import org.agt.module.system.api.logger.dto.OperateLogPageReqDTO; import org.agt.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; import org.agt.module.system.dal.dataobject.logger.OperateLogDO; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java similarity index 94% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java index 4d1e90b..1295520 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/logger/OperateLogServiceImpl.java @@ -2,7 +2,7 @@ package org.agt.module.system.service.logger; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; import org.agt.module.system.api.logger.dto.OperateLogPageReqDTO; import org.agt.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; import org.agt.module.system.dal.dataobject.logger.OperateLogDO; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailAccountService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailAccountService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailAccountService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailAccountService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailAccountServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailAccountServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailAccountServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailAccountServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailLogService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailLogService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailLogService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailLogService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailLogServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailLogServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailLogServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailLogServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailSendService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailSendService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailSendService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailSendService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailSendServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailSendServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailSendServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailSendServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailTemplateService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailTemplateService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailTemplateService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailTemplateService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailTemplateServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailTemplateServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/mail/MailTemplateServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/mail/MailTemplateServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/MemberService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/MemberService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/MemberService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/MemberService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/MemberServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/MemberServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/MemberServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/MemberServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/member/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/member/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notice/NoticeService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notice/NoticeService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notice/NoticeService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notice/NoticeService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notice/NoticeServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notice/NoticeServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notice/NoticeServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notice/NoticeServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyMessageService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyMessageService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyMessageService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyMessageService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyMessageServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyMessageServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyMessageServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyMessageServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifySendService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifySendService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifySendService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifySendService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifySendServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifySendServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifySendServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifySendServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyTemplateService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyTemplateService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyTemplateService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyTemplateService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyTemplateServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyTemplateServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/notify/NotifyTemplateServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/notify/NotifyTemplateServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/MenuService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/MenuService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/MenuService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/MenuService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/MenuServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/MenuServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/MenuServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/MenuServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionService.java similarity index 97% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionService.java index dcf5048..dbc89ae 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionService.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionService.java @@ -1,6 +1,6 @@ package org.agt.module.system.service.permission; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import java.util.Collection; import java.util.Set; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java similarity index 99% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java index 89626a6..5d59a17 100644 --- a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/PermissionServiceImpl.java @@ -7,7 +7,7 @@ import cn.hutool.extra.spring.SpringUtil; import org.agt.framework.common.enums.CommonStatusEnum; import org.agt.framework.common.util.collection.CollectionUtils; import org.agt.framework.datapermission.core.annotation.DataPermission; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import org.agt.module.system.dal.dataobject.permission.MenuDO; import org.agt.module.system.dal.dataobject.permission.RoleDO; import org.agt.module.system.dal.dataobject.permission.RoleMenuDO; diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/RoleService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/RoleService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/RoleService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/RoleService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/RoleServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/RoleServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/permission/RoleServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/permission/RoleServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsChannelService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsChannelService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsChannelService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsChannelService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsChannelServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsChannelServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsChannelServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsChannelServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsCodeService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsCodeService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsCodeService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsCodeService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsCodeServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsCodeServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsCodeServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsCodeServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsLogService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsLogService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsLogService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsLogService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsLogServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsLogServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsLogServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsLogServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsSendService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsSendService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsSendService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsSendService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsSendServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsSendServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsSendServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsSendServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsTemplateService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsTemplateService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsTemplateService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsTemplateService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsTemplateServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsTemplateServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/sms/SmsTemplateServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/sms/SmsTemplateServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialClientService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialClientService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialClientService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialClientService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialClientServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialClientServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialClientServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialClientServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialUserService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialUserService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialUserService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialUserService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialUserServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialUserServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/social/SocialUserServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/social/SocialUserServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantPackageService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantPackageService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantPackageService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantPackageService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantPackageServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantPackageServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantPackageServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantPackageServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/TenantServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/TenantServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/handler/TenantInfoHandler.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/handler/TenantInfoHandler.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/handler/TenantInfoHandler.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/handler/TenantInfoHandler.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/handler/TenantMenuHandler.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/handler/TenantMenuHandler.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/tenant/handler/TenantMenuHandler.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/tenant/handler/TenantMenuHandler.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/user/AdminUserService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/user/AdminUserService.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/util/oauth2/OAuth2Utils.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/util/oauth2/OAuth2Utils.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/util/oauth2/OAuth2Utils.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/util/oauth2/OAuth2Utils.java diff --git a/agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/util/package-info.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/util/package-info.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/java/org/agt/module/system/util/package-info.java rename to agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/util/package-info.java diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService b/agt-module-system/agt-module-system-server/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService rename to agt-module-system/agt-module-system-server/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/application-dev.yaml b/agt-module-system/agt-module-system-server/src/main/resources/application-dev.yaml similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/application-dev.yaml rename to agt-module-system/agt-module-system-server/src/main/resources/application-dev.yaml diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/application-local.yaml b/agt-module-system/agt-module-system-server/src/main/resources/application-local.yaml similarity index 99% rename from agt-module-system/agt-module-system-biz/src/main/resources/application-local.yaml rename to agt-module-system/agt-module-system-server/src/main/resources/application-local.yaml index 3cf457e..d6b4740 100644 --- a/agt-module-system/agt-module-system-biz/src/main/resources/application-local.yaml +++ b/agt-module-system/agt-module-system-server/src/main/resources/application-local.yaml @@ -180,7 +180,7 @@ agt: security: mock-enable: true access-log: # 访问日志的配置项 - enable: false + enable: true wxa-code: env-version: develop # 小程序版本: 正式版为 "release"；体验版为 "trial"；开发版为 "develop" wxa-subscribe-message: diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/application.yaml b/agt-module-system/agt-module-system-server/src/main/resources/application.yaml similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/application.yaml rename to agt-module-system/agt-module-system-server/src/main/resources/application.yaml diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg1.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg1.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg2.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg2.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg3.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg3.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg4.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg4.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg5.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg5.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg6.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg6.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg7.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg7.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg8.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg8.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg9.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/original/bg9.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/1.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/1.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/10.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/10.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/11.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/11.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/12.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/12.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/13.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/13.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/14.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/14.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/15.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/15.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/16.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/16.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/17.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/17.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/18.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/18.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/19.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/19.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/8.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/8.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/9.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/11/9.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/2.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/2.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/3.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/3.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png b/agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/4.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/jigsaw/slidingBlock/4.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg1.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg1.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg1.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg1.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg10.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg10.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg10.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg10.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg2.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg2.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg2.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg2.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg3.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg3.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg3.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg3.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg4.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg4.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg4.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg4.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg5.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg5.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg5.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg5.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg6.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg6.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg6.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg6.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg7.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg7.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg7.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg7.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg8.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg8.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg8.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg8.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg9.png b/agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg9.png similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/images/pic-click/bg9.png rename to agt-module-system/agt-module-system-server/src/main/resources/images/pic-click/bg9.png diff --git a/agt-module-system/agt-module-system-biz/src/main/resources/logback-spring.xml b/agt-module-system/agt-module-system-server/src/main/resources/logback-spring.xml similarity index 100% rename from agt-module-system/agt-module-system-biz/src/main/resources/logback-spring.xml rename to agt-module-system/agt-module-system-server/src/main/resources/logback-spring.xml diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientTests.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientTests.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientTests.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/SmsClientTests.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/auth/AdminAuthServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/auth/AdminAuthServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/auth/AdminAuthServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/auth/AdminAuthServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dept/DeptServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dept/DeptServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dept/DeptServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dept/DeptServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dept/PostServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dept/PostServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dept/PostServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dept/PostServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dict/DictDataServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dict/DictDataServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dict/DictDataServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dict/DictDataServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dict/DictTypeServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dict/DictTypeServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/dict/DictTypeServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/dict/DictTypeServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/logger/LoginLogServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/logger/LoginLogServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/logger/LoginLogServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/logger/LoginLogServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java similarity index 96% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java index cee81a7..ce3e396 100644 --- a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java +++ b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/logger/OperateLogServiceImplTest.java @@ -3,15 +3,13 @@ package org.agt.module.system.service.logger; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.test.core.ut.BaseDbUnitTest; import org.agt.framework.test.core.util.RandomUtils; -import org.agt.module.system.api.logger.dto.OperateLogCreateReqDTO; +import org.agt.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO; import org.agt.module.system.api.logger.dto.OperateLogPageReqDTO; import org.agt.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; import org.agt.module.system.dal.dataobject.logger.OperateLogDO; import org.agt.module.system.dal.mysql.logger.OperateLogMapper; -import org.agt.module.system.service.user.AdminUserService; import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import static org.agt.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailAccountServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailAccountServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailAccountServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailAccountServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailLogServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailLogServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailLogServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailLogServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailSendServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailSendServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailSendServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailSendServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailTemplateServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailTemplateServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/mail/MailTemplateServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/mail/MailTemplateServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notice/NoticeServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notice/NoticeServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notice/NoticeServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notice/NoticeServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifyMessageServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifyMessageServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifyMessageServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifyMessageServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifySendServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifySendServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifySendServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifySendServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifyTemplateServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifyTemplateServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/notify/NotifyTemplateServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/notify/NotifyTemplateServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2ClientServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2CodeServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2GrantServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/oauth2/OAuth2TokenServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/MenuServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/MenuServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/MenuServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/MenuServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java similarity index 99% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java index e638bc9..61abbba 100644 --- a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java +++ b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/PermissionServiceTest.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.extra.spring.SpringUtil; import org.agt.framework.common.enums.CommonStatusEnum; import org.agt.framework.test.core.ut.BaseDbUnitTest; -import org.agt.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import org.agt.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO; import org.agt.module.system.dal.dataobject.dept.DeptDO; import org.agt.module.system.dal.dataobject.permission.MenuDO; import org.agt.module.system.dal.dataobject.permission.RoleDO; diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/RoleServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/RoleServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/permission/RoleServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/permission/RoleServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsChannelServiceTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsChannelServiceTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsChannelServiceTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsChannelServiceTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsCodeServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsCodeServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsCodeServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsCodeServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsLogServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsLogServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsLogServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsLogServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsSendServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsSendServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsSendServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsSendServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsTemplateServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsTemplateServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/sms/SmsTemplateServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/sms/SmsTemplateServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/social/SocialClientServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/social/SocialClientServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/social/SocialClientServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/social/SocialClientServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/social/SocialUserServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/social/SocialUserServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/social/SocialUserServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/social/SocialUserServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/tenant/TenantPackageServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/tenant/TenantPackageServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/tenant/TenantPackageServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/tenant/TenantPackageServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/tenant/TenantServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/tenant/TenantServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/tenant/TenantServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/tenant/TenantServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/user/AdminUserServiceImplTest.java b/agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/user/AdminUserServiceImplTest.java similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/java/org/agt/module/system/service/user/AdminUserServiceImplTest.java rename to agt-module-system/agt-module-system-server/src/test/java/org/agt/module/system/service/user/AdminUserServiceImplTest.java diff --git a/agt-module-system/agt-module-system-biz/src/test/resources/application-unit-test.yaml b/agt-module-system/agt-module-system-server/src/test/resources/application-unit-test.yaml similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/resources/application-unit-test.yaml rename to agt-module-system/agt-module-system-server/src/test/resources/application-unit-test.yaml diff --git a/agt-module-system/agt-module-system-biz/src/test/resources/logback.xml b/agt-module-system/agt-module-system-server/src/test/resources/logback.xml similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/resources/logback.xml rename to agt-module-system/agt-module-system-server/src/test/resources/logback.xml diff --git a/agt-module-system/agt-module-system-biz/src/test/resources/sql/clean.sql b/agt-module-system/agt-module-system-server/src/test/resources/sql/clean.sql similarity index 100% rename from agt-module-system/agt-module-system-biz/src/test/resources/sql/clean.sql rename to agt-module-system/agt-module-system-server/src/test/resources/sql/clean.sql diff --git a/agt-module-system/agt-module-system-biz/src/test/resources/sql/create_tables.sql b/agt-module-system/agt-module-system-server/src/test/resources/sql/create_tables.sql similarity index 99% rename from agt-module-system/agt-module-system-biz/src/test/resources/sql/create_tables.sql rename to agt-module-system/agt-module-system-server/src/test/resources/sql/create_tables.sql index 87e386d..4df039b 100644 --- a/agt-module-system/agt-module-system-biz/src/test/resources/sql/create_tables.sql +++ b/agt-module-system/agt-module-system-server/src/test/resources/sql/create_tables.sql @@ -574,7 +574,6 @@ CREATE TABLE IF NOT EXISTS "system_mail_log" ( PRIMARY KEY ("id") ) COMMENT '邮件日志表'; --- 将该建表 SQL 语句，添加到 agt-module-system-biz 模块的 test/resources/sql/create_tables.sql 文件里 CREATE TABLE IF NOT EXISTS "system_notify_template" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "name" varchar NOT NULL, diff --git a/agt-module-system/pom.xml b/agt-module-system/pom.xml index 9325fa7..5f6e46e 100644 --- a/agt-module-system/pom.xml +++ b/agt-module-system/pom.xml @@ -10,7 +10,7 @@ 4.0.0 agt-module-system-api - agt-module-system-biz + agt-module-system-server agt-module-system pom diff --git a/agt-server/pom.xml b/agt-server/pom.xml index 9d2812b..3c44f7f 100644 --- a/agt-server/pom.xml +++ b/agt-server/pom.xml @@ -23,88 +23,88 @@ org.agt - agt-module-system-biz + agt-module-system-server ${revision} org.agt - agt-module-infra-biz + agt-module-infra-server ${revision} - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pom.xml b/pom.xml index 5e8893c..1464164 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ ${java.version} ${java.version} 3.2.2 - 3.13.0 + 3.14.0 1.6.0 1.18.36