BJ_ZTEITS-Developers / parking-cloud-yudao

Commit dc11dfc21502a67bf60f661e8b97995e3f044d71

Authored by YunaiV
1 parent 4bc8dc65

多模块重构 5：infra 模块的初始化

Inline Side-by-side
Showing 129 changed files with 502 additions and 403 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java deleted
View file @4bc8dc6
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.config;  
2 -  
3 -import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;  
4 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExcelVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigRespVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;  
9 -import org.mapstruct.Mapper;  
10 -import org.mapstruct.factory.Mappers;  
11 -  
12 -import java.util.List;  
13 -  
14 -@Mapper  
15 -public interface InfConfigConvert {  
16 -  
17 - InfConfigConvert INSTANCE = Mappers.getMapper(InfConfigConvert.class);  
18 -  
19 - PageResult<InfConfigRespVO> convertPage(PageResult<InfConfigDO> page);  
20 -  
21 - InfConfigRespVO convert(InfConfigDO bean);  
22 -  
23 - InfConfigDO convert(InfConfigCreateReqVO bean);  
24 -  
25 - InfConfigDO convert(InfConfigUpdateReqVO bean);  
26 -  
27 - List<InfConfigExcelVO> convertList(List<InfConfigDO> list);  
28 -  
29 -}  
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/consumer/package-info.java deleted
View file @4bc8dc6
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.consumer;  
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/message/package-info.java deleted
View file @4bc8dc6
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.message;  
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/producer/package-info.java deleted
View file @4bc8dc6
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.producer;  
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java
  View file @dc11dfc
@@ -2,8 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.tool.controller.test.vo; @@ -2,8 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.tool.controller.test.vo;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;  
6 -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; 5 +import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 7 import lombok.Data;
9 8
@@ -24,15 +23,15 @@ public class ToolTestDemoExcelVO { @@ -24,15 +23,15 @@ public class ToolTestDemoExcelVO {
24 private String name; 23 private String name;
25 24
26 @ExcelProperty(value = "状态", converter = DictConvert.class) 25 @ExcelProperty(value = "状态", converter = DictConvert.class)
27 - @DictFormat(DictTypeConstants.COMMON_STATUS) 26 + @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.COMMON_STATUS)
28 private Integer status; 27 private Integer status;
29 28
30 @ExcelProperty(value = "类型", converter = DictConvert.class) 29 @ExcelProperty(value = "类型", converter = DictConvert.class)
31 - @DictFormat(DictTypeConstants.OPERATE_TYPE) 30 + @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.OPERATE_TYPE)
32 private Integer type; 31 private Integer type;
33 32
34 @ExcelProperty(value = "分类", converter = DictConvert.class) 33 @ExcelProperty(value = "分类", converter = DictConvert.class)
35 - @DictFormat(InfDictTypeConstants.REDIS_TIMEOUT_TYPE) 34 + @DictFormat(DictTypeConstants.REDIS_TIMEOUT_TYPE)
36 private Integer category; 35 private Integer category;
37 36
38 @ExcelProperty("备注") 37 @ExcelProperty("备注")
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/convert/package-info.java deleted
View file @4bc8dc6
1 -/**  
2 - * 提供 POJO 类的实体转换  
3 - *  
4 - * 目前使用 MapStruct 框架  
5 - */  
6 -package cn.iocoder.yudao.coreservice.modules.infra.convert;  
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted
View file @4bc8dc6
1 -<http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao>  
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java deleted
View file @4bc8dc6
1 -package cn.iocoder.yudao.coreservice.modules.infra.enums.logger;  
2 -  
3 -import lombok.AllArgsConstructor;  
4 -import lombok.Getter;  
5 -  
6 -/**  
7 - * API 异常数据的处理状态  
8 - *  
9 - * @author 芋道源码  
10 - */  
11 -@AllArgsConstructor  
12 -@Getter  
13 -public enum InfApiErrorLogProcessStatusEnum {  
14 -  
15 - INIT(0, "未处理"),  
16 - DONE(1, "已处理"),  
17 - IGNORE(2, "已忽略");  
18 -  
19 - /**  
20 - * 状态  
21 - */  
22 - private final Integer status;  
23 - /**  
24 - * 资源类型名  
25 - */  
26 - private final String name;  
27 -  
28 -}  
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/package-info.java deleted
View file @4bc8dc6
1 -/**  
2 - * infra 包下，我们放基础设施的运维与管理，支撑上层的通用与核心业务。  
3 - * 例如说：定时任务的管理、服务器的信息等等  
4 - *  
5 - * 缩写：inf  
6 - */  
7 -package cn.iocoder.yudao.coreservice.modules.infra;  
yudao-module-infra/yudao-module-infra-impl/pom.xml
  View file @dc11dfc
@@ -66,7 +66,12 @@ @@ -66,7 +66,12 @@
66 <artifactId>yudao-spring-boot-starter-test</artifactId> 66 <artifactId>yudao-spring-boot-starter-test</artifactId>
67 <scope>test</scope> 67 <scope>test</scope>
68 </dependency> 68 </dependency>
  69 +
69 <!-- 工具类相关 --> 70 <!-- 工具类相关 -->
  71 + <dependency>
  72 + <groupId>cn.iocoder.boot</groupId>
  73 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
  74 + </dependency>
70 75
71 </dependencies> 76 </dependencies>
72 77
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
  4 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 7 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 8 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
8 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.*; 9 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.*;
9 -import cn.iocoder.yudao.adminserver.modules.infra.convert.config.InfConfigConvert;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.service.config.InfConfigService; 10 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.*;
  11 +import cn.iocoder.yudao.module.infra.convert.config.InfConfigConvert;
  12 +import cn.iocoder.yudao.module.infra.service.config.InfConfigService;
  13 +import cn.iocoder.yudao.module.infra.controller.config.vo.*;
  14 +import cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants;
11 import io.swagger.annotations.Api; 15 import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiImplicitParam; 16 import io.swagger.annotations.ApiImplicitParam;
13 import io.swagger.annotations.ApiOperation; 17 import io.swagger.annotations.ApiOperation;
@@ -24,13 +28,12 @@ import java.util.List; @@ -24,13 +28,12 @@ import java.util.List;
24 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 28 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 29 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; 30 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
27 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE;  
28 31
29 @Api(tags = "参数配置") 32 @Api(tags = "参数配置")
30 @RestController 33 @RestController
31 @RequestMapping("/infra/config") 34 @RequestMapping("/infra/config")
32 @Validated 35 @Validated
33 -public class InfConfigController { 36 +public class ConfigController {
34 37
35 @Resource 38 @Resource
36 private InfConfigService configService; 39 private InfConfigService configService;
@@ -38,14 +41,14 @@ public class InfConfigController { @@ -38,14 +41,14 @@ public class InfConfigController {
38 @PostMapping("/create") 41 @PostMapping("/create")
39 @ApiOperation("创建参数配置") 42 @ApiOperation("创建参数配置")
40 @PreAuthorize("@ss.hasPermission('infra:config:create')") 43 @PreAuthorize("@ss.hasPermission('infra:config:create')")
41 - public CommonResult<Long> createConfig(@Valid @RequestBody InfConfigCreateReqVO reqVO) { 44 + public CommonResult<Long> createConfig(@Valid @RequestBody ConfigCreateReqVO reqVO) {
42 return success(configService.createConfig(reqVO)); 45 return success(configService.createConfig(reqVO));
43 } 46 }
44 47
45 @PutMapping("/update") 48 @PutMapping("/update")
46 @ApiOperation("修改参数配置") 49 @ApiOperation("修改参数配置")
47 @PreAuthorize("@ss.hasPermission('infra:config:update')") 50 @PreAuthorize("@ss.hasPermission('infra:config:update')")
48 - public CommonResult<Boolean> updateConfig(@Valid @RequestBody InfConfigUpdateReqVO reqVO) { 51 + public CommonResult<Boolean> updateConfig(@Valid @RequestBody ConfigUpdateReqVO reqVO) {
49 configService.updateConfig(reqVO); 52 configService.updateConfig(reqVO);
50 return success(true); 53 return success(true);
51 } 54 }
@@ -63,7 +66,7 @@ public class InfConfigController { @@ -63,7 +66,7 @@ public class InfConfigController {
63 @ApiOperation("获得参数配置") 66 @ApiOperation("获得参数配置")
64 @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) 67 @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
65 @PreAuthorize("@ss.hasPermission('infra:config:query')") 68 @PreAuthorize("@ss.hasPermission('infra:config:query')")
66 - public CommonResult<InfConfigRespVO> getConfig(@RequestParam("id") Long id) { 69 + public CommonResult<ConfigRespVO> getConfig(@RequestParam("id") Long id) {
67 return success(InfConfigConvert.INSTANCE.convert(configService.getConfig(id))); 70 return success(InfConfigConvert.INSTANCE.convert(configService.getConfig(id)));
68 } 71 }
69 72
@@ -76,7 +79,7 @@ public class InfConfigController { @@ -76,7 +79,7 @@ public class InfConfigController {
76 return null; 79 return null;
77 } 80 }
78 if (config.getSensitive()) { 81 if (config.getSensitive()) {
79 - throw exception(CONFIG_GET_VALUE_ERROR_IF_SENSITIVE); 82 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE);
80 } 83 }
81 return success(config.getValue()); 84 return success(config.getValue());
82 } 85 }
@@ -84,7 +87,7 @@ public class InfConfigController { @@ -84,7 +87,7 @@ public class InfConfigController {
84 @GetMapping("/page") 87 @GetMapping("/page")
85 @ApiOperation("获取参数配置分页") 88 @ApiOperation("获取参数配置分页")
86 @PreAuthorize("@ss.hasPermission('infra:config:query')") 89 @PreAuthorize("@ss.hasPermission('infra:config:query')")
87 - public CommonResult<PageResult<InfConfigRespVO>> getConfigPage(@Valid InfConfigPageReqVO reqVO) { 90 + public CommonResult<PageResult<ConfigRespVO>> getConfigPage(@Valid ConfigPageReqVO reqVO) {
88 PageResult<InfConfigDO> page = configService.getConfigPage(reqVO); 91 PageResult<InfConfigDO> page = configService.getConfigPage(reqVO);
89 return success(InfConfigConvert.INSTANCE.convertPage(page)); 92 return success(InfConfigConvert.INSTANCE.convertPage(page));
90 } 93 }
@@ -93,13 +96,13 @@ public class InfConfigController { @@ -93,13 +96,13 @@ public class InfConfigController {
93 @ApiOperation("导出参数配置") 96 @ApiOperation("导出参数配置")
94 @PreAuthorize("@ss.hasPermission('infra:config:export')") 97 @PreAuthorize("@ss.hasPermission('infra:config:export')")
95 @OperateLog(type = EXPORT) 98 @OperateLog(type = EXPORT)
96 - public void exportSysConfig(@Valid InfConfigExportReqVO reqVO, 99 + public void exportSysConfig(@Valid ConfigExportReqVO reqVO,
97 HttpServletResponse response) throws IOException { 100 HttpServletResponse response) throws IOException {
98 List<InfConfigDO> list = configService.getConfigList(reqVO); 101 List<InfConfigDO> list = configService.getConfigList(reqVO);
99 // 拼接数据 102 // 拼接数据
100 - List<InfConfigExcelVO> datas = InfConfigConvert.INSTANCE.convertList(list); 103 + List<ConfigExcelVO> datas = InfConfigConvert.INSTANCE.convertList(list);
101 // 输出 104 // 输出
102 - ExcelUtils.write(response, "参数配置.xls", "数据", InfConfigExcelVO.class, datas); 105 + ExcelUtils.write(response, "参数配置.xls", "数据", ConfigExcelVO.class, datas);
103 } 106 }
104 107
105 } 108 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigBaseVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
@@ -13,7 +13,7 @@ import javax.validation.constraints.Size; @@ -13,7 +13,7 @@ import javax.validation.constraints.Size;
13 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 13 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
14 */ 14 */
15 @Data 15 @Data
16 -public class InfConfigBaseVO { 16 +public class ConfigBaseVO {
17 17
18 @ApiModelProperty(value = "参数分组", required = true, example = "biz") 18 @ApiModelProperty(value = "参数分组", required = true, example = "biz")
19 @NotEmpty(message = "参数分组不能为空") 19 @NotEmpty(message = "参数分组不能为空")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigCreateReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
@@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode;
8 import javax.validation.constraints.NotBlank; 8 import javax.validation.constraints.NotBlank;
9 import javax.validation.constraints.Size; 9 import javax.validation.constraints.Size;
10 10
11 -@ApiModel("参数配置创建 Request VO") 11 +@ApiModel("管理后台 - 参数配置创建 Request VO")
12 @Data 12 @Data
13 @EqualsAndHashCode(callSuper = true) 13 @EqualsAndHashCode(callSuper = true)
14 -public class InfConfigCreateReqVO extends InfConfigBaseVO { 14 +public class ConfigCreateReqVO extends ConfigBaseVO {
15 15
16 @ApiModelProperty(value = "参数键名", required = true, example = "yunai.db.username") 16 @ApiModelProperty(value = "参数键名", required = true, example = "yunai.db.username")
17 @NotBlank(message = "参数键名长度不能为空") 17 @NotBlank(message = "参数键名长度不能为空")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigExcelVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExcelVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; 5 +import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
@@ -12,7 +12,7 @@ import java.util.Date; @@ -12,7 +12,7 @@ import java.util.Date;
12 * 参数配置 Excel 导出响应 VO 12 * 参数配置 Excel 导出响应 VO
13 */ 13 */
14 @Data 14 @Data
15 -public class InfConfigExcelVO { 15 +public class ConfigExcelVO {
16 16
17 @ExcelProperty("参数配置序号") 17 @ExcelProperty("参数配置序号")
18 private Long id; 18 private Long id;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigExportReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -11,7 +11,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
11 11
12 @ApiModel("参数配置导出 Request VO") 12 @ApiModel("参数配置导出 Request VO")
13 @Data 13 @Data
14 -public class InfConfigExportReqVO { 14 +public class ConfigExportReqVO {
15 15
16 @ApiModelProperty(value = "参数名称", example = "模糊匹配") 16 @ApiModelProperty(value = "参数名称", example = "模糊匹配")
17 private String name; 17 private String name;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigPageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
@@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
16 @Data 16 @Data
17 @EqualsAndHashCode(callSuper = true) 17 @EqualsAndHashCode(callSuper = true)
18 @ToString(callSuper = true) 18 @ToString(callSuper = true)
19 -public class InfConfigPageReqVO extends PageParam { 19 +public class ConfigPageReqVO extends PageParam {
20 20
21 @ApiModelProperty(value = "参数名称", example = "模糊匹配") 21 @ApiModelProperty(value = "参数名称", example = "模糊匹配")
22 private String name; 22 private String name;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.util.Date; @@ -12,7 +12,7 @@ import java.util.Date;
12 @ApiModel("参数配置信息 Response VO") 12 @ApiModel("参数配置信息 Response VO")
13 @Data 13 @Data
14 @EqualsAndHashCode(callSuper = true) 14 @EqualsAndHashCode(callSuper = true)
15 -public class InfConfigRespVO extends InfConfigBaseVO { 15 +public class ConfigRespVO extends ConfigBaseVO {
16 16
17 @ApiModelProperty(value = "参数配置序号", required = true, example = "1024") 17 @ApiModelProperty(value = "参数配置序号", required = true, example = "1024")
18 private Long id; 18 private Long id;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
12 @Data 12 @Data
13 @EqualsAndHashCode(callSuper = true) 13 @EqualsAndHashCode(callSuper = true)
14 @ToString(callSuper = true) 14 @ToString(callSuper = true)
15 -public class InfConfigUpdateReqVO extends InfConfigBaseVO { 15 +public class ConfigUpdateReqVO extends ConfigBaseVO {
16 16
17 @ApiModelProperty(value = "参数配置序号", required = true, example = "1024") 17 @ApiModelProperty(value = "参数配置序号", required = true, example = "1024")
18 @NotNull(message = "参数配置编号不能为空") 18 @NotNull(message = "参数配置编号不能为空")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/doc/InfDbDocController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/doc/InfDbDocController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.doc; 1 +package cn.iocoder.yudao.module.infra.controller.admin.doc;
2 2
3 import cn.hutool.core.io.FileUtil; 3 import cn.hutool.core.io.FileUtil;
4 import cn.hutool.core.util.IdUtil; 4 import cn.hutool.core.util.IdUtil;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/InfFileController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.file; 1 +package cn.iocoder.yudao.module.infra.controller.admin.file;
2 2
3 import cn.hutool.core.io.IoUtil; 3 import cn.hutool.core.io.IoUtil;
4 -import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO; 4 +import cn.iocoder.yudao.module.infra.controller.admin.file.vo.InfFilePageReqVO;
  5 +import cn.iocoder.yudao.module.infra.service.file.InfFileService;
6 import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO; 6 import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
7 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 7 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
8 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService; 8 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
9 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 9 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 -import cn.iocoder.yudao.adminserver.modules.infra.convert.file.InfFileConvert; 11 +import cn.iocoder.yudao.module.infra.convert.file.InfFileConvert;
12 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; 12 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
13 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; 13 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
14 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/InfFilePageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.file.vo;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/InfJobController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/InfJobController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -6,9 +6,11 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; @@ -6,9 +6,11 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 import cn.iocoder.yudao.framework.quartz.core.util.CronUtils; 7 import cn.iocoder.yudao.framework.quartz.core.util.CronUtils;
8 import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.*; 8 import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.*;
9 -import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobConvert;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobService; 9 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.*;
  10 +import cn.iocoder.yudao.module.infra.convert.job.InfJobConvert;
  11 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
  12 +import cn.iocoder.yudao.module.infra.service.job.InfJobService;
  13 +import cn.iocoder.yudao.module.infra.controller.job.vo.job.*;
12 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiImplicitParam; 15 import io.swagger.annotations.ApiImplicitParam;
14 import io.swagger.annotations.ApiImplicitParams; 16 import io.swagger.annotations.ApiImplicitParams;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/InfJobLogController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/InfJobLogController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExcelVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogRespVO;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobLogConvert;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobLogService; 7 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExcelVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExportReqVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogPageReqVO;
  10 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogRespVO;
  11 +import cn.iocoder.yudao.module.infra.convert.job.InfJobLogConvert;
  12 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
  13 +import cn.iocoder.yudao.module.infra.service.job.InfJobLogService;
14 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
15 import io.swagger.annotations.ApiImplicitParam; 15 import io.swagger.annotations.ApiImplicitParam;
16 import io.swagger.annotations.ApiOperation; 16 import io.swagger.annotations.ApiOperation;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobBaseVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobBaseVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobCreateReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobExcelVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobExcelVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; 5 +import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
@@ -23,7 +23,7 @@ public class InfJobExcelVO { @@ -23,7 +23,7 @@ public class InfJobExcelVO {
23 private String name; 23 private String name;
24 24
25 @ExcelProperty(value = "任务状态", converter = DictConvert.class) 25 @ExcelProperty(value = "任务状态", converter = DictConvert.class)
26 - @DictFormat(InfDictTypeConstants.JOB_STATUS) 26 + @DictFormat(DictTypeConstants.JOB_STATUS)
27 private Integer status; 27 private Integer status;
28 28
29 @ExcelProperty("处理器的名字") 29 @ExcelProperty("处理器的名字")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobExportReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobExportReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobPageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobPageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/InfJobUpdateReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/InfJobLogBaseVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/InfJobLogExcelVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; 5 +import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
@@ -41,7 +41,7 @@ public class InfJobLogExcelVO { @@ -41,7 +41,7 @@ public class InfJobLogExcelVO {
41 private Integer duration; 41 private Integer duration;
42 42
43 @ExcelProperty(value = "任务状态", converter = DictConvert.class) 43 @ExcelProperty(value = "任务状态", converter = DictConvert.class)
44 - @DictFormat(InfDictTypeConstants.JOB_STATUS) 44 + @DictFormat(DictTypeConstants.JOB_STATUS)
45 private Integer status; 45 private Integer status;
46 46
47 @ExcelProperty("结果数据") 47 @ExcelProperty("结果数据")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/InfJobLogExportReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/InfJobLogPageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/InfJobLogRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log; 1 +package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/InfApiAccessLogController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/InfApiAccessLogController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.convert.logger.InfApiAccessLogConvert;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiAccessLogService; 8 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
  10 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
  11 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
  12 +import cn.iocoder.yudao.module.infra.convert.logger.InfApiAccessLogConvert;
  13 +import cn.iocoder.yudao.module.infra.service.logger.InfApiAccessLogService;
14 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
15 import io.swagger.annotations.ApiOperation; 15 import io.swagger.annotations.ApiOperation;
16 import org.springframework.security.access.prepost.PreAuthorize; 16 import org.springframework.security.access.prepost.PreAuthorize;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/InfApiErrorLogController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/InfApiErrorLogController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.convert.logger.InfApiErrorLogConvert;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiErrorLogService; 8 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
  10 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
  11 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogRespVO;
  12 +import cn.iocoder.yudao.module.infra.convert.logger.InfApiErrorLogConvert;
  13 +import cn.iocoder.yudao.module.infra.service.logger.InfApiErrorLogService;
14 import io.swagger.annotations.Api; 14 import io.swagger.annotations.Api;
15 import io.swagger.annotations.ApiImplicitParam; 15 import io.swagger.annotations.ApiImplicitParam;
16 import io.swagger.annotations.ApiImplicitParams; 16 import io.swagger.annotations.ApiImplicitParams;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; 5 +import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
6 import cn.iocoder.yudao.module.system.enums.DictTypeConstants; 6 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 8 import lombok.Data;
@@ -79,7 +79,7 @@ public class InfApiErrorLogExcelVO { @@ -79,7 +79,7 @@ public class InfApiErrorLogExcelVO {
79 private Date createTime; 79 private Date createTime;
80 80
81 @ExcelProperty(value = "处理状态", converter = DictConvert.class) 81 @ExcelProperty(value = "处理状态", converter = DictConvert.class)
82 - @DictFormat(InfDictTypeConstants.API_ERROR_LOG_PROCESS_STATUS) 82 + @DictFormat(DictTypeConstants.API_ERROR_LOG_PROCESS_STATUS)
83 private Integer processStatus; 83 private Integer processStatus;
84 84
85 @ExcelProperty("处理时间") 85 @ExcelProperty("处理时间")
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/InfApiErrorLogRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog; 1 +package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/RedisController.http renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.http
  View file @dc11dfc
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/RedisController.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.redis; 1 +package cn.iocoder.yudao.module.infra.controller.admin.redis;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; 4 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
5 import cn.iocoder.yudao.framework.redis.core.RedisKeyRegistry; 5 import cn.iocoder.yudao.framework.redis.core.RedisKeyRegistry;
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisKeyRespVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.convert.redis.RedisConvert; 6 +import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.InfRedisKeyRespVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.InfRedisMonitorRespVO;
  8 +import cn.iocoder.yudao.module.infra.convert.redis.RedisConvert;
9 import io.swagger.annotations.Api; 9 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 10 import io.swagger.annotations.ApiOperation;
11 import org.springframework.data.redis.connection.RedisServerCommands; 11 import org.springframework.data.redis.connection.RedisServerCommands;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/InfRedisKeyRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.redis.vo;
2 2
3 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; 3 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/InfRedisMonitorRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo; 1 +package cn.iocoder.yudao.module.infra.controller.admin.redis.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/app/package-info.java 0 → 100644
  View file @dc11dfc
  1 +/**
  2 + * 占位
  3 + */
  4 +package cn.iocoder.yudao.module.infra.controller.app;
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/package-info.java 0 → 100644
  View file @dc11dfc
  1 +/**
  2 + * 提供 RESTful API 给前端：
  3 + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
  4 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
  5 + */
  6 +package cn.iocoder.yudao.module.infra.controller;
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/config/InfConfigConvert.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.convert.config;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExcelVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigRespVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO;
  9 +import org.mapstruct.Mapper;
  10 +import org.mapstruct.factory.Mappers;
  11 +
  12 +import java.util.List;
  13 +
  14 +@Mapper
  15 +public interface InfConfigConvert {
  16 +
  17 + InfConfigConvert INSTANCE = Mappers.getMapper(InfConfigConvert.class);
  18 +
  19 + PageResult<ConfigRespVO> convertPage(PageResult<InfConfigDO> page);
  20 +
  21 + ConfigRespVO convert(InfConfigDO bean);
  22 +
  23 + InfConfigDO convert(ConfigCreateReqVO bean);
  24 +
  25 + InfConfigDO convert(ConfigUpdateReqVO bean);
  26 +
  27 + List<ConfigExcelVO> convertList(List<InfConfigDO> list);
  28 +
  29 +}
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/file/InfFileConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.file; 1 +package cn.iocoder.yudao.module.infra.convert.file;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO; 3 import cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo.InfFileRespVO;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/job/InfJobConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/job/InfJobConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.job; 1 +package cn.iocoder.yudao.module.infra.convert.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExcelVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobRespVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO; 4 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobCreateReqVO;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobExcelVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobRespVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobUpdateReqVO;
  8 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
9 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
10 import org.mapstruct.factory.Mappers; 10 import org.mapstruct.factory.Mappers;
11 11
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/job/InfJobLogConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/job/InfJobLogConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.job; 1 +package cn.iocoder.yudao.module.infra.convert.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExcelVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO; 4 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExcelVO;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogRespVO;
  6 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
9 9
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/logger/InfApiAccessLogConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/InfApiAccessLogConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.logger; 1 +package cn.iocoder.yudao.module.infra.convert.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; 5 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
9 9
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/convert/logger/InfApiAccessLogCoreConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/InfApiAccessLogCoreConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.convert.logger; 1 +package cn.iocoder.yudao.module.infra.convert.logger;
2 2
3 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; 3 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/logger/InfApiErrorLogConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/InfApiErrorLogConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.logger; 1 +package cn.iocoder.yudao.module.infra.convert.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; 5 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogRespVO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
9 9
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/convert/logger/InfApiErrorLogCoreConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/InfApiErrorLogCoreConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.convert.logger; 1 +package cn.iocoder.yudao.module.infra.convert.logger;
2 2
3 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; 3 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/package-info.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/package-info.java
  View file @dc11dfc
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * 目前使用 MapStruct 框架 4 * 目前使用 MapStruct 框架
5 */ 5 */
6 -package cn.iocoder.yudao.adminserver.modules.infra.convert; 6 +package cn.iocoder.yudao.module.infra.convert;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/redis/RedisConvert.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/redis/RedisConvert.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.convert.redis; 1 +package cn.iocoder.yudao.module.infra.convert.redis;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; 4 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisKeyRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisMonitorRespVO; 5 +import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.InfRedisKeyRespVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.InfRedisMonitorRespVO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
9 9
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md
  View file @dc11dfc
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/config/InfConfigDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/InfConfigDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.config;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/file/InfFileDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/InfFileDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.file;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; 4 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/job/InfJobDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/job/InfJobDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.job;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobStatusEnum; 4 +import cn.iocoder.yudao.module.infra.enums.job.InfJobStatusEnum;
5 import com.baomidou.mybatisplus.annotation.TableId; 5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.*; 7 import lombok.*;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/job/InfJobLogDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/job/InfJobLogDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.job;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; 4 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
5 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobLogStatusEnum; 5 +import cn.iocoder.yudao.module.infra.enums.job.InfJobLogStatusEnum;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.*; 7 import lombok.*;
8 8
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/InfApiAccessLogDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.logger;
2 2
3 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 3 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/InfApiErrorLogDO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger; 1 +package cn.iocoder.yudao.module.infra.dal.dataobject.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; 3 import cn.iocoder.yudao.coreservice.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
4 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 4 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/config/InfConfigCoreDAOImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/InfConfigCoreDAOImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.config; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.config;
2 2
3 import cn.iocoder.yudao.framework.apollo.internals.ConfigFrameworkDAO; 3 import cn.iocoder.yudao.framework.apollo.internals.ConfigFrameworkDAO;
4 import cn.iocoder.yudao.framework.apollo.internals.dto.ConfigRespDTO; 4 import cn.iocoder.yudao.framework.apollo.internals.dto.ConfigRespDTO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/config/InfConfigMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/InfConfigMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.config;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO; 7 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO;
9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
11 11
@@ -18,7 +18,7 @@ public interface InfConfigMapper extends BaseMapperX&lt;InfConfigDO&gt; { @@ -18,7 +18,7 @@ public interface InfConfigMapper extends BaseMapperX&lt;InfConfigDO&gt; {
18 return selectOne(new QueryWrapper<InfConfigDO>().eq("`key`", key)); 18 return selectOne(new QueryWrapper<InfConfigDO>().eq("`key`", key));
19 } 19 }
20 20
21 - default PageResult<InfConfigDO> selectPage(InfConfigPageReqVO reqVO) { 21 + default PageResult<InfConfigDO> selectPage(ConfigPageReqVO reqVO) {
22 return selectPage(reqVO, new QueryWrapperX<InfConfigDO>() 22 return selectPage(reqVO, new QueryWrapperX<InfConfigDO>()
23 .likeIfPresent("name", reqVO.getName()) 23 .likeIfPresent("name", reqVO.getName())
24 .likeIfPresent("`key`", reqVO.getKey()) 24 .likeIfPresent("`key`", reqVO.getKey())
@@ -26,7 +26,7 @@ public interface InfConfigMapper extends BaseMapperX&lt;InfConfigDO&gt; { @@ -26,7 +26,7 @@ public interface InfConfigMapper extends BaseMapperX&lt;InfConfigDO&gt; {
26 .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime())); 26 .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
27 } 27 }
28 28
29 - default List<InfConfigDO> selectList(InfConfigExportReqVO reqVO) { 29 + default List<InfConfigDO> selectList(ConfigExportReqVO reqVO) {
30 return selectList(new QueryWrapperX<InfConfigDO>() 30 return selectList(new QueryWrapperX<InfConfigDO>()
31 .likeIfPresent("name", reqVO.getName()) 31 .likeIfPresent("name", reqVO.getName())
32 .likeIfPresent("`key`", reqVO.getKey()) 32 .likeIfPresent("`key`", reqVO.getKey())
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/file/InfFileCoreMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/InfFileCoreMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.file;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/file/InfFileMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/InfFileMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.file;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.file.vo.InfFilePageReqVO;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/job/InfJobLogMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/job/InfJobLogMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO; 6 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExportReqVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogPageReqVO;
  8 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
9 import org.apache.ibatis.annotations.Mapper; 9 import org.apache.ibatis.annotations.Mapper;
10 10
11 import java.util.List; 11 import java.util.List;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/job/InfJobMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/job/InfJobMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.job;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobPageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobPageReqVO;
  5 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 8 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/logger/InfApiAccessLogCoreMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/InfApiAccessLogCoreMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.logger; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.logger;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/InfApiAccessLogMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.logger;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/mysql/logger/InfApiErrorLogCoreMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/InfApiErrorLogCoreMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.logger; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.logger;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/InfApiErrorLogMapper.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger; 1 +package cn.iocoder.yudao.module.infra.dal.mysql.logger;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; 7 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
9 import org.apache.ibatis.annotations.Mapper; 9 import org.apache.ibatis.annotations.Mapper;
10 10
11 import java.util.List; 11 import java.util.List;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfDictTypeConstants.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/DictTypeConstants.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums; 1 +package cn.iocoder.yudao.module.infra.enums;
2 2
3 /** 3 /**
4 * Infra 字典类型的枚举类 4 * Infra 字典类型的枚举类
5 * 5 *
6 * @author 芋道源码 6 * @author 芋道源码
7 */ 7 */
8 -public interface InfDictTypeConstants { 8 +public interface DictTypeConstants {
9 9
10 String REDIS_TIMEOUT_TYPE = "inf_redis_timeout_type"; // Redis 超时类型 10 String REDIS_TIMEOUT_TYPE = "inf_redis_timeout_type"; // Redis 超时类型
11 11
@@ -16,4 +16,7 @@ public interface InfDictTypeConstants { @@ -16,4 +16,7 @@ public interface InfDictTypeConstants {
16 16
17 String ERROR_CODE_TYPE = "inf_error_code_type"; // 错误码的类型枚举 17 String ERROR_CODE_TYPE = "inf_error_code_type"; // 错误码的类型枚举
18 18
  19 + String CONFIG_TYPE = "sys_config_type"; // 参数配置类型
  20 + String BOOLEAN_STRING = "sys_boolean_string"; // Boolean 是否类型
  21 +
19 } 22 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/InfErrorCodeConstants.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/InfErrorCodeConstants.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums; 1 +package cn.iocoder.yudao.module.infra.enums;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/enums/SysErrorCodeConstants.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/SysErrorCodeConstants.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.enums; 1 +package cn.iocoder.yudao.module.infra.enums;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config/InfConfigTypeEnum.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/config/InfConfigTypeEnum.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums.config; 1 +package cn.iocoder.yudao.module.infra.enums.config;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/job/InfJobLogStatusEnum.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/job/InfJobLogStatusEnum.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums.job; 1 +package cn.iocoder.yudao.module.infra.enums.job;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/job/InfJobStatusEnum.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/job/InfJobStatusEnum.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums.job; 1 +package cn.iocoder.yudao.module.infra.enums.job;
2 2
3 import com.google.common.collect.Sets; 3 import com.google.common.collect.Sets;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
@@ -25,11 +25,11 @@ public enum InfJobStatusEnum { @@ -25,11 +25,11 @@ public enum InfJobStatusEnum {
25 /** 25 /**
26 * 开启 26 * 开启
27 */ 27 */
28 - NORMAL(1, Sets.newHashSet(STATE_WAITING, STATE_ACQUIRED, STATE_BLOCKED)), 28 + NORMAL(1, Sets.newHashSet(Constants.STATE_WAITING, Constants.STATE_ACQUIRED, Constants.STATE_BLOCKED)),
29 /** 29 /**
30 * 暂停 30 * 暂停
31 */ 31 */
32 - STOP(2, Sets.newHashSet(STATE_PAUSED, STATE_PAUSED_BLOCKED)); 32 + STOP(2, Sets.newHashSet(Constants.STATE_PAUSED, Constants.STATE_PAUSED_BLOCKED));
33 33
34 /** 34 /**
35 * 状态 35 * 状态
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.enums.logger; 1 +package cn.iocoder.yudao.module.infra.enums.logger;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileConfiguration.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/file/config/FileConfiguration.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.framework.file.config; 1 +package cn.iocoder.yudao.module.infra.file.config;
2 2
3 import org.springframework.boot.context.properties.EnableConfigurationProperties; 3 import org.springframework.boot.context.properties.EnableConfigurationProperties;
4 import org.springframework.context.annotation.Configuration; 4 import org.springframework.context.annotation.Configuration;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/config/FileProperties.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/file/config/FileProperties.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.framework.file.config; 1 +package cn.iocoder.yudao.module.infra.file.config;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 import org.springframework.boot.context.properties.ConfigurationProperties; 4 import org.springframework.boot.context.properties.ConfigurationProperties;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/framework/file/package-info.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/file/package-info.java
  View file @dc11dfc
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/framework/package-info.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/framework/package-info.java
  View file @dc11dfc
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * @author 芋道源码 4 * @author 芋道源码
5 */ 5 */
6 -package cn.iocoder.yudao.adminserver.modules.infra.framework; 6 +package cn.iocoder.yudao.module.infra.framework;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/config/InfConfigRefreshConsumer.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.consumer.config; 1 +package cn.iocoder.yudao.module.infra.mq.consumer.config;
2 2
3 import cn.iocoder.yudao.framework.apollo.internals.DBConfigRepository; 3 import cn.iocoder.yudao.framework.apollo.internals.DBConfigRepository;
4 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener; 4 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
5 -import cn.iocoder.yudao.adminserver.modules.infra.mq.message.config.InfConfigRefreshMessage; 5 +import cn.iocoder.yudao.module.infra.mq.message.config.InfConfigRefreshMessage;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
8 8
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/package-info.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.mq.consumer;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/message/config/InfConfigRefreshMessage.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/message/config/InfConfigRefreshMessage.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.message.config; 1 +package cn.iocoder.yudao.module.infra.mq.message.config;
2 2
3 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage; 3 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/message/package-info.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.mq.message;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/mq/producer/config/InfConfigProducer.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/config/InfConfigProducer.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.mq.producer.config; 1 +package cn.iocoder.yudao.module.infra.mq.producer.config;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.mq.message.config.InfConfigRefreshMessage; 3 +import cn.iocoder.yudao.module.infra.mq.message.config.InfConfigRefreshMessage;
4 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate; 4 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/package-info.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.mq.producer;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/package-info.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/package-info.java
  View file @dc11dfc
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 * infra 包下，我们放基础设施的运维与管理，支撑上层的通用与核心业务。 2 * infra 包下，我们放基础设施的运维与管理，支撑上层的通用与核心业务。
3 * 例如说：定时任务的管理、服务器的信息等等 3 * 例如说：定时任务的管理、服务器的信息等等
4 * 4 *
5 - * 缩写：inf 5 + * 1. Controller URL：以 /infra/ 开头，避免和其它 Module 冲突
  6 + * 2. DataObject 表名：以 infra_ 开头，方便在数据库中区分
6 */ 7 */
7 -package cn.iocoder.yudao.adminserver.modules.infra; 8 +package cn.iocoder.yudao.module.infra;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/config/InfConfigService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.config; 1 +package cn.iocoder.yudao.module.infra.service.config;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO; 5 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO;
9 9
10 import javax.validation.Valid; 10 import javax.validation.Valid;
11 import java.util.List; 11 import java.util.List;
@@ -23,14 +23,14 @@ public interface InfConfigService { @@ -23,14 +23,14 @@ public interface InfConfigService {
23 * @param reqVO 创建信息 23 * @param reqVO 创建信息
24 * @return 配置编号 24 * @return 配置编号
25 */ 25 */
26 - Long createConfig(@Valid InfConfigCreateReqVO reqVO); 26 + Long createConfig(@Valid ConfigCreateReqVO reqVO);
27 27
28 /** 28 /**
29 * 更新参数配置 29 * 更新参数配置
30 * 30 *
31 * @param reqVO 更新信息 31 * @param reqVO 更新信息
32 */ 32 */
33 - void updateConfig(@Valid InfConfigUpdateReqVO reqVO); 33 + void updateConfig(@Valid ConfigUpdateReqVO reqVO);
34 34
35 /** 35 /**
36 * 删除参数配置 36 * 删除参数配置
@@ -61,7 +61,7 @@ public interface InfConfigService { @@ -61,7 +61,7 @@ public interface InfConfigService {
61 * @param reqVO 分页条件 61 * @param reqVO 分页条件
62 * @return 分页列表 62 * @return 分页列表
63 */ 63 */
64 - PageResult<InfConfigDO> getConfigPage(@Valid InfConfigPageReqVO reqVO); 64 + PageResult<InfConfigDO> getConfigPage(@Valid ConfigPageReqVO reqVO);
65 65
66 /** 66 /**
67 * 获得参数配置列表 67 * 获得参数配置列表
@@ -69,7 +69,7 @@ public interface InfConfigService { @@ -69,7 +69,7 @@ public interface InfConfigService {
69 * @param reqVO 列表 69 * @param reqVO 列表
70 * @return 列表 70 * @return 列表
71 */ 71 */
72 - List<InfConfigDO> getConfigList(@Valid InfConfigExportReqVO reqVO); 72 + List<InfConfigDO> getConfigList(@Valid ConfigExportReqVO reqVO);
73 73
74 74
75 } 75 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/config/impl/InfConfigServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.config.impl; 1 +package cn.iocoder.yudao.module.infra.service.config.impl;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
4 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 4 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.convert.config.InfConfigConvert;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config.InfConfigMapper;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.mq.producer.config.InfConfigProducer;  
14 -import cn.iocoder.yudao.adminserver.modules.infra.service.config.InfConfigService; 6 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO;
  10 +import cn.iocoder.yudao.module.infra.convert.config.InfConfigConvert;
  11 +import cn.iocoder.yudao.module.infra.dal.mysql.config.InfConfigMapper;
  12 +import cn.iocoder.yudao.module.infra.enums.config.InfConfigTypeEnum;
  13 +import cn.iocoder.yudao.module.infra.mq.producer.config.InfConfigProducer;
  14 +import cn.iocoder.yudao.module.infra.service.config.InfConfigService;
  15 +import cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants;
15 import com.google.common.annotations.VisibleForTesting; 16 import com.google.common.annotations.VisibleForTesting;
16 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
17 import org.springframework.stereotype.Service; 18 import org.springframework.stereotype.Service;
@@ -21,8 +22,6 @@ import javax.annotation.Resource; @@ -21,8 +22,6 @@ import javax.annotation.Resource;
21 22
22 import java.util.List; 23 import java.util.List;
23 24
24 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.*;  
25 -  
26 /** 25 /**
27 * 参数配置 Service 实现类 26 * 参数配置 Service 实现类
28 */ 27 */
@@ -38,7 +37,7 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -38,7 +37,7 @@ public class InfConfigServiceImpl implements InfConfigService {
38 private InfConfigProducer configProducer; 37 private InfConfigProducer configProducer;
39 38
40 @Override 39 @Override
41 - public Long createConfig(InfConfigCreateReqVO reqVO) { 40 + public Long createConfig(ConfigCreateReqVO reqVO) {
42 // 校验正确性 41 // 校验正确性
43 checkCreateOrUpdate(null, reqVO.getKey()); 42 checkCreateOrUpdate(null, reqVO.getKey());
44 // 插入参数配置 43 // 插入参数配置
@@ -51,7 +50,7 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -51,7 +50,7 @@ public class InfConfigServiceImpl implements InfConfigService {
51 } 50 }
52 51
53 @Override 52 @Override
54 - public void updateConfig(InfConfigUpdateReqVO reqVO) { 53 + public void updateConfig(ConfigUpdateReqVO reqVO) {
55 // 校验正确性 54 // 校验正确性
56 checkCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key 55 checkCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key
57 // 更新参数配置 56 // 更新参数配置
@@ -67,7 +66,7 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -67,7 +66,7 @@ public class InfConfigServiceImpl implements InfConfigService {
67 InfConfigDO config = checkConfigExists(id); 66 InfConfigDO config = checkConfigExists(id);
68 // 内置配置，不允许删除 67 // 内置配置，不允许删除
69 if (InfConfigTypeEnum.SYSTEM.getType().equals(config.getType())) { 68 if (InfConfigTypeEnum.SYSTEM.getType().equals(config.getType())) {
70 - throw ServiceExceptionUtil.exception(CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE); 69 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE);
71 } 70 }
72 // 删除 71 // 删除
73 configMapper.deleteById(id); 72 configMapper.deleteById(id);
@@ -86,12 +85,12 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -86,12 +85,12 @@ public class InfConfigServiceImpl implements InfConfigService {
86 } 85 }
87 86
88 @Override 87 @Override
89 - public PageResult<InfConfigDO> getConfigPage(InfConfigPageReqVO reqVO) { 88 + public PageResult<InfConfigDO> getConfigPage(ConfigPageReqVO reqVO) {
90 return configMapper.selectPage(reqVO); 89 return configMapper.selectPage(reqVO);
91 } 90 }
92 91
93 @Override 92 @Override
94 - public List<InfConfigDO> getConfigList(InfConfigExportReqVO reqVO) { 93 + public List<InfConfigDO> getConfigList(ConfigExportReqVO reqVO) {
95 return configMapper.selectList(reqVO); 94 return configMapper.selectList(reqVO);
96 } 95 }
97 96
@@ -109,7 +108,7 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -109,7 +108,7 @@ public class InfConfigServiceImpl implements InfConfigService {
109 } 108 }
110 InfConfigDO config = configMapper.selectById(id); 109 InfConfigDO config = configMapper.selectById(id);
111 if (config == null) { 110 if (config == null) {
112 - throw ServiceExceptionUtil.exception(CONFIG_NOT_EXISTS); 111 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.CONFIG_NOT_EXISTS);
113 } 112 }
114 return config; 113 return config;
115 } 114 }
@@ -122,10 +121,10 @@ public class InfConfigServiceImpl implements InfConfigService { @@ -122,10 +121,10 @@ public class InfConfigServiceImpl implements InfConfigService {
122 } 121 }
123 // 如果 id 为空，说明不用比较是否为相同 id 的参数配置 122 // 如果 id 为空，说明不用比较是否为相同 id 的参数配置
124 if (id == null) { 123 if (id == null) {
125 - throw ServiceExceptionUtil.exception(CONFIG_KEY_DUPLICATE); 124 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.CONFIG_KEY_DUPLICATE);
126 } 125 }
127 if (!config.getId().equals(id)) { 126 if (!config.getId().equals(id)) {
128 - throw ServiceExceptionUtil.exception(CONFIG_KEY_DUPLICATE); 127 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.CONFIG_KEY_DUPLICATE);
129 } 128 }
130 } 129 }
131 130
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/InfFileCoreService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/file/InfFileCoreService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.file; 1 +package cn.iocoder.yudao.module.infra.service.file;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 3 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
4 4
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/file/InfFileService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.file; 1 +package cn.iocoder.yudao.module.infra.service.file;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.file.vo.InfFilePageReqVO;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/file/impl/InfFileCoreServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/file/impl/InfFileCoreServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.file.impl; 1 +package cn.iocoder.yudao.module.infra.service.file.impl;
2 2
3 import cn.hutool.core.io.FileTypeUtil; 3 import cn.hutool.core.io.FileTypeUtil;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/impl/InfFileServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/file/impl/InfFileServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.file.impl; 1 +package cn.iocoder.yudao.module.infra.service.file.impl;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.file.InfFileMapper;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO; 3 +import cn.iocoder.yudao.module.infra.dal.mysql.file.InfFileMapper;
  4 +import cn.iocoder.yudao.module.infra.service.file.InfFileService;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.file.vo.InfFilePageReqVO;
6 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 6 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
7 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService; 7 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
8 import cn.iocoder.yudao.framework.common.pojo.PageResult; 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/InfJobLogService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/job/InfJobLogService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job; 1 +package cn.iocoder.yudao.module.infra.service.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.quartz.core.service.JobLogFrameworkService; 4 import cn.iocoder.yudao.framework.quartz.core.service.JobLogFrameworkService;
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO; 5 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExportReqVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogPageReqVO;
  7 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
8 8
9 import java.util.Collection; 9 import java.util.Collection;
10 import java.util.List; 10 import java.util.List;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/InfJobService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/job/InfJobService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job; 1 +package cn.iocoder.yudao.module.infra.service.job;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExportReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobPageReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO; 4 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobCreateReqVO;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobExportReqVO;
  6 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobPageReqVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobUpdateReqVO;
  8 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
9 import org.quartz.SchedulerException; 9 import org.quartz.SchedulerException;
10 10
11 import javax.validation.Valid; 11 import javax.validation.Valid;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/impl/InfJobLogServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/job/impl/InfJobLogServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job.impl; 1 +package cn.iocoder.yudao.module.infra.service.job.impl;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job.InfJobLogMapper;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobLogStatusEnum;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobLogService; 4 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExportReqVO;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogPageReqVO;
  6 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
  7 +import cn.iocoder.yudao.module.infra.dal.mysql.job.InfJobLogMapper;
  8 +import cn.iocoder.yudao.module.infra.enums.job.InfJobLogStatusEnum;
  9 +import cn.iocoder.yudao.module.infra.service.job.InfJobLogService;
10 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.scheduling.annotation.Async; 11 import org.springframework.scheduling.annotation.Async;
12 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/impl/InfJobServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/job/impl/InfJobServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job.impl; 1 +package cn.iocoder.yudao.module.infra.service.job.impl;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager; 4 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
5 import cn.iocoder.yudao.framework.quartz.core.util.CronUtils; 5 import cn.iocoder.yudao.framework.quartz.core.util.CronUtils;
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobCreateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExportReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobPageReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobConvert;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job.InfJobMapper;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobStatusEnum;  
14 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobService; 6 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobCreateReqVO;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobExportReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobPageReqVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobUpdateReqVO;
  10 +import cn.iocoder.yudao.module.infra.convert.job.InfJobConvert;
  11 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
  12 +import cn.iocoder.yudao.module.infra.dal.mysql.job.InfJobMapper;
  13 +import cn.iocoder.yudao.module.infra.enums.job.InfJobStatusEnum;
  14 +import cn.iocoder.yudao.module.infra.service.job.InfJobService;
15 import org.quartz.SchedulerException; 15 import org.quartz.SchedulerException;
16 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
17 import org.springframework.transaction.annotation.Transactional; 17 import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +22,7 @@ import java.util.Collection; @@ -22,7 +22,7 @@ import java.util.Collection;
22 import java.util.List; 22 import java.util.List;
23 23
24 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 24 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
25 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.*; 25 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.*;
26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.containsAny; 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.containsAny;
27 27
28 /** 28 /**
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/logger/InfApiAccessLogCoreService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/InfApiAccessLogCoreService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; 3 import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService;
4 4
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/InfApiAccessLogService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/InfApiAccessLogService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/logger/InfApiErrorLogCoreService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/InfApiErrorLogCoreService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; 3 import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
4 4
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/InfApiErrorLogService.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/InfApiErrorLogService.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; 3 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 5 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/logger/impl/InfApiAccessLogCoreServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/impl/InfApiAccessLogCoreServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.logger.impl; 1 +package cn.iocoder.yudao.module.infra.service.logger.impl;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.convert.logger.InfApiAccessLogCoreConvert; 3 import cn.iocoder.yudao.coreservice.modules.infra.convert.logger.InfApiAccessLogCoreConvert;
4 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; 4 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger.impl; 1 +package cn.iocoder.yudao.module.infra.service.logger.impl;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger.InfApiAccessLogMapper;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiAccessLogService; 3 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
  5 +import cn.iocoder.yudao.module.infra.dal.mysql.logger.InfApiAccessLogMapper;
  6 +import cn.iocoder.yudao.module.infra.service.logger.InfApiAccessLogService;
7 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 7 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
8 import cn.iocoder.yudao.framework.common.pojo.PageResult; 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/service/logger/impl/InfApiErrorLogCoreServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/impl/InfApiErrorLogCoreServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.service.logger.impl; 1 +package cn.iocoder.yudao.module.infra.service.logger.impl;
2 2
3 import cn.iocoder.yudao.coreservice.modules.infra.convert.logger.InfApiErrorLogCoreConvert; 3 import cn.iocoder.yudao.coreservice.modules.infra.convert.logger.InfApiErrorLogCoreConvert;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/logger/impl/InfApiErrorLogServiceImpl.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger.impl; 1 +package cn.iocoder.yudao.module.infra.service.logger.impl;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger.InfApiErrorLogMapper;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiErrorLogService; 3 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
  4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
  5 +import cn.iocoder.yudao.module.infra.dal.mysql.logger.InfApiErrorLogMapper;
  6 +import cn.iocoder.yudao.module.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
  7 +import cn.iocoder.yudao.module.infra.service.logger.InfApiErrorLogService;
8 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 8 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
  9 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  11 +import cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants;
10 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
11 import org.springframework.validation.annotation.Validated; 13 import org.springframework.validation.annotation.Validated;
12 14
@@ -14,8 +16,6 @@ import javax.annotation.Resource; @@ -14,8 +16,6 @@ import javax.annotation.Resource;
14 import java.util.Date; 16 import java.util.Date;
15 import java.util.List; 17 import java.util.List;
16 18
17 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;  
18 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED;  
19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20 20
21 /** 21 /**
@@ -44,10 +44,10 @@ public class InfApiErrorLogServiceImpl implements InfApiErrorLogService { @@ -44,10 +44,10 @@ public class InfApiErrorLogServiceImpl implements InfApiErrorLogService {
44 public void updateApiErrorLogProcess(Long id, Integer processStatus, Long processUserId) { 44 public void updateApiErrorLogProcess(Long id, Integer processStatus, Long processUserId) {
45 InfApiErrorLogDO errorLog = apiErrorLogMapper.selectById(id); 45 InfApiErrorLogDO errorLog = apiErrorLogMapper.selectById(id);
46 if (errorLog == null) { 46 if (errorLog == null) {
47 - throw exception(API_ERROR_LOG_NOT_FOUND); 47 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND);
48 } 48 }
49 if (!InfApiErrorLogProcessStatusEnum.INIT.getStatus().equals(errorLog.getProcessStatus())) { 49 if (!InfApiErrorLogProcessStatusEnum.INIT.getStatus().equals(errorLog.getProcessStatus())) {
50 - throw exception(API_ERROR_LOG_PROCESSED); 50 + throw ServiceExceptionUtil.exception(InfErrorCodeConstants.API_ERROR_LOG_PROCESSED);
51 } 51 }
52 // 标记处理 52 // 标记处理
53 apiErrorLogMapper.updateById(InfApiErrorLogDO.builder().id(id).processStatus(processStatus) 53 apiErrorLogMapper.updateById(InfApiErrorLogDO.builder().id(id).processStatus(processStatus)
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/controller/file/vo/InfFileRespVO.java renamed to yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/vo/InfFileRespVO.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.coreservice.modules.infra.controller.file.vo; 1 +package cn.iocoder.yudao.module.infra.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/package-info.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/config/InfConfigServiceTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.config; 1 +package cn.iocoder.yudao.module.infra.service.config;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.config.InfConfigDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config.InfConfigMapper;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;  
12 -import cn.iocoder.yudao.adminserver.modules.infra.mq.producer.config.InfConfigProducer;  
13 -import cn.iocoder.yudao.adminserver.modules.infra.service.config.impl.InfConfigServiceImpl; 6 +import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
  7 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
  8 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO;
  10 +import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO;
  11 +import cn.iocoder.yudao.module.infra.dal.mysql.config.InfConfigMapper;
  12 +import cn.iocoder.yudao.module.infra.enums.config.InfConfigTypeEnum;
  13 +import cn.iocoder.yudao.module.infra.mq.producer.config.InfConfigProducer;
  14 +import cn.iocoder.yudao.module.infra.service.config.impl.InfConfigServiceImpl;
14 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; 15 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 16 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
  17 +import org.junit.jupiter.api.Assertions;
16 import org.junit.jupiter.api.Test; 18 import org.junit.jupiter.api.Test;
17 import org.springframework.boot.test.mock.mockito.MockBean; 19 import org.springframework.boot.test.mock.mockito.MockBean;
18 import org.springframework.context.annotation.Import; 20 import org.springframework.context.annotation.Import;
@@ -22,7 +24,7 @@ import java.util.List; @@ -22,7 +24,7 @@ import java.util.List;
22 import java.util.function.Consumer; 24 import java.util.function.Consumer;
23 25
24 import static cn.hutool.core.util.RandomUtil.randomEle; 26 import static cn.hutool.core.util.RandomUtil.randomEle;
25 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.*; 27 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.*;
26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 28 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
27 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 29 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
28 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 30 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
@@ -50,7 +52,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -50,7 +52,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
50 @Test 52 @Test
51 public void testCreateConfig_success() { 53 public void testCreateConfig_success() {
52 // 准备参数 54 // 准备参数
53 - InfConfigCreateReqVO reqVO = randomPojo(InfConfigCreateReqVO.class); 55 + ConfigCreateReqVO reqVO = randomPojo(ConfigCreateReqVO.class);
54 56
55 // 调用 57 // 调用
56 Long configId = configService.createConfig(reqVO); 58 Long configId = configService.createConfig(reqVO);
@@ -59,7 +61,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -59,7 +61,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
59 // 校验记录的属性是否正确 61 // 校验记录的属性是否正确
60 InfConfigDO config = configMapper.selectById(configId); 62 InfConfigDO config = configMapper.selectById(configId);
61 assertPojoEquals(reqVO, config); 63 assertPojoEquals(reqVO, config);
62 - assertEquals(InfConfigTypeEnum.CUSTOM.getType(), config.getType()); 64 + Assertions.assertEquals(InfConfigTypeEnum.CUSTOM.getType(), config.getType());
63 // 校验调用 65 // 校验调用
64 verify(configProducer, times(1)).sendConfigRefreshMessage(); 66 verify(configProducer, times(1)).sendConfigRefreshMessage();
65 } 67 }
@@ -70,7 +72,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -70,7 +72,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
70 InfConfigDO dbConfig = randomInfConfigDO(); 72 InfConfigDO dbConfig = randomInfConfigDO();
71 configMapper.insert(dbConfig);// @Sql: 先插入出一条存在的数据 73 configMapper.insert(dbConfig);// @Sql: 先插入出一条存在的数据
72 // 准备参数 74 // 准备参数
73 - InfConfigUpdateReqVO reqVO = randomPojo(InfConfigUpdateReqVO.class, o -> { 75 + ConfigUpdateReqVO reqVO = randomPojo(ConfigUpdateReqVO.class, o -> {
74 o.setId(dbConfig.getId()); // 设置更新的 ID 76 o.setId(dbConfig.getId()); // 设置更新的 ID
75 }); 77 });
76 78
@@ -180,7 +182,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -180,7 +182,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
180 // 测试 createTime 不匹配 182 // 测试 createTime 不匹配
181 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1)))); 183 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
182 // 准备参数 184 // 准备参数
183 - InfConfigPageReqVO reqVO = new InfConfigPageReqVO(); 185 + ConfigPageReqVO reqVO = new ConfigPageReqVO();
184 reqVO.setName("艿"); 186 reqVO.setName("艿");
185 reqVO.setKey("nai"); 187 reqVO.setKey("nai");
186 reqVO.setType(InfConfigTypeEnum.SYSTEM.getType()); 188 reqVO.setType(InfConfigTypeEnum.SYSTEM.getType());
@@ -214,7 +216,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -214,7 +216,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
214 // 测试 createTime 不匹配 216 // 测试 createTime 不匹配
215 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1)))); 217 configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
216 // 准备参数 218 // 准备参数
217 - InfConfigExportReqVO reqVO = new InfConfigExportReqVO(); 219 + ConfigExportReqVO reqVO = new ConfigExportReqVO();
218 reqVO.setName("艿"); 220 reqVO.setName("艿");
219 reqVO.setKey("nai"); 221 reqVO.setKey("nai");
220 reqVO.setType(InfConfigTypeEnum.SYSTEM.getType()); 222 reqVO.setType(InfConfigTypeEnum.SYSTEM.getType());
@@ -250,7 +252,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest { @@ -250,7 +252,7 @@ public class InfConfigServiceTest extends BaseDbUnitTest {
250 Consumer<InfConfigDO> consumer = (o) -> { 252 Consumer<InfConfigDO> consumer = (o) -> {
251 o.setType(randomEle(InfConfigTypeEnum.values()).getType()); // 保证 key 的范围 253 o.setType(randomEle(InfConfigTypeEnum.values()).getType()); // 保证 key 的范围
252 }; 254 };
253 - return randomPojo(InfConfigDO.class, ArrayUtils.append(consumer, consumers)); 255 + return RandomUtils.randomPojo(InfConfigDO.class, ArrayUtils.append(consumer, consumers));
254 } 256 }
255 257
256 } 258 }
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/file/InfFileServiceTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/file/InfFileServiceTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.file; 1 +package cn.iocoder.yudao.module.infra.service.file;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.service.file.impl.InfFileServiceImpl; 4 +import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.file.vo.InfFilePageReqVO;
  6 +import cn.iocoder.yudao.module.infra.service.file.impl.InfFileServiceImpl;
6 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO; 7 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.file.InfFileDO;
7 import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper; 8 import cn.iocoder.yudao.coreservice.modules.infra.dal.mysql.file.InfFileCoreMapper;
8 import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties; 9 import cn.iocoder.yudao.coreservice.modules.infra.framework.file.config.FileProperties;
@@ -15,7 +16,6 @@ import org.springframework.context.annotation.Import; @@ -15,7 +16,6 @@ import org.springframework.context.annotation.Import;
15 import javax.annotation.Resource; 16 import javax.annotation.Resource;
16 17
17 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 18 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
18 -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;  
19 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 19 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
20 import static org.junit.jupiter.api.Assertions.assertEquals; 20 import static org.junit.jupiter.api.Assertions.assertEquals;
21 21
@@ -64,7 +64,7 @@ public class InfFileServiceTest extends BaseDbUnitTest { @@ -64,7 +64,7 @@ public class InfFileServiceTest extends BaseDbUnitTest {
64 // 断言 64 // 断言
65 assertEquals(1, pageResult.getTotal()); 65 assertEquals(1, pageResult.getTotal());
66 assertEquals(1, pageResult.getList().size()); 66 assertEquals(1, pageResult.getList().size());
67 - assertPojoEquals(dbFile, pageResult.getList().get(0), "content"); 67 + AssertUtils.assertPojoEquals(dbFile, pageResult.getList().get(0), "content");
68 } 68 }
69 69
70 } 70 }
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/InfJobLogServiceTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/job/InfJobLogServiceTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job; 1 +package cn.iocoder.yudao.module.infra.service.job;
2 2
3 import static cn.hutool.core.util.RandomUtil.randomEle; 3 import static cn.hutool.core.util.RandomUtil.randomEle;
4 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 4 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -19,12 +19,12 @@ import org.springframework.context.annotation.Import; @@ -19,12 +19,12 @@ import org.springframework.context.annotation.Import;
19 19
20 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 20 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
21 import cn.iocoder.yudao.framework.common.pojo.PageResult; 21 import cn.iocoder.yudao.framework.common.pojo.PageResult;
22 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;  
23 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;  
24 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO;  
25 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job.InfJobLogMapper;  
26 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobLogStatusEnum;  
27 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.impl.InfJobLogServiceImpl; 22 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogExportReqVO;
  23 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.InfJobLogPageReqVO;
  24 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobLogDO;
  25 +import cn.iocoder.yudao.module.infra.dal.mysql.job.InfJobLogMapper;
  26 +import cn.iocoder.yudao.module.infra.enums.job.InfJobLogStatusEnum;
  27 +import cn.iocoder.yudao.module.infra.service.job.impl.InfJobLogServiceImpl;
28 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 28 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
29 29
30 /** 30 /**
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/job/InfJobServiceTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/job/InfJobServiceTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.job; 1 +package cn.iocoder.yudao.module.infra.service.job;
2 2
3 import static cn.hutool.core.util.RandomUtil.randomEle; 3 import static cn.hutool.core.util.RandomUtil.randomEle;
4 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_CHANGE_STATUS_EQUALS;  
5 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_CHANGE_STATUS_INVALID;  
6 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_CRON_EXPRESSION_VALID;  
7 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS;  
8 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS;  
9 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; 4 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_CHANGE_STATUS_EQUALS;
  5 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_CHANGE_STATUS_INVALID;
  6 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_CRON_EXPRESSION_VALID;
  7 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS;
  8 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS;
  9 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS;
10 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 10 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
11 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 11 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
12 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 12 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
@@ -31,15 +31,15 @@ import org.springframework.context.annotation.Import; @@ -31,15 +31,15 @@ import org.springframework.context.annotation.Import;
31 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 31 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
32 import cn.iocoder.yudao.framework.common.pojo.PageResult; 32 import cn.iocoder.yudao.framework.common.pojo.PageResult;
33 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager; 33 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
34 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobCreateReqVO;  
35 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExportReqVO;  
36 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobPageReqVO;  
37 -import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;  
38 -import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobConvert;  
39 -import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO;  
40 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.job.InfJobMapper;  
41 -import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobStatusEnum;  
42 -import cn.iocoder.yudao.adminserver.modules.infra.service.job.impl.InfJobServiceImpl; 34 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobCreateReqVO;
  35 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobExportReqVO;
  36 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobPageReqVO;
  37 +import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.InfJobUpdateReqVO;
  38 +import cn.iocoder.yudao.module.infra.convert.job.InfJobConvert;
  39 +import cn.iocoder.yudao.module.infra.dal.dataobject.job.InfJobDO;
  40 +import cn.iocoder.yudao.module.infra.dal.mysql.job.InfJobMapper;
  41 +import cn.iocoder.yudao.module.infra.enums.job.InfJobStatusEnum;
  42 +import cn.iocoder.yudao.module.infra.service.job.impl.InfJobServiceImpl;
43 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 43 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
44 44
45 /** 45 /**
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/logger/InfApiAccessLogServiceImplTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; 4 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;  
10 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger.InfApiAccessLogMapper;  
11 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; 8 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
  9 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
  10 +import cn.iocoder.yudao.module.infra.dal.mysql.logger.InfApiAccessLogMapper;
  11 +import cn.iocoder.yudao.module.infra.service.logger.impl.InfApiAccessLogServiceImpl;
12 import cn.iocoder.yudao.framework.test.core.util.RandomUtils; 12 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
13 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 13 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
14 import org.junit.jupiter.api.Test; 14 import org.junit.jupiter.api.Test;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/service/logger/InfApiErrorLogServiceImplTest.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.modules.infra.service.logger; 1 +package cn.iocoder.yudao.module.infra.service.logger;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.logger.InfApiErrorLogMapper;  
7 -import cn.iocoder.yudao.adminserver.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;  
8 -import cn.iocoder.yudao.adminserver.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; 4 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
  5 +import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
  6 +import cn.iocoder.yudao.module.infra.dal.mysql.logger.InfApiErrorLogMapper;
  7 +import cn.iocoder.yudao.module.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
  8 +import cn.iocoder.yudao.module.infra.service.logger.impl.InfApiErrorLogServiceImpl;
9 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; 9 import cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
10 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 10 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
11 import cn.iocoder.yudao.framework.common.pojo.PageResult; 11 import cn.iocoder.yudao.framework.common.pojo.PageResult;
12 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 12 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
13 import cn.iocoder.yudao.framework.test.core.util.RandomUtils; 13 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
  14 +import org.junit.jupiter.api.Assertions;
14 import org.junit.jupiter.api.Test; 15 import org.junit.jupiter.api.Test;
15 import org.springframework.context.annotation.Import; 16 import org.springframework.context.annotation.Import;
16 17
@@ -18,8 +19,8 @@ import javax.annotation.Resource; @@ -18,8 +19,8 @@ import javax.annotation.Resource;
18 import java.util.Date; 19 import java.util.Date;
19 import java.util.List; 20 import java.util.List;
20 21
21 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;  
22 -import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; 22 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
  23 +import static cn.iocoder.yudao.module.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED;
23 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; 24 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 26 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
@@ -174,9 +175,9 @@ public class InfApiErrorLogServiceImplTest extends BaseDbUnitTest { @@ -174,9 +175,9 @@ public class InfApiErrorLogServiceImplTest extends BaseDbUnitTest {
174 // id 为 first 的 progressStatus 为 DONE ，应该抛出 API_ERROR_LOG_PROCESSED 175 // id 为 first 的 progressStatus 为 DONE ，应该抛出 API_ERROR_LOG_PROCESSED
175 assertServiceException(() -> infApiErrorLogServiceImpl.updateApiErrorLogProcess(firstId, InfApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_PROCESSED); 176 assertServiceException(() -> infApiErrorLogServiceImpl.updateApiErrorLogProcess(firstId, InfApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_PROCESSED);
176 // 验证 progressStatus 是否修改成功 177 // 验证 progressStatus 是否修改成功
177 - assertEquals(InfApiErrorLogProcessStatusEnum.DONE.getStatus(), secondSelect.getProcessStatus()); 178 + Assertions.assertEquals(InfApiErrorLogProcessStatusEnum.DONE.getStatus(), secondSelect.getProcessStatus());
178 // 验证 progressUserId 是否修改成功 179 // 验证 progressUserId 是否修改成功
179 - assertEquals(processUserId, secondSelect.getProcessUserId()); 180 + Assertions.assertEquals(processUserId, secondSelect.getProcessUserId());
180 } 181 }
181 182
182 } 183 }
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/test/BaseDbAndRedisUnitTest.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.test;
  2 +
  3 +import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
  4 +import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
  5 +import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
  6 +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
  7 +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
  8 +import org.redisson.spring.starter.RedissonAutoConfiguration;
  9 +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
  10 +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  11 +import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
  12 +import org.springframework.boot.test.context.SpringBootTest;
  13 +import org.springframework.context.annotation.Import;
  14 +import org.springframework.test.context.ActiveProfiles;
  15 +import org.springframework.test.context.jdbc.Sql;
  16 +
  17 +/**
  18 + * 依赖内存 DB + Redis 的单元测试
  19 + *
  20 + * 相比 {@link BaseDbUnitTest} 来说，额外增加了内存 Redis
  21 + *
  22 + * @author 芋道源码
  23 + */
  24 +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseDbAndRedisUnitTest.Application.class)
  25 +@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
  26 +@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB
  27 +public class BaseDbAndRedisUnitTest {
  28 +
  29 + @Import({
  30 + // DB 配置类
  31 + YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类
  32 + DataSourceAutoConfiguration.class, // Spring DB 自动配置类
  33 + DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类
  34 + DruidDataSourceAutoConfigure.class, // Druid 自动配置类
  35 + // MyBatis 配置类
  36 + YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
  37 + MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
  38 + // Redis 配置类
  39 + RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer
  40 + RedisAutoConfiguration.class, // Spring Redis 自动配置类
  41 + YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类
  42 + RedissonAutoConfiguration.class, // Redisson 自动高配置类
  43 + })
  44 + public static class Application {
  45 + }
  46 +
  47 +}
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/test/BaseDbUnitTest.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.test;
  2 +
  3 +import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
  4 +import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
  5 +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
  6 +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
  7 +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  8 +import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
  9 +import org.springframework.boot.test.context.SpringBootTest;
  10 +import org.springframework.context.annotation.Import;
  11 +import org.springframework.test.context.ActiveProfiles;
  12 +import org.springframework.test.context.jdbc.Sql;
  13 +
  14 +/**
  15 + * 依赖内存 DB 的单元测试
  16 + *
  17 + * 注意，Service 层同样适用。对于 Service 层的单元测试，我们针对自己模块的 Mapper 走的是 H2 内存数据库，针对别的模块的 Service 走的是 Mock 方法
  18 + *
  19 + * @author 芋道源码
  20 + */
  21 +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseDbUnitTest.Application.class)
  22 +@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
  23 +@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB
  24 +public class BaseDbUnitTest {
  25 +
  26 + @Import({
  27 + // DB 配置类
  28 + YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类
  29 + DataSourceAutoConfiguration.class, // Spring DB 自动配置类
  30 + DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类
  31 + DruidDataSourceAutoConfigure.class, // Druid 自动配置类
  32 + // MyBatis 配置类
  33 + YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
  34 + MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
  35 + })
  36 + public static class Application {
  37 + }
  38 +
  39 +}
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/config/QuartzTestConfiguration.java renamed to yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/test/QuartzTestConfiguration.java
  View file @dc11dfc
1 -package cn.iocoder.yudao.adminserver.config; 1 +package cn.iocoder.yudao.module.infra.test;
2 2
3 import org.mockito.Mockito; 3 import org.mockito.Mockito;
4 import org.quartz.Scheduler; 4 import org.quartz.Scheduler;
yudao-module-infra/yudao-module-infra-impl/src/test/java/cn/iocoder/yudao/module/infra/test/RedisTestConfiguration.java 0 → 100644
  View file @dc11dfc
  1 +package cn.iocoder.yudao.module.infra.test;
  2 +
  3 +import com.github.fppt.jedismock.RedisServer;
  4 +import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
  5 +import org.springframework.boot.context.properties.EnableConfigurationProperties;
  6 +import org.springframework.context.annotation.Bean;
  7 +import org.springframework.context.annotation.Configuration;
  8 +import org.springframework.context.annotation.Lazy;
  9 +
  10 +import java.io.IOException;
  11 +
  12 +@Configuration(proxyBeanMethods = false)
  13 +@Lazy(false) // 禁止延迟加载
  14 +@EnableConfigurationProperties(RedisProperties.class)
  15 +public class RedisTestConfiguration {
  16 +
  17 + /**
  18 + * 创建模拟的 Redis Server 服务器
  19 + */
  20 + @Bean
  21 + public RedisServer redisServer(RedisProperties properties) throws IOException {
  22 + RedisServer redisServer = new RedisServer(properties.getPort());
  23 + // TODO 芋艿：一次执行多个单元测试时，貌似创建多个 spring 容器，导致不进行 stop。这样，就导致端口被占用，无法启动。。。
  24 + try {
  25 + redisServer.start();
  26 + } catch (Exception ignore) {}
  27 + return redisServer;
  28 + }
  29 +
  30 +}
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java
  View file @dc11dfc
@@ -14,8 +14,7 @@ public interface DictTypeConstants { @@ -14,8 +14,7 @@ public interface DictTypeConstants {
14 String OPERATE_TYPE = "sys_operate_type"; // 操作类型 14 String OPERATE_TYPE = "sys_operate_type"; // 操作类型
15 String LOGIN_TYPE = "sys_login_type"; // 登录日志的类型 15 String LOGIN_TYPE = "sys_login_type"; // 登录日志的类型
16 String LOGIN_RESULT = "sys_login_result"; // 登录结果 16 String LOGIN_RESULT = "sys_login_result"; // 登录结果
17 - String CONFIG_TYPE = "sys_config_type"; // 参数配置类型  
18 - String BOOLEAN_STRING = "sys_boolean_string"; // Boolean 是否类型 17 +
19 18
20 String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码 19 String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码
21 String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型 20 String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型