BJ_ZTEITS-Developers / parking-cloud-yudao

Commit cf4eeab3954991885d1b8f01e438b0e5f24d1a81

Authored by YunaiV
1 parent 20066bc8

项目结构调整 x 16 : 将 monitor、sms、dict 等组件拆分出去

Inline Side-by-side
Showing 304 changed files with 781 additions and 541 deletions
@@ -11,6 +11,11 @@ @@ -11,6 +11,11 @@
11 <module>yudao-dependencies</module> 11 <module>yudao-dependencies</module>
12 <module>yudao-framework</module> 12 <module>yudao-framework</module>
13 <module>yudao-admin-server</module> 13 <module>yudao-admin-server</module>
  14 + <module>yudao-spring-boot-starter-job</module>
  15 + <module>yudao-spring-boot-starter-config</module>
  16 + <module>yudao-spring-boot-starter-test</module>
  17 + <module>yudao-spring-boot-starter-biz-sms</module>
  18 + <module>yudao-spring-boot-starter-excel</module>
14 </modules> 19 </modules>
15 20
16 <name>${artifactId}</name> 21 <name>${artifactId}</name>
yudao-admin-server/pom.xml
  View file @cf4eeab
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
17 <url>https://github.com/YunaiV/ruoyi-vue-pro</url> 17 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
18 18
19 <dependencies> 19 <dependencies>
  20 + <!-- 业务组件 -->
20 <dependency> 21 <dependency>
21 <groupId>cn.iocoder.boot</groupId> 22 <groupId>cn.iocoder.boot</groupId>
22 - <artifactId>yudao-framework-all</artifactId>  
23 - <version>${revision}</version> 23 + <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
24 </dependency> 24 </dependency>
25 25
26 <!-- Web 相关 --> 26 <!-- Web 相关 -->
@@ -40,35 +40,33 @@ @@ -40,35 +40,33 @@
40 <artifactId>yudao-spring-boot-starter-mybatis</artifactId> 40 <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
41 </dependency> 41 </dependency>
42 42
43 - <!-- Test 测试相关 --> 43 + <!-- 监控相关 -->
44 <dependency> 44 <dependency>
45 - <groupId>org.springframework.boot</groupId>  
46 - <artifactId>spring-boot-starter-test</artifactId>  
47 - <scope>test</scope> 45 + <groupId>cn.iocoder.boot</groupId>
  46 + <artifactId>yudao-spring-boot-starter-monitor</artifactId>
48 </dependency> 47 </dependency>
49 48
50 <dependency> 49 <dependency>
51 - <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 -->  
52 - <artifactId>h2</artifactId>  
53 - <scope>test</scope> 50 + <groupId>de.codecentric</groupId>
  51 + <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
54 </dependency> 52 </dependency>
55 53
  54 + <!-- Test 测试相关 -->
56 <dependency> 55 <dependency>
57 - <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 -->  
58 - <artifactId>jedis-mock</artifactId> 56 + <groupId>cn.iocoder.boot</groupId>
  57 + <artifactId>yudao-spring-boot-starter-test</artifactId>
59 <scope>test</scope> 58 <scope>test</scope>
60 </dependency> 59 </dependency>
61 60
  61 + <!-- 工具类相关 -->
62 <dependency> 62 <dependency>
63 - <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 -->  
64 - <artifactId>podam</artifactId>  
65 - <scope>test</scope> 63 + <groupId>org.apache.velocity</groupId>
  64 + <artifactId>velocity-engine-core</artifactId>
66 </dependency> 65 </dependency>
67 66
68 - <!-- 工具类相关 -->  
69 <dependency> 67 <dependency>
70 - <groupId>cn.iocoder.boot</groupId>  
71 - <artifactId>yudao-spring-boot-starter-operatelog</artifactId> 68 + <groupId>cn.smallbun.screw</groupId>
  69 + <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
72 </dependency> 70 </dependency>
73 71
74 </dependencies> 72 </dependencies>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md
  View file @cf4eeab
yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/package-info.java 0 → 100644
  View file @cf4eeab
  1 +/**
  2 + * 属于整个 yudao-admin-server 的 framework 封装
  3 + *
  4 + * @author 芋道源码
  5 + */
  6 +package cn.iocoder.dashboard.framework;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config;
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.dashboard.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.dashboard.modules.infra.controller.config.vo.*; 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.*;
8 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert; 8 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.config.vo; 1 package cn.iocoder.dashboard.modules.infra.controller.config.vo;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel("参数配置导出 Request VO") 12 @ApiModel("参数配置导出 Request VO")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("参数配置分页 Request VO") 15 @ApiModel("参数配置分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.doc; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.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;
5 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 5 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
6 import cn.smallbun.screw.core.Configuration; 6 import cn.smallbun.screw.core.Configuration;
7 import cn.smallbun.screw.core.engine.EngineConfig; 7 import cn.smallbun.screw.core.engine.EngineConfig;
8 import cn.smallbun.screw.core.engine.EngineFileType; 8 import cn.smallbun.screw.core.engine.EngineFileType;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java
  View file @cf4eeab
@@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; @@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO;
8 import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert; 8 import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert;
9 import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; 9 import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO;
10 import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; 10 import cn.iocoder.dashboard.modules.infra.service.file.InfFileService;
11 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 11 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
12 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiImplicitParam; 13 import io.swagger.annotations.ApiImplicitParam;
14 import io.swagger.annotations.ApiImplicitParams; 14 import io.swagger.annotations.ApiImplicitParams;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("文件分页 Request VO") 15 @ApiModel("文件分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.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.dashboard.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.dashboard.framework.quartz.core.util.CronUtils; 7 import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils;
8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*; 8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.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.dashboard.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.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; 7 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO;
8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; 8 import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; 1 package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 import javax.validation.constraints.NotNull; 7 import javax.validation.constraints.NotNull;
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 /** 12 /**
13 * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用 13 * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; 1 package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的") 12 @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("定时任务日志分页 Request VO") 15 @ApiModel("定时任务日志分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger;
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.dashboard.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.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; 7 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
8 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; 8 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger;
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.dashboard.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.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; 7 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
8 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; 8 import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 import javax.validation.constraints.NotNull; 7 import javax.validation.constraints.NotNull;
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 /** 12 /**
13 * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用 13 * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; 1 package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的") 12 @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("API 访问日志分页 Request VO") 15 @ApiModel("API 访问日志分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 import javax.validation.constraints.NotNull; 7 import javax.validation.constraints.NotNull;
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 /** 12 /**
13 * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用 13 * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; 1 package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants;
6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的") 12 @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("API 错误日志分页 Request VO") 15 @ApiModel("API 错误日志分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.redis; 1 package cn.iocoder.dashboard.modules.infra.controller.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.dashboard.framework.redis.core.RedisKeyDefine;  
5 -import cn.iocoder.dashboard.framework.redis.core.RedisKeyRegistry; 4 +import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
  5 +import cn.iocoder.yudao.framework.redis.core.RedisKeyRegistry;
6 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO; 6 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
7 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO; 7 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
8 import cn.iocoder.dashboard.modules.infra.convert.redis.RedisConvert; 8 import cn.iocoder.dashboard.modules.infra.convert.redis.RedisConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.controller.redis.vo; 1 package cn.iocoder.dashboard.modules.infra.controller.redis.vo;
2 2
3 -import cn.iocoder.dashboard.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;
5 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
6 import lombok.AllArgsConstructor; 6 import lombok.AllArgsConstructor;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.convert.redis; 1 package cn.iocoder.dashboard.modules.infra.convert.redis;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 -import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; 4 +import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
5 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO; 5 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
6 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO; 6 import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.mq.consumer.config; 1 package cn.iocoder.dashboard.modules.infra.mq.consumer.config;
2 2
3 import cn.iocoder.dashboard.framework.apollo.internals.DBConfigRepository; 3 import cn.iocoder.dashboard.framework.apollo.internals.DBConfigRepository;
4 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 4 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
5 import cn.iocoder.dashboard.modules.infra.mq.message.config.InfConfigRefreshMessage; 5 import cn.iocoder.dashboard.modules.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;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.mq.message.config; 1 package cn.iocoder.dashboard.modules.infra.mq.message.config;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.infra.mq.producer.config; 1 package cn.iocoder.dashboard.modules.infra.mq.producer.config;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.infra.mq.message.config.InfConfigRefreshMessage; 4 import cn.iocoder.dashboard.modules.infra.mq.message.config.InfConfigRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java
  View file @cf4eeab
@@ -23,7 +23,7 @@ import java.util.List; @@ -23,7 +23,7 @@ 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.dashboard.modules.infra.enums.InfErrorCodeConstants.*; 25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*;
26 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.containsAny; 26 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.containsAny;
27 27
28 /** 28 /**
29 * 定时任务 Service 实现类 29 * 定时任务 Service 实现类
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
  View file @cf4eeab
@@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService;
16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
17 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; 17 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
19 -import cn.iocoder.yudao.framework.util.collection.SetUtils; 19 +import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
20 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
21 import io.swagger.annotations.ApiOperation; 21 import io.swagger.annotations.ApiOperation;
22 import org.springframework.validation.annotation.Validated; 22 import org.springframework.validation.annotation.Validated;
@@ -29,8 +29,8 @@ import java.util.List; @@ -29,8 +29,8 @@ import java.util.List;
29 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 29 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
30 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; 30 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
31 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; 31 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds;
32 -import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP;  
33 -import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getUserAgent; 32 +import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
  33 +import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getUserAgent;
34 34
35 @Api(tags = "认证") 35 @Api(tags = "认证")
36 @RestController 36 @RestController
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java
  View file @cf4eeab
@@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
11 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; 11 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
12 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; 12 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
13 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 13 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
14 -import cn.iocoder.yudao.framework.util.collection.MapUtils; 14 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
15 import io.swagger.annotations.Api; 15 import io.swagger.annotations.Api;
16 import io.swagger.annotations.ApiImplicitParam; 16 import io.swagger.annotations.ApiImplicitParam;
17 import io.swagger.annotations.ApiOperation; 17 import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,7 @@ import java.util.List; @@ -25,7 +25,7 @@ import java.util.List;
25 import java.util.Map; 25 import java.util.Map;
26 26
27 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 27 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
28 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertList; 28 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
29 29
30 @Api(tags = "用户 Session") 30 @Api(tags = "用户 Session")
31 @RestController 31 @RestController
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dept; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dept;
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.dashboard.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.dashboard.modules.system.controller.dept.vo.post.*; 8 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
9 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert; 9 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; 1 package cn.iocoder.dashboard.modules.system.controller.dept.vo.post;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict;
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.dashboard.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.dashboard.modules.system.controller.dict.vo.data.*; 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
8 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert; 8 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict;
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.dashboard.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.dashboard.modules.system.controller.dict.vo.type.*; 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
8 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert; 8 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; 1 package cn.iocoder.dashboard.modules.system.controller.dict.vo.data;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; 1 package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel("字典类型分页列表 Request VO") 12 @ApiModel("字典类型分页列表 Request VO")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 import javax.validation.constraints.Size; 10 import javax.validation.constraints.Size;
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("字典类型分页列表 Request VO") 15 @ApiModel("字典类型分页列表 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode;
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.dashboard.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.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; 7 import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert;
8 import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.*; 8 import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.*;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; 1 package cn.iocoder.dashboard.modules.system.controller.errorcode.vo;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") 12 @ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("错误码分页 Request VO") 15 @ApiModel("错误码分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger;
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.dashboard.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.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO;
8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger;
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.dashboard.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.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO;
8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
@@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO
13 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; 13 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
14 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; 14 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
15 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 15 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
16 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
17 -import cn.iocoder.yudao.framework.util.collection.MapUtils; 16 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  17 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
18 import io.swagger.annotations.Api; 18 import io.swagger.annotations.Api;
19 import io.swagger.annotations.ApiOperation; 19 import io.swagger.annotations.ApiOperation;
20 import org.springframework.security.access.prepost.PreAuthorize; 20 import org.springframework.security.access.prepost.PreAuthorize;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; 1 package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel("登陆日志分页列表 Request VO") 12 @ApiModel("登陆日志分页列表 Request VO")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java
  View file @cf4eeab
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
9 9
10 import java.util.Date; 10 import java.util.Date;
11 11
12 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13
14 @ApiModel("登陆日志分页列表 Request VO") 14 @ApiModel("登陆日志分页列表 Request VO")
15 @Data 15 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; 1 package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel("操作日志分页列表 Request VO") 12 @ApiModel("操作日志分页列表 Request VO")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java
  View file @cf4eeab
@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
8 8
9 import java.util.Date; 9 import java.util.Date;
10 10
11 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 11 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
12 12
13 @ApiModel("操作日志分页列表 Request VO") 13 @ApiModel("操作日志分页列表 Request VO")
14 @Data 14 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission;
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.dashboard.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.dashboard.modules.system.controller.permission.vo.role.*; 8 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
9 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert; 9 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; 1 package cn.iocoder.dashboard.modules.system.controller.permission.vo.role;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel("角色分页 Request VO") 12 @ApiModel("角色分页 Request VO")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java
  View file @cf4eeab
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
9 9
10 import java.util.Date; 10 import java.util.Date;
11 11
12 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13
14 @ApiModel("角色分页 Request VO") 14 @ApiModel("角色分页 Request VO")
15 @Data 15 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms;
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.dashboard.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.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; 7 import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO;
8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms;
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.dashboard.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.dashboard.modules.system.controller.sms.vo.template.*; 7 import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*;
8 import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsTemplateConvert; 8 import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsTemplateConvert;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("短信渠道分页 Request VO") 15 @ApiModel("短信渠道分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; 1 package cn.iocoder.dashboard.modules.system.controller.sms.vo.log;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;  
5 -import cn.iocoder.dashboard.framework.excel.core.convert.JsonConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
  5 +import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert;
6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 8 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "短信日志 Excel 导出 Request VO", description = "参数和 SysSmsLogPageReqVO 是一致的") 12 @ApiModel(value = "短信日志 Excel 导出 Request VO", description = "参数和 SysSmsLogPageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("短信日志分页 Request VO") 15 @ApiModel("短信日志分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; 1 package cn.iocoder.dashboard.modules.system.controller.sms.vo.template;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "短信模板 Excel 导出 Request VO", description = "参数和 SysSmsTemplatePageReqVO 是一致的") 12 @ApiModel(value = "短信模板 Excel 导出 Request VO", description = "参数和 SysSmsTemplatePageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("短信模板分页 Request VO") 15 @ApiModel("短信模板分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
  View file @cf4eeab
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 -import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; 7 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
8 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 8 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
9 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; 9 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
10 import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert; 10 import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert;
@@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
13 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; 13 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
14 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; 14 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
15 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 15 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
16 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
17 -import cn.iocoder.yudao.framework.util.collection.MapUtils; 16 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  17 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
18 import io.swagger.annotations.Api; 18 import io.swagger.annotations.Api;
19 import io.swagger.annotations.ApiImplicitParam; 19 import io.swagger.annotations.ApiImplicitParam;
20 import io.swagger.annotations.ApiImplicitParams; 20 import io.swagger.annotations.ApiImplicitParams;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.user.vo.user; 1 package cn.iocoder.dashboard.modules.system.controller.user.vo.user;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java
  View file @cf4eeab
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
9 9
10 import java.util.Date; 10 import java.util.Date;
11 11
12 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13
14 @ApiModel(value = "用户导出 Request VO", description = "参数和 SysUserPageReqVO 是一致的") 14 @ApiModel(value = "用户导出 Request VO", description = "参数和 SysUserPageReqVO 是一致的")
15 @Data 15 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.controller.user.vo.user; 1 package cn.iocoder.dashboard.modules.system.controller.user.vo.user;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 5 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.AllArgsConstructor; 7 import lombok.AllArgsConstructor;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java
  View file @cf4eeab
@@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
11 11
12 import java.util.Date; 12 import java.util.Date;
13 13
14 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 14 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
15 15
16 @ApiModel("用户分页 Request VO") 16 @ApiModel("用户分页 Request VO")
17 @Data 17 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
  View file @cf4eeab
@@ -9,7 +9,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; @@ -9,7 +9,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
9 import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; 9 import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
10 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; 10 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
11 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum; 11 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum;
12 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 12 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
13 import org.mapstruct.Mapper; 13 import org.mapstruct.Mapper;
14 import org.mapstruct.Mapping; 14 import org.mapstruct.Mapping;
15 import org.mapstruct.factory.Mappers; 15 import org.mapstruct.factory.Mappers;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.convert.dict; 1 package cn.iocoder.dashboard.modules.system.convert.dict;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; 4 +import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
5 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; 5 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
6 import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; 6 import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java
  View file @cf4eeab
@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp
6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO;
7 import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; 7 import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
8 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; 8 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
9 -import cn.iocoder.yudao.framework.util.collection.MapUtils; 9 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
10 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
11 import org.mapstruct.factory.Mappers; 11 import org.mapstruct.factory.Mappers;
12 12
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.dal.redis; 1 package cn.iocoder.dashboard.modules.system.dal.redis;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; 3 +import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
4 import cn.iocoder.yudao.framework.security.core.LoginUser; 4 import cn.iocoder.yudao.framework.security.core.LoginUser;
5 5
6 -import static cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; 6 +import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING;
7 7
8 /** 8 /**
9 * System Redis Key 枚举类 9 * System Redis Key 枚举类
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.redis.auth; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.redis.auth;
2 2
3 import cn.iocoder.yudao.framework.security.core.LoginUser; 3 import cn.iocoder.yudao.framework.security.core.LoginUser;
4 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; 4 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
5 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 5 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
6 import org.springframework.data.redis.core.StringRedisTemplate; 6 import org.springframework.data.redis.core.StringRedisTemplate;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
8 8
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.dept; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.dept;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.dept.SysDeptRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.dept.SysDeptRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; 5 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.dict; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.dict;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.dict.SysDictDataRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.dict.SysDictDataRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService; 5 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.mail; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.mail;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.stream.AbstractStreamMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.stream.AbstractStreamMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.mail.SysMailSendMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.mail.SysMailSendMessage;
5 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysMenuRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysMenuRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; 5 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleMenuRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleMenuRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 5 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; 5 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsChannelService; 5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsChannelService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.stream.AbstractStreamMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.stream.AbstractStreamMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage;
5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; 5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms; 1 package cn.iocoder.dashboard.modules.system.mq.consumer.sms;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsTemplateRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsTemplateRefreshMessage;
5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsTemplateService; 5 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsTemplateService;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.dept; 1 package cn.iocoder.dashboard.modules.system.mq.message.dept;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.dict; 1 package cn.iocoder.dashboard.modules.system.mq.message.dict;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.mail; 1 package cn.iocoder.dashboard.modules.system.mq.message.mail;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage; 3 +import cn.iocoder.yudao.framework.redis.core.stream.StreamMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.permission; 1 package cn.iocoder.dashboard.modules.system.mq.message.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.permission; 1 package cn.iocoder.dashboard.modules.system.mq.message.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.permission; 1 package cn.iocoder.dashboard.modules.system.mq.message.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.sms; 1 package cn.iocoder.dashboard.modules.system.mq.message.sms;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.sms; 1 package cn.iocoder.dashboard.modules.system.mq.message.sms;
2 2
3 import cn.iocoder.yudao.framework.common.core.KeyValue; 3 import cn.iocoder.yudao.framework.common.core.KeyValue;
4 -import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage; 4 +import cn.iocoder.yudao.framework.redis.core.stream.StreamMessage;
5 import lombok.Data; 5 import lombok.Data;
6 6
7 import javax.validation.constraints.NotNull; 7 import javax.validation.constraints.NotNull;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.message.sms; 1 package cn.iocoder.dashboard.modules.system.mq.message.sms;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.dept; 1 package cn.iocoder.dashboard.modules.system.mq.producer.dept;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.system.mq.message.dept.SysDeptRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.dept.SysDeptRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.dict; 1 package cn.iocoder.dashboard.modules.system.mq.producer.dict;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.system.mq.message.dict.SysDictDataRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.dict.SysDictDataRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.producer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysMenuRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysMenuRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.producer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleMenuRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleMenuRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.permission; 1 package cn.iocoder.dashboard.modules.system.mq.producer.permission;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 3 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleRefreshMessage; 4 import cn.iocoder.dashboard.modules.system.mq.message.permission.SysRoleRefreshMessage;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.mq.producer.sms; 1 package cn.iocoder.dashboard.modules.system.mq.producer.sms;
2 2
3 import cn.iocoder.yudao.framework.common.core.KeyValue; 3 import cn.iocoder.yudao.framework.common.core.KeyValue;
4 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 4 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
5 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage; 5 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage;
6 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; 6 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage;
7 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsTemplateRefreshMessage; 7 import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsTemplateRefreshMessage;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl;
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.security.core.LoginUser; 5 import cn.iocoder.yudao.framework.security.core.LoginUser;
6 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 6 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
7 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; 7 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO;
8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
9 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert; 9 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert;
@@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService;
16 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; 16 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
17 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 17 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
19 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 19 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
20 import lombok.extern.slf4j.Slf4j; 20 import lombok.extern.slf4j.Slf4j;
21 import org.springframework.security.authentication.AuthenticationManager; 21 import org.springframework.security.authentication.AuthenticationManager;
22 import org.springframework.security.authentication.BadCredentialsException; 22 import org.springframework.security.authentication.BadCredentialsException;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java
  View file @cf4eeab
@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.security.config.SecurityProperties; 7 import cn.iocoder.yudao.framework.security.config.SecurityProperties;
8 import cn.iocoder.yudao.framework.security.core.LoginUser; 8 import cn.iocoder.yudao.framework.security.core.LoginUser;
9 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 9 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
10 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; 10 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
11 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; 11 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
12 import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; 12 import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
@@ -26,8 +26,8 @@ import java.time.Duration; @@ -26,8 +26,8 @@ import java.time.Duration;
26 import java.util.*; 26 import java.util.*;
27 import java.util.stream.Collectors; 27 import java.util.stream.Collectors;
28 28
29 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertSet;  
30 -import static cn.iocoder.yudao.framework.util.date.DateUtils.addTime; 29 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  30 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime;
31 31
32 /** 32 /**
33 * 在线用户 Session Service 实现类 33 * 在线用户 Session Service 实现类
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java
  View file @cf4eeab
@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate
5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
7 import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; 7 import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
8 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 9
10 import java.util.Collection; 10 import java.util.Collection;
11 import java.util.Collections; 11 import java.util.Collections;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java
  View file @cf4eeab
@@ -12,7 +12,7 @@ import org.springframework.lang.Nullable; @@ -12,7 +12,7 @@ import org.springframework.lang.Nullable;
12 import java.util.Collection; 12 import java.util.Collection;
13 import java.util.List; 13 import java.util.List;
14 14
15 -import static cn.iocoder.yudao.framework.util.collection.SetUtils.asSet; 15 +import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
16 16
17 /** 17 /**
18 * 岗位 Service 接口 18 * 岗位 Service 接口
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.system.service.dict; 1 package cn.iocoder.dashboard.modules.system.service.dict;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService; 4 +import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService;
5 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; 5 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO;
6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO; 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.dict.impl; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.dict.impl;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; 6 +import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
7 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 7 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
8 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO;
9 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; 9 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java
  View file @cf4eeab
@@ -26,8 +26,8 @@ import java.util.Map; @@ -26,8 +26,8 @@ import java.util.Map;
26 26
27 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 27 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; 28 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
29 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertMap;  
30 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertSet; 29 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  30 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
31 31
32 /** 32 /**
33 * 错误码 Service 实现类 33 * 错误码 Service 实现类
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java
  View file @cf4eeab
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
12 import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; 12 import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper;
13 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; 13 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
15 -import cn.iocoder.yudao.framework.util.string.StrUtils; 15 +import cn.iocoder.yudao.framework.common.util.string.StrUtils;
16 import lombok.extern.slf4j.Slf4j; 16 import lombok.extern.slf4j.Slf4j;
17 import org.springframework.scheduling.annotation.Async; 17 import org.springframework.scheduling.annotation.Async;
18 import org.springframework.scheduling.annotation.AsyncResult; 18 import org.springframework.scheduling.annotation.AsyncResult;
@@ -26,7 +26,7 @@ import java.util.concurrent.Future; @@ -26,7 +26,7 @@ import java.util.concurrent.Future;
26 26
27 import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; 27 import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH;
28 import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH; 28 import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH;
29 -import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertSet; 29 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
30 30
31 @Service 31 @Service
32 @Slf4j 32 @Slf4j
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
  View file @cf4eeab
@@ -14,7 +14,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; @@ -14,7 +14,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; 14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer;
15 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; 15 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
17 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 17 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
18 import com.google.common.annotations.VisibleForTesting; 18 import com.google.common.annotations.VisibleForTesting;
19 import com.google.common.collect.ImmutableMap; 19 import com.google.common.collect.ImmutableMap;
20 import com.google.common.collect.ImmutableMultimap; 20 import com.google.common.collect.ImmutableMultimap;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
  View file @cf4eeab
@@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysPermissionP @@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysPermissionP
14 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; 14 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
15 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 15 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
16 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; 16 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
17 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
18 -import cn.iocoder.yudao.framework.util.collection.MapUtils; 17 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  18 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
19 import com.google.common.collect.ImmutableMultimap; 19 import com.google.common.collect.ImmutableMultimap;
20 import com.google.common.collect.Multimap; 20 import com.google.common.collect.Multimap;
21 import com.google.common.collect.Sets; 21 import com.google.common.collect.Sets;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java
  View file @cf4eeab
@@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserImport @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserImport
11 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO; 11 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO;
12 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO; 12 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO;
13 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; 13 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
14 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 14 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
15 15
16 import java.io.InputStream; 16 import java.io.InputStream;
17 import java.util.Collection; 17 import java.util.Collection;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
  View file @cf4eeab
@@ -19,7 +19,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.user.SysUserMapper; @@ -19,7 +19,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.user.SysUserMapper;
19 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; 19 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
20 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; 20 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
21 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 21 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
22 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 22 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
23 import com.google.common.annotations.VisibleForTesting; 23 import com.google.common.annotations.VisibleForTesting;
24 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
25 import org.springframework.beans.factory.annotation.Value; 25 import org.springframework.beans.factory.annotation.Value;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java
  View file @cf4eeab
@@ -15,8 +15,8 @@ import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColum @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColum
15 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; 15 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
16 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO; 16 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
17 import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; 17 import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService;
18 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
19 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 18 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  19 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
20 import io.swagger.annotations.Api; 20 import io.swagger.annotations.Api;
21 import io.swagger.annotations.ApiImplicitParam; 21 import io.swagger.annotations.ApiImplicitParam;
22 import io.swagger.annotations.ApiImplicitParams; 22 import io.swagger.annotations.ApiImplicitParams;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("表定义分页 Request VO") 15 @ApiModel("表定义分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
  View file @cf4eeab
@@ -3,9 +3,9 @@ package cn.iocoder.dashboard.modules.tool.controller.test; @@ -3,9 +3,9 @@ package cn.iocoder.dashboard.modules.tool.controller.test;
3 import cn.hutool.core.thread.ThreadUtil; 3 import cn.hutool.core.thread.ThreadUtil;
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.dashboard.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.dashboard.framework.tracer.core.annotation.BizTrace; 8 +import cn.iocoder.yudao.framework.tracer.core.annotation.BizTrace;
9 import cn.iocoder.dashboard.modules.tool.controller.test.vo.*; 9 import cn.iocoder.dashboard.modules.tool.controller.test.vo.*;
10 import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert; 10 import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert;
11 import cn.iocoder.dashboard.modules.tool.dal.dataobject.test.ToolTestDemoDO; 11 import cn.iocoder.dashboard.modules.tool.dal.dataobject.test.ToolTestDemoDO;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.modules.tool.controller.test.vo; 1 package cn.iocoder.dashboard.modules.tool.controller.test.vo;
2 2
3 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; 3 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  4 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants;
6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; 6 import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
7 7
8 import java.util.Date; 8 import java.util.Date;
9 9
10 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 10 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 11
12 @ApiModel(value = "字典类型 Excel 导出 Request VO", description = "参数和 ToolTestDemoPageReqVO 是一致的") 12 @ApiModel(value = "字典类型 Excel 导出 Request VO", description = "参数和 ToolTestDemoPageReqVO 是一致的")
13 @Data 13 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
10 10
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 13 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14 14
15 @ApiModel("字典类型分页 Request VO") 15 @ApiModel("字典类型分页 Request VO")
16 @Data 16 @Data
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java
  View file @cf4eeab
@@ -44,7 +44,7 @@ public class ToolTestDemoDO extends BaseDO { @@ -44,7 +44,7 @@ public class ToolTestDemoDO extends BaseDO {
44 /** 44 /**
45 * 分类 45 * 分类
46 * 46 *
47 - * 枚举 {@link cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.TimeoutTypeEnum} 47 + * 枚举 {@link cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.TimeoutTypeEnum}
48 */ 48 */
49 private Integer category; 49 private Integer category;
50 /** 50 /**
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO; 4 import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO;
5 import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService; 5 import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
6 -import cn.iocoder.yudao.framework.util.date.DateUtils; 6 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
7 import lombok.RequiredArgsConstructor; 7 import lombok.RequiredArgsConstructor;
8 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
9 import org.springframework.boot.context.event.ApplicationReadyEvent; 9 import org.springframework.boot.context.event.ApplicationReadyEvent;
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
  View file @cf4eeab
@@ -10,9 +10,9 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -10,9 +10,9 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 import cn.iocoder.yudao.framework.common.pojo.PageParam; 10 import cn.iocoder.yudao.framework.common.pojo.PageParam;
11 import cn.iocoder.yudao.framework.common.pojo.PageResult; 11 import cn.iocoder.yudao.framework.common.pojo.PageResult;
12 import cn.iocoder.dashboard.modules.system.framework.codegen.config.CodegenProperties; 12 import cn.iocoder.dashboard.modules.system.framework.codegen.config.CodegenProperties;
13 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;  
14 -import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;  
15 -import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; 13 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
  14 +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
  15 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
16 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 16 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
17 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; 17 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum;
18 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 18 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -20,8 +20,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -20,8 +20,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
20 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 20 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
21 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; 21 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
22 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; 22 import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
23 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
24 -import cn.iocoder.yudao.framework.util.date.DateUtils; 23 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  24 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
25 import com.google.common.collect.Maps; 25 import com.google.common.collect.Maps;
26 import org.springframework.stereotype.Component; 26 import org.springframework.stereotype.Component;
27 27
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
  View file @cf4eeab
@@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaColumnMappe @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaColumnMappe
16 import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper; 16 import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper;
17 import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenImportTypeEnum; 17 import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenImportTypeEnum;
18 import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; 18 import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService;
19 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 19 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
20 import org.apache.commons.collections4.KeyValue; 20 import org.apache.commons.collections4.KeyValue;
21 import org.springframework.stereotype.Service; 21 import org.springframework.stereotype.Service;
22 import org.springframework.transaction.annotation.Transactional; 22 import org.springframework.transaction.annotation.Transactional;
yudao-admin-server/src/main/resources/logback-spring.xml renamed to yudao-admin-server/src/main/resources/1logback-spring.xml
  View file @cf4eeab
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.dashboard; @@ -2,7 +2,7 @@ package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.yudao.framework.datasource.config.DataSourceConfiguration; 3 import cn.iocoder.yudao.framework.datasource.config.DataSourceConfiguration;
4 import cn.iocoder.yudao.framework.mybatis.config.MybatisConfiguration; 4 import cn.iocoder.yudao.framework.mybatis.config.MybatisConfiguration;
5 -import cn.iocoder.dashboard.framework.redis.config.RedisConfig; 5 +import cn.iocoder.yudao.framework.redis.config.RedisConfig;
6 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; 6 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
7 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; 7 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
8 import org.redisson.spring.starter.RedissonAutoConfiguration; 8 import org.redisson.spring.starter.RedissonAutoConfiguration;
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java
  View file @cf4eeab
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 -import cn.iocoder.dashboard.framework.redis.config.RedisConfig; 3 +import cn.iocoder.yudao.framework.redis.config.RedisConfig;
4 import org.redisson.spring.starter.RedissonAutoConfiguration; 4 import org.redisson.spring.starter.RedissonAutoConfiguration;
5 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; 5 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
6 import org.springframework.boot.test.context.SpringBootTest; 6 import org.springframework.boot.test.context.SpringBootTest;
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.stream; 1 +package cn.iocoder.yudao.framework.redis.core.stream;
2 2
3 import cn.hutool.core.thread.ThreadUtil; 3 import cn.hutool.core.thread.ThreadUtil;
4 import cn.iocoder.dashboard.BaseRedisIntegrationTest; 4 import cn.iocoder.dashboard.BaseRedisIntegrationTest;
5 -import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; 5 +import cn.iocoder.yudao.framework.redis.core.util.RedisMessageUtils;
6 import cn.iocoder.dashboard.modules.system.mq.consumer.mail.SysMailSendConsumer; 6 import cn.iocoder.dashboard.modules.system.mq.consumer.mail.SysMailSendConsumer;
7 import cn.iocoder.dashboard.modules.system.mq.consumer.sms.SysSmsSendConsumer; 7 import cn.iocoder.dashboard.modules.system.mq.consumer.sms.SysSmsSendConsumer;
8 import cn.iocoder.dashboard.modules.system.mq.message.mail.SysMailSendMessage; 8 import cn.iocoder.dashboard.modules.system.mq.message.mail.SysMailSendMessage;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java
  View file @cf4eeab
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.dashboard.config.RedisTestConfiguration; 3 import cn.iocoder.dashboard.config.RedisTestConfiguration;
4 -import cn.iocoder.dashboard.framework.redis.config.RedisConfig; 4 +import cn.iocoder.yudao.framework.redis.config.RedisConfig;
5 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; 5 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
6 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; 6 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
7 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; 7 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java
  View file @cf4eeab
1 package cn.iocoder.dashboard; 1 package cn.iocoder.dashboard;
2 2
3 import cn.iocoder.dashboard.config.RedisTestConfiguration; 3 import cn.iocoder.dashboard.config.RedisTestConfiguration;
4 -import cn.iocoder.dashboard.framework.redis.config.RedisConfig; 4 +import cn.iocoder.yudao.framework.redis.config.RedisConfig;
5 import org.redisson.spring.starter.RedissonAutoConfiguration; 5 import org.redisson.spring.starter.RedissonAutoConfiguration;
6 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; 6 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
7 import org.springframework.boot.test.context.SpringBootTest; 7 import org.springframework.boot.test.context.SpringBootTest;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java
  View file @cf4eeab
@@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper; @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper;
11 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; 11 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;
12 import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer; 12 import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer;
13 import cn.iocoder.dashboard.modules.infra.service.config.impl.InfConfigServiceImpl; 13 import cn.iocoder.dashboard.modules.infra.service.config.impl.InfConfigServiceImpl;
14 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
15 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 14 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  15 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.boot.test.mock.mockito.MockBean; 17 import org.springframework.boot.test.mock.mockito.MockBean;
18 import org.springframework.context.annotation.Import; 18 import org.springframework.context.annotation.Import;
@@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; @@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*;
26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
28 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 28 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
29 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 29 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
30 import static org.junit.jupiter.api.Assertions.*; 30 import static org.junit.jupiter.api.Assertions.*;
31 import static org.mockito.Mockito.times; 31 import static org.mockito.Mockito.times;
32 import static org.mockito.Mockito.verify; 32 import static org.mockito.Mockito.verify;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java
  View file @cf4eeab
@@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; @@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO;
8 import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; 8 import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO;
9 import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; 9 import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper;
10 import cn.iocoder.dashboard.modules.infra.service.file.impl.InfFileServiceImpl; 10 import cn.iocoder.dashboard.modules.infra.service.file.impl.InfFileServiceImpl;
11 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 11 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
12 import org.junit.jupiter.api.Test; 12 import org.junit.jupiter.api.Test;
13 import org.springframework.context.annotation.Import; 13 import org.springframework.context.annotation.Import;
14 14
@@ -20,7 +20,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FI @@ -20,7 +20,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FI
20 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 20 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
21 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 21 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;
22 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 22 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString;
23 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 23 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
24 import static org.junit.jupiter.api.Assertions.*; 24 import static org.junit.jupiter.api.Assertions.*;
25 25
26 @Import({InfFileServiceImpl.class, FileProperties.class}) 26 @Import({InfFileServiceImpl.class, FileProperties.class})
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java
  View file @cf4eeab
@@ -5,7 +5,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPo @@ -5,7 +5,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPo
5 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; 5 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;
6 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 6 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;
7 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 7 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString;
8 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 8 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
9 import static org.junit.jupiter.api.Assertions.assertEquals; 9 import static org.junit.jupiter.api.Assertions.assertEquals;
10 import static org.junit.jupiter.api.Assertions.assertNotNull; 10 import static org.junit.jupiter.api.Assertions.assertNotNull;
11 11
@@ -25,7 +25,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; @@ -25,7 +25,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO;
25 import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobLogMapper; 25 import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobLogMapper;
26 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; 26 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum;
27 import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobLogServiceImpl; 27 import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobLogServiceImpl;
28 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 28 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
29 29
30 /** 30 /**
31 * {@link InfJobLogServiceImpl} 的单元测试 31 * {@link InfJobLogServiceImpl} 的单元测试
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java
  View file @cf4eeab
@@ -40,7 +40,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO; @@ -40,7 +40,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO;
40 import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobMapper; 40 import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobMapper;
41 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum; 41 import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum;
42 import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobServiceImpl; 42 import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobServiceImpl;
43 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 43 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
44 44
45 /** 45 /**
46 * {@link InfJobServiceImpl} 的单元测试 46 * {@link InfJobServiceImpl} 的单元测试
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java
  View file @cf4eeab
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogD @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogD
12 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; 12 import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper;
13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; 13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl;
14 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 14 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
15 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 15 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
18 18
@@ -22,7 +22,7 @@ import java.util.List; @@ -22,7 +22,7 @@ import java.util.List;
22 import java.util.concurrent.Future; 22 import java.util.concurrent.Future;
23 23
24 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 24 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
25 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 25 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
26 import static org.junit.jupiter.api.Assertions.assertEquals; 26 import static org.junit.jupiter.api.Assertions.assertEquals;
27 import static org.junit.jupiter.api.Assertions.assertNotNull; 27 import static org.junit.jupiter.api.Assertions.assertNotNull;
28 28
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java
  View file @cf4eeab
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper;
12 import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; 12 import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; 13 import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl;
14 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 14 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
15 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 15 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
18 18
@@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API @@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API
25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; 25 import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED;
26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
28 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 28 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
29 import static org.junit.jupiter.api.Assertions.assertEquals; 29 import static org.junit.jupiter.api.Assertions.assertEquals;
30 import static org.junit.jupiter.api.Assertions.assertNotNull; 30 import static org.junit.jupiter.api.Assertions.assertNotNull;
31 31
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
  View file @cf4eeab
@@ -6,7 +6,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDa @@ -6,7 +6,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDa
6 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; 6 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;
7 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; 7 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo;
8 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; 8 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString;
9 -import static cn.iocoder.yudao.framework.util.date.DateUtils.addTime; 9 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime;
10 import static org.junit.jupiter.api.Assertions.assertEquals; 10 import static org.junit.jupiter.api.Assertions.assertEquals;
11 import static org.junit.jupiter.api.Assertions.assertNotEquals; 11 import static org.junit.jupiter.api.Assertions.assertNotEquals;
12 import static org.junit.jupiter.api.Assertions.assertNotNull; 12 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -44,7 +44,7 @@ import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServic @@ -44,7 +44,7 @@ import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServic
44 import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; 44 import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl;
45 import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; 45 import cn.iocoder.dashboard.framework.test.core.util.AssertUtils;
46 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 46 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
47 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 47 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
48 48
49 /** 49 /**
50 * SysUserSessionServiceImpl Tester. 50 * SysUserSessionServiceImpl Tester.
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java
  View file @cf4eeab
@@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysDeptMapper; @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysDeptMapper;
10 import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum; 10 import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum;
11 import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer; 11 import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer;
12 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; 12 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl;
13 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
14 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 13 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  14 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
15 import com.google.common.collect.Multimap; 15 import com.google.common.collect.Multimap;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.boot.test.mock.mockito.MockBean; 17 import org.springframework.boot.test.mock.mockito.MockBean;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java
  View file @cf4eeab
@@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdate @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdate
10 import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; 10 import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
11 import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper; 11 import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper;
12 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysPostServiceImpl; 12 import cn.iocoder.dashboard.modules.system.service.dept.impl.SysPostServiceImpl;
13 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
14 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 13 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  14 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
15 import org.junit.jupiter.api.Test; 15 import org.junit.jupiter.api.Test;
16 import org.springframework.context.annotation.Import; 16 import org.springframework.context.annotation.Import;
17 17
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java
  View file @cf4eeab
@@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
12 import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper; 12 import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper;
13 import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer; 13 import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer;
14 import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictDataServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictDataServiceImpl;
15 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
16 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 15 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  16 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
17 import com.google.common.collect.ImmutableTable; 17 import com.google.common.collect.ImmutableTable;
18 import org.junit.jupiter.api.Test; 18 import org.junit.jupiter.api.Test;
19 import org.springframework.boot.test.mock.mockito.MockBean; 19 import org.springframework.boot.test.mock.mockito.MockBean;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java
  View file @cf4eeab
@@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUp @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUp
10 import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; 10 import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
11 import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper; 11 import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper;
12 import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictTypeServiceImpl; 12 import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictTypeServiceImpl;
13 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
14 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 13 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  14 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
15 import org.junit.jupiter.api.Test; 15 import org.junit.jupiter.api.Test;
16 import org.springframework.boot.test.mock.mockito.MockBean; 16 import org.springframework.boot.test.mock.mockito.MockBean;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
@@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; @@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
25 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 25 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
27 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 27 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
28 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 28 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
29 import static org.junit.jupiter.api.Assertions.*; 29 import static org.junit.jupiter.api.Assertions.*;
30 import static org.mockito.ArgumentMatchers.eq; 30 import static org.mockito.ArgumentMatchers.eq;
31 import static org.mockito.Mockito.when; 31 import static org.mockito.Mockito.when;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
  View file @cf4eeab
@@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCode @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCode
12 import cn.iocoder.dashboard.modules.system.dal.mysql.errorcode.SysErrorCodeMapper; 12 import cn.iocoder.dashboard.modules.system.dal.mysql.errorcode.SysErrorCodeMapper;
13 import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum; 13 import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum;
14 import cn.iocoder.dashboard.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl;
15 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
16 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 15 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  16 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
17 import org.assertj.core.util.Lists; 17 import org.assertj.core.util.Lists;
18 import org.junit.jupiter.api.Test; 18 import org.junit.jupiter.api.Test;
19 import org.mockito.Mock; 19 import org.mockito.Mock;
@@ -30,7 +30,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ER @@ -30,7 +30,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ER
30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
31 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 31 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
32 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 32 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
33 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 33 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
34 import static org.junit.jupiter.api.Assertions.*; 34 import static org.junit.jupiter.api.Assertions.*;
35 35
36 /** 36 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger; @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger;
3 import cn.hutool.core.util.RandomUtil; 3 import cn.hutool.core.util.RandomUtil;
4 import cn.iocoder.dashboard.BaseDbUnitTest; 4 import cn.iocoder.dashboard.BaseDbUnitTest;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 6 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
9 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; 9 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
@@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;
13 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; 13 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
14 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl;
15 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 15 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
16 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 16 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
17 import org.junit.jupiter.api.Test; 17 import org.junit.jupiter.api.Test;
18 import org.springframework.context.annotation.Import; 18 import org.springframework.context.annotation.Import;
19 19
@@ -21,7 +21,7 @@ import javax.annotation.Resource; @@ -21,7 +21,7 @@ import javax.annotation.Resource;
21 import java.util.List; 21 import java.util.List;
22 22
23 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 23 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
24 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 24 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
25 import static org.junit.jupiter.api.Assertions.assertEquals; 25 import static org.junit.jupiter.api.Assertions.assertEquals;
26 26
27 @Import(SysLoginLogServiceImpl.class) 27 @Import(SysLoginLogServiceImpl.class)
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java
  View file @cf4eeab
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
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.framework.operatelog.core.enums.OperateTypeEnum; 8 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum;
9 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 9 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
10 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; 10 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO;
11 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; 11 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
12 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; 12 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
@@ -17,7 +17,7 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; @@ -17,7 +17,7 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
17 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; 17 import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl;
18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService; 18 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
19 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 19 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
20 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 20 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
21 import org.junit.jupiter.api.Test; 21 import org.junit.jupiter.api.Test;
22 import org.springframework.boot.test.mock.mockito.MockBean; 22 import org.springframework.boot.test.mock.mockito.MockBean;
23 import org.springframework.context.annotation.Import; 23 import org.springframework.context.annotation.Import;
@@ -29,7 +29,7 @@ import java.util.concurrent.Future; @@ -29,7 +29,7 @@ import java.util.concurrent.Future;
29 29
30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
31 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; 31 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId;
32 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 32 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
33 import static org.junit.jupiter.api.Assertions.assertEquals; 33 import static org.junit.jupiter.api.Assertions.assertEquals;
34 import static org.mockito.Mockito.when; 34 import static org.mockito.Mockito.when;
35 35
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO; @@ -10,7 +10,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
10 import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper; 10 import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper;
11 import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; 11 import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum;
12 import cn.iocoder.dashboard.modules.system.service.notice.impl.SysNoticeServiceImpl; 12 import cn.iocoder.dashboard.modules.system.service.notice.impl.SysNoticeServiceImpl;
13 -import cn.iocoder.yudao.framework.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;
15 import org.springframework.context.annotation.Import; 15 import org.springframework.context.annotation.Import;
16 16
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java
  View file @cf4eeab
@@ -12,9 +12,9 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper; @@ -12,9 +12,9 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper;
12 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; 12 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
13 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; 13 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer;
14 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl;
15 -import cn.iocoder.yudao.framework.util.sping.SpringAopUtils; 15 +import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils;
16 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; 16 import cn.iocoder.dashboard.framework.test.core.util.RandomUtils;
17 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 17 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
18 import com.google.common.collect.Multimap; 18 import com.google.common.collect.Multimap;
19 import org.junit.jupiter.api.Assertions; 19 import org.junit.jupiter.api.Assertions;
20 import org.junit.jupiter.api.Test; 20 import org.junit.jupiter.api.Test;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java
  View file @cf4eeab
@@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper; @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper;
13 import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; 13 import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer; 14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer;
15 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl; 15 import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl;
16 -import cn.iocoder.yudao.framework.util.sping.SpringAopUtils; 16 +import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils;
17 import org.junit.jupiter.api.Test; 17 import org.junit.jupiter.api.Test;
18 import org.springframework.boot.test.mock.mockito.MockBean; 18 import org.springframework.boot.test.mock.mockito.MockBean;
19 import org.springframework.context.annotation.Import; 19 import org.springframework.context.annotation.Import;
@@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; @@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 26 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 27 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
28 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 28 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
29 -import static cn.iocoder.yudao.framework.util.object.ObjectUtils.max; 29 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
30 import static org.junit.jupiter.api.Assertions.*; 30 import static org.junit.jupiter.api.Assertions.*;
31 import static org.mockito.Mockito.verify; 31 import static org.mockito.Mockito.verify;
32 32
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java
  View file @cf4eeab
@@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO;
12 import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsChannelMapper; 12 import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsChannelMapper;
13 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; 13 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer;
14 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsChannelServiceImpl; 14 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsChannelServiceImpl;
15 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
16 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 15 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  16 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
17 import org.junit.jupiter.api.Test; 17 import org.junit.jupiter.api.Test;
18 import org.springframework.boot.test.mock.mockito.MockBean; 18 import org.springframework.boot.test.mock.mockito.MockBean;
19 import org.springframework.context.annotation.Import; 19 import org.springframework.context.annotation.Import;
@@ -27,8 +27,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SM @@ -27,8 +27,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SM
27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; 27 import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
28 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*; 28 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*;
29 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 29 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
30 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime;  
31 -import static cn.iocoder.yudao.framework.util.object.ObjectUtils.max; 30 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  31 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
32 import static org.junit.jupiter.api.Assertions.*; 32 import static org.junit.jupiter.api.Assertions.*;
33 import static org.mockito.ArgumentMatchers.eq; 33 import static org.mockito.ArgumentMatchers.eq;
34 import static org.mockito.Mockito.*; 34 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java
  View file @cf4eeab
@@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; @@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum;
14 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum; 14 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum;
15 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; 15 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum;
16 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsLogServiceImpl; 16 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsLogServiceImpl;
17 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
18 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 17 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  18 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
19 import org.junit.jupiter.api.Test; 19 import org.junit.jupiter.api.Test;
20 import org.springframework.context.annotation.Import; 20 import org.springframework.context.annotation.Import;
21 21
@@ -29,7 +29,7 @@ import static cn.hutool.core.util.RandomUtil.randomBoolean; @@ -29,7 +29,7 @@ import static cn.hutool.core.util.RandomUtil.randomBoolean;
29 import static cn.hutool.core.util.RandomUtil.randomEle; 29 import static cn.hutool.core.util.RandomUtil.randomEle;
30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 30 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
31 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 31 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
32 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 32 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
33 import static org.junit.jupiter.api.Assertions.*; 33 import static org.junit.jupiter.api.Assertions.*;
34 34
35 /** 35 /**
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java
  View file @cf4eeab
@@ -18,8 +18,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsTemplateMapper; @@ -18,8 +18,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsTemplateMapper;
18 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; 18 import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum;
19 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; 19 import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer;
20 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsTemplateServiceImpl; 20 import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsTemplateServiceImpl;
21 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
22 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 21 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  22 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
23 import com.google.common.collect.Lists; 23 import com.google.common.collect.Lists;
24 import org.junit.jupiter.api.Test; 24 import org.junit.jupiter.api.Test;
25 import org.springframework.boot.test.mock.mockito.MockBean; 25 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -37,8 +37,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; @@ -37,8 +37,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
37 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 37 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
38 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 38 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
39 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 39 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
40 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime;  
41 -import static cn.iocoder.yudao.framework.util.object.ObjectUtils.max; 40 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
  41 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
42 import static org.junit.jupiter.api.Assertions.*; 42 import static org.junit.jupiter.api.Assertions.*;
43 import static org.mockito.ArgumentMatchers.eq; 43 import static org.mockito.ArgumentMatchers.eq;
44 import static org.mockito.Mockito.*; 44 import static org.mockito.Mockito.*;
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java
  View file @cf4eeab
@@ -17,9 +17,9 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; @@ -17,9 +17,9 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
17 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; 17 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
18 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; 18 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
19 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; 19 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
20 -import cn.iocoder.yudao.framework.util.collection.ArrayUtils;  
21 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils;  
22 -import cn.iocoder.yudao.framework.util.object.ObjectUtils; 20 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  21 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  22 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
23 import org.junit.jupiter.api.Test; 23 import org.junit.jupiter.api.Test;
24 import org.mockito.stubbing.Answer; 24 import org.mockito.stubbing.Answer;
25 import org.springframework.boot.test.mock.mockito.MockBean; 25 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -38,7 +38,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; @@ -38,7 +38,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*;
38 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; 38 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals;
39 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; 39 import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException;
40 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 40 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
41 -import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; 41 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
42 import static org.assertj.core.util.Lists.newArrayList; 42 import static org.assertj.core.util.Lists.newArrayList;
43 import static org.junit.jupiter.api.Assertions.assertEquals; 43 import static org.junit.jupiter.api.Assertions.assertEquals;
44 import static org.junit.jupiter.api.Assertions.assertNull; 44 import static org.junit.jupiter.api.Assertions.assertNull;
yudao-dependencies/pom.xml
  View file @cf4eeab
@@ -70,6 +70,23 @@ @@ -70,6 +70,23 @@
70 </exclusions> 70 </exclusions>
71 </dependency> 71 </dependency>
72 72
  73 + <!-- 业务组件 -->
  74 + <dependency>
  75 + <groupId>cn.iocoder.boot</groupId>
  76 + <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
  77 + <version>${revision}</version>
  78 + </dependency>
  79 + <dependency>
  80 + <groupId>cn.iocoder.boot</groupId>
  81 + <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
  82 + <version>${revision}</version>
  83 + </dependency>
  84 + <dependency>
  85 + <groupId>cn.iocoder.boot</groupId>
  86 + <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
  87 + <version>${revision}</version>
  88 + </dependency>
  89 +
73 <!-- Spring 核心 --> 90 <!-- Spring 核心 -->
74 <dependency> 91 <dependency>
75 <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 --> 92 <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 -->
@@ -145,6 +162,12 @@ @@ -145,6 +162,12 @@
145 </dependency> 162 </dependency>
146 163
147 <dependency> 164 <dependency>
  165 + <groupId>cn.iocoder.boot</groupId>
  166 + <artifactId>yudao-spring-boot-starter-redis</artifactId>
  167 + <version>${revision}</version>
  168 + </dependency>
  169 +
  170 + <dependency>
148 <groupId>org.redisson</groupId> 171 <groupId>org.redisson</groupId>
149 <artifactId>redisson-spring-boot-starter</artifactId> 172 <artifactId>redisson-spring-boot-starter</artifactId>
150 <version>${redisson.version}</version> 173 <version>${redisson.version}</version>
@@ -152,12 +175,23 @@ @@ -152,12 +175,23 @@
152 175
153 <!-- Config 配置中心相关 --> 176 <!-- Config 配置中心相关 -->
154 <dependency> 177 <dependency>
  178 + <groupId>cn.iocoder.boot</groupId>
  179 + <artifactId>yudao-spring-boot-starter-config</artifactId>
  180 + <version>${revision}</version>
  181 + </dependency>
  182 +
  183 + <dependency>
155 <groupId>com.ctrip.framework.apollo</groupId> 184 <groupId>com.ctrip.framework.apollo</groupId>
156 <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> 185 <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 -->
157 <version>${apollo.version}</version> 186 <version>${apollo.version}</version>
158 </dependency> 187 </dependency>
159 188
160 <!-- Job 定时任务相关 --> 189 <!-- Job 定时任务相关 -->
  190 + <dependency>
  191 + <groupId>cn.iocoder.boot</groupId>
  192 + <artifactId>yudao-spring-boot-starter-job</artifactId>
  193 + <version>${revision}</version>
  194 + </dependency>
161 195
162 <!-- 服务保障相关 --> 196 <!-- 服务保障相关 -->
163 <dependency> 197 <dependency>
@@ -225,6 +259,12 @@ @@ -225,6 +259,12 @@
225 259
226 <!-- Test 测试相关 --> 260 <!-- Test 测试相关 -->
227 <dependency> 261 <dependency>
  262 + <groupId>cn.iocoder.boot</groupId>
  263 + <artifactId>yudao-spring-boot-starter-test</artifactId>
  264 + <version>${revision}</version>
  265 + </dependency>
  266 +
  267 + <dependency>
228 <groupId>org.springframework.boot</groupId> 268 <groupId>org.springframework.boot</groupId>
229 <artifactId>spring-boot-starter-test</artifactId> 269 <artifactId>spring-boot-starter-test</artifactId>
230 <version>${spring.boot.version}</version> 270 <version>${spring.boot.version}</version>
@@ -257,7 +297,7 @@ @@ -257,7 +297,7 @@
257 297
258 <dependency> 298 <dependency>
259 <groupId>cn.iocoder.boot</groupId> 299 <groupId>cn.iocoder.boot</groupId>
260 - <artifactId>yudao-spring-boot-starter-operatelog</artifactId> 300 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
261 <version>${revision}</version> 301 <version>${revision}</version>
262 </dependency> 302 </dependency>
263 303
yudao-framework/pom.xml
  View file @cf4eeab
@@ -13,15 +13,31 @@ @@ -13,15 +13,31 @@
13 <module>yudao-common</module> 13 <module>yudao-common</module>
14 <module>yudao-framework-all</module> 14 <module>yudao-framework-all</module>
15 <module>yudao-spring-boot-starter-mybatis</module> 15 <module>yudao-spring-boot-starter-mybatis</module>
  16 + <module>yudao-spring-boot-starter-redis</module>
16 <module>yudao-spring-boot-starter-web</module> 17 <module>yudao-spring-boot-starter-web</module>
17 <module>yudao-spring-boot-starter-security</module> 18 <module>yudao-spring-boot-starter-security</module>
18 <module>yudao-spring-boot-starter-monitor</module> 19 <module>yudao-spring-boot-starter-monitor</module>
19 <module>yudao-spring-boot-starter-protection</module> 20 <module>yudao-spring-boot-starter-protection</module>
20 - <module>yudao-spring-boot-starter-operatelog</module> 21 + <module>yudao-spring-boot-starter-config</module>
  22 + <module>yudao-spring-boot-starter-job</module>
  23 + <module>yudao-spring-boot-starter-excel</module>
  24 + <module>yudao-spring-boot-starter-test</module>
  25 + <module>yudao-spring-boot-starter-biz-operatelog</module>
  26 + <module>yudao-spring-boot-starter-biz-dict</module>
  27 + <module>yudao-spring-boot-starter-biz-sms</module>
21 </modules> 28 </modules>
22 29
23 <artifactId>yudao-framework</artifactId> 30 <artifactId>yudao-framework</artifactId>
24 - <description>基础框架，各种组件的拓展</description> 31 + <description>
  32 + 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
  33 + 1. core 包：是该组件的核心分装
  34 + 2. config 包：是该组件基于 Spring 的配置
  35 +
  36 + 技术组件，也分成两类：
  37 + 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
  38 + 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
  39 + 如果是业务组件，Maven 名字会包含 biz
  40 + </description>
25 <url>https://github.com/YunaiV/ruoyi-vue-pro</url> 41 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
26 42
27 </project> 43 </project>
yudao-framework/yudao-common/pom.xml
  View file @cf4eeab
@@ -38,6 +38,13 @@ @@ -38,6 +38,13 @@
38 <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> 38 <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 -->
39 </dependency> 39 </dependency>
40 40
  41 + <dependency>
  42 + <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 -->
  43 + <groupId>org.springframework.boot</groupId>
  44 + <artifactId>spring-boot-configuration-processor</artifactId>
  45 + <optional>true</optional>
  46 + </dependency>
  47 +
41 <!-- Web 相关 --> 48 <!-- Web 相关 -->
42 <dependency> 49 <dependency>
43 <groupId>org.springframework</groupId> 50 <groupId>org.springframework</groupId>
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/ArrayUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/ArrayUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.collection; 1 +package cn.iocoder.yudao.framework.common.util.collection;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 4
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/CollectionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.collection; 1 +package cn.iocoder.yudao.framework.common.util.collection;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.collection.CollectionUtil; 4 import cn.hutool.core.collection.CollectionUtil;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/MapUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/MapUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.collection; 1 +package cn.iocoder.yudao.framework.common.util.collection;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.collection.CollectionUtil; 4 import cn.hutool.core.collection.CollectionUtil;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/SetUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/SetUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.collection; 1 +package cn.iocoder.yudao.framework.common.util.collection;
2 2
3 import java.util.Arrays; 3 import java.util.Arrays;
4 import java.util.HashSet; 4 import java.util.HashSet;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/date/DateUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.date; 1 +package cn.iocoder.yudao.framework.common.util.date;
2 2
3 import java.time.Duration; 3 import java.time.Duration;
4 import java.util.Calendar; 4 import java.util.Calendar;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/json/JsonUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.json; 1 +package cn.iocoder.yudao.framework.common.util.json;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/monitor/TracerUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/monitor/TracerUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.monitor; 1 +package cn.iocoder.yudao.framework.common.util.monitor;
2 2
3 import org.apache.skywalking.apm.toolkit.trace.TraceContext; 3 import org.apache.skywalking.apm.toolkit.trace.TraceContext;
4 4
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/object/ObjectUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.object; 1 +package cn.iocoder.yudao.framework.common.util.object;
2 2
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 4
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/package-info.java
  View file @cf4eeab
@@ -4,4 +4,4 @@ @@ -4,4 +4,4 @@
4 * 4 *
5 * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。 5 * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。
6 */ 6 */
7 -package cn.iocoder.yudao.framework.util; 7 +package cn.iocoder.yudao.framework.common.util;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/servlet/ServletUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.servlet; 1 +package cn.iocoder.yudao.framework.common.util.servlet;
2 2
3 import cn.hutool.core.io.IoUtil; 3 import cn.hutool.core.io.IoUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
5 import cn.hutool.extra.servlet.ServletUtil; 5 import cn.hutool.extra.servlet.ServletUtil;
6 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 6 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
7 import org.springframework.http.MediaType; 7 import org.springframework.http.MediaType;
8 import org.springframework.web.context.request.RequestAttributes; 8 import org.springframework.web.context.request.RequestAttributes;
9 import org.springframework.web.context.request.RequestContextHolder; 9 import org.springframework.web.context.request.RequestContextHolder;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringAopUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/sping/SpringAopUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.sping; 1 +package cn.iocoder.yudao.framework.common.util.sping;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import org.springframework.aop.framework.AdvisedSupport; 4 import org.springframework.aop.framework.AdvisedSupport;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringExpressionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/sping/SpringExpressionUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.sping; 1 +package cn.iocoder.yudao.framework.common.util.sping;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.map.MapUtil; 4 import cn.hutool.core.map.MapUtil;
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/string/StrUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
  View file @cf4eeab
1 -package cn.iocoder.yudao.framework.util.string; 1 +package cn.iocoder.yudao.framework.common.util.string;
2 2
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.validator; 1 +package cn.iocoder.yudao.framework.common.validation;
2 2
3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable; 3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.validator; 1 +package cn.iocoder.yudao.framework.common.validation;
2 2
3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable; 3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/package-info.java
  View file @cf4eeab
1 /** 1 /**
2 * 使用 Hibernate Validator 实现参数校验 2 * 使用 Hibernate Validator 实现参数校验
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.validator; 4 +package cn.iocoder.yudao.framework.common.validation;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md renamed to yudao-framework/yudao-common/《芋道 Spring Boot 参数校验 Validation 入门》.md
  View file @cf4eeab
yudao-framework/yudao-framework-all/pom.xml deleted
View file @20066bc
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
5 - <parent>  
6 - <groupId>cn.iocoder.boot</groupId>  
7 - <artifactId>yudao-framework</artifactId>  
8 - <version>${revision}</version>  
9 - </parent>  
10 - <modelVersion>4.0.0</modelVersion>  
11 - <artifactId>yudao-framework-all</artifactId>  
12 - <packaging>jar</packaging>  
13 -  
14 - <name>${artifactId}</name>  
15 - <description>基础框架，各种组件的拓展</description>  
16 - <url>https://github.com/YunaiV/ruoyi-vue-pro</url>  
17 -  
18 - <dependencies>  
19 - <!-- Spring 核心 -->  
20 - <dependency>  
21 - <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 -->  
22 - <groupId>org.springframework.boot</groupId>  
23 - <artifactId>spring-boot-configuration-processor</artifactId>  
24 - <optional>true</optional>  
25 - </dependency>  
26 -  
27 - <!-- Web 相关 -->  
28 -  
29 - <!-- DB 相关 -->  
30 - <dependency>  
31 - <groupId>org.redisson</groupId>  
32 - <artifactId>redisson-spring-boot-starter</artifactId>  
33 - </dependency>  
34 -  
35 - <!-- Config 配置中心相关 -->  
36 - <dependency>  
37 - <groupId>com.ctrip.framework.apollo</groupId>  
38 - <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 -->  
39 - </dependency>  
40 -  
41 - <!-- Job 定时任务相关 -->  
42 - <dependency>  
43 - <groupId>org.springframework.boot</groupId>  
44 - <artifactId>spring-boot-starter-quartz</artifactId>  
45 - </dependency>  
46 -  
47 - <!-- 服务保障相关 -->  
48 - <dependency>  
49 - <groupId>com.baomidou</groupId>  
50 - <artifactId>lock4j-redisson-spring-boot-starter</artifactId>  
51 - </dependency>  
52 -  
53 - <dependency>  
54 - <groupId>io.github.resilience4j</groupId>  
55 - <artifactId>resilience4j-spring-boot2</artifactId>  
56 - </dependency>  
57 -  
58 - <!-- 监控相关 -->  
59 - <dependency>  
60 - <groupId>org.apache.skywalking</groupId>  
61 - <artifactId>apm-toolkit-trace</artifactId>  
62 - </dependency>  
63 - <dependency>  
64 - <groupId>org.apache.skywalking</groupId>  
65 - <artifactId>apm-toolkit-logback-1.x</artifactId>  
66 - </dependency>  
67 - <dependency>  
68 - <groupId>org.apache.skywalking</groupId>  
69 - <artifactId>apm-toolkit-opentracing</artifactId>  
70 - </dependency>  
71 -  
72 - <dependency>  
73 - <groupId>de.codecentric</groupId>  
74 - <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->  
75 - </dependency>  
76 - <dependency>  
77 - <groupId>de.codecentric</groupId>  
78 - <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->  
79 - </dependency>  
80 -  
81 - <!-- Test 测试相关 -->  
82 - <dependency>  
83 - <groupId>org.springframework.boot</groupId>  
84 - <artifactId>spring-boot-starter-test</artifactId>  
85 - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided -->  
86 - <optional>true</optional>  
87 - </dependency>  
88 -  
89 - <dependency>  
90 - <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 -->  
91 - <artifactId>h2</artifactId>  
92 - <optional>true</optional>  
93 - </dependency>  
94 -  
95 - <dependency>  
96 - <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 -->  
97 - <artifactId>jedis-mock</artifactId>  
98 - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided -->  
99 - <optional>true</optional>  
100 - </dependency>  
101 -  
102 - <dependency>  
103 - <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 -->  
104 - <artifactId>podam</artifactId>  
105 - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided -->  
106 - <optional>true</optional>  
107 - </dependency>  
108 -  
109 - <!-- 工具类相关 -->  
110 - <dependency>  
111 - <groupId>cn.iocoder.boot</groupId>  
112 - <artifactId>yudao-common</artifactId>  
113 - </dependency>  
114 -  
115 - <dependency>  
116 - <groupId>com.alibaba</groupId>  
117 - <artifactId>easyexcel</artifactId>  
118 - </dependency>  
119 -  
120 - <dependency>  
121 - <groupId>org.apache.velocity</groupId>  
122 - <artifactId>velocity-engine-core</artifactId>  
123 - </dependency>  
124 -  
125 - <dependency>  
126 - <groupId>cn.smallbun.screw</groupId>  
127 - <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->  
128 - </dependency>  
129 -  
130 - <!-- 三方云服务相关 -->  
131 -  
132 - <!-- SMS SDK begin -->  
133 - <dependency>  
134 - <groupId>com.yunpian.sdk</groupId>  
135 - <artifactId>yunpian-java-sdk</artifactId>  
136 - </dependency>  
137 -  
138 - <dependency>  
139 - <groupId>com.aliyun</groupId>  
140 - <artifactId>aliyun-java-sdk-core</artifactId>  
141 - </dependency>  
142 - <dependency>  
143 - <groupId>com.aliyun</groupId>  
144 - <artifactId>aliyun-java-sdk-dysmsapi</artifactId>  
145 - </dependency>  
146 - <!-- SMS SDK end -->  
147 -  
148 - </dependencies>  
149 -</project>  
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/package-info.java deleted
View file @20066bc
1 -/**  
2 - * 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：  
3 - * 1. core 包：是该组件的核心分装  
4 - * 2. config 包：是该组件基于 Spring 的配置  
5 - *  
6 - * 技术组件，也分成两类：  
7 - * 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展  
8 - * 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。  
9 - */  
10 -package cn.iocoder.dashboard.framework;  
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/package-info.java deleted
View file @20066bc
1 -package cn.iocoder.dashboard.framework.test.core;  
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java deleted
View file @20066bc
1 -package cn.iocoder.dashboard.framework.sms.core.client.impl;  
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java deleted
View file @20066bc
1 -package cn.iocoder.dashboard.framework.sms.core.client;  
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java deleted
View file @20066bc
1 -package cn.iocoder.dashboard.framework.sms.core;  
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java deleted
View file @20066bc
1 -package cn.iocoder.dashboard.framework.sms;  
yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>字典类型、数据</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <dependency>
  20 + <groupId>cn.iocoder.boot</groupId>
  21 + <artifactId>yudao-common</artifactId>
  22 + </dependency>
  23 +
  24 + <!-- Spring 核心 -->
  25 + <dependency>
  26 + <groupId>org.springframework.boot</groupId>
  27 + <artifactId>spring-boot-starter</artifactId>
  28 + </dependency>
  29 + </dependencies>
  30 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/DictConfiguration.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.dict.config; 1 +package cn.iocoder.yudao.framework.dict.config;
2 2
3 -import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;  
4 -import cn.iocoder.dashboard.framework.dict.core.util.DictUtils; 3 +import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService;
  4 +import cn.iocoder.yudao.framework.dict.core.util.DictUtils;
5 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
7 7
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/dto/DictDataRespDTO.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.dict.core.dto; 1 +package cn.iocoder.yudao.framework.dict.core.dto;
2 2
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import lombok.Data; 4 import lombok.Data;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/service/DictDataFrameworkService.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.dict.core.service; 1 +package cn.iocoder.yudao.framework.dict.core.service;
2 2
3 -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; 3 +import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictUtils.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.dict.core.util; 1 +package cn.iocoder.yudao.framework.dict.core.util;
2 2
3 -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO;  
4 -import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService; 3 +import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
  4 +import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService;
5 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
6 6
7 /** 7 /**
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java
  View file @cf4eeab
1 /** 1 /**
2 - * 字典数据模块，提供 {@link cn.iocoder.dashboard.framework.dict.core.util.DictUtils} 工具类 2 + * 字典数据模块，提供 {@link cn.iocoder.yudao.framework.dict.core.util.DictUtils} 工具类
3 * 3 *
4 * 通过将字典缓存在内存中，保证性能 4 * 通过将字典缓存在内存中，保证性能
5 */ 5 */
6 -package cn.iocoder.dashboard.framework.dict; 6 +package cn.iocoder.yudao.framework.dict;
yudao-framework/yudao-spring-boot-starter-operatelog/pom.xml renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/pom.xml
  View file @cf4eeab
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <version>${revision}</version> 8 <version>${revision}</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 - <artifactId>yudao-spring-boot-starter-operatelog</artifactId> 11 + <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
12 <packaging>jar</packaging> 12 <packaging>jar</packaging>
13 13
14 <name>${artifactId}</name> 14 <name>${artifactId}</name>
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
  View file @cf4eeab
@@ -9,9 +9,9 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; @@ -9,9 +9,9 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
9 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; 9 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO;
10 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; 10 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum;
11 import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; 11 import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService;
12 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils;  
13 -import cn.iocoder.yudao.framework.util.json.JsonUtils;  
14 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 12 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
  13 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
  14 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
15 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; 15 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
16 import com.google.common.collect.Maps; 16 import com.google.common.collect.Maps;
17 import io.swagger.annotations.Api; 17 import io.swagger.annotations.Api;
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/dto/OperateLogCreateReqDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/dto/OperateLogCreateReqDTO.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>短信拓展，支持阿里云、云片</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <dependency>
  20 + <groupId>cn.iocoder.boot</groupId>
  21 + <artifactId>yudao-common</artifactId>
  22 + </dependency>
  23 +
  24 + <!-- Spring 核心 -->
  25 + <dependency>
  26 + <groupId>org.springframework.boot</groupId>
  27 + <artifactId>spring-boot-starter</artifactId>
  28 + </dependency>
  29 +
  30 + <!-- Test 测试相关 -->
  31 + <dependency>
  32 + <groupId>cn.iocoder.boot</groupId>
  33 + <artifactId>yudao-spring-boot-starter-test</artifactId>
  34 + <scope>test</scope>
  35 + </dependency>
  36 +
  37 + <!-- 工具类相关 -->
  38 + <dependency>
  39 + <groupId>com.fasterxml.jackson.core</groupId>
  40 + <artifactId>jackson-databind</artifactId>
  41 + </dependency>
  42 + <dependency>
  43 + <groupId>com.fasterxml.jackson.core</groupId>
  44 + <artifactId>jackson-core</artifactId>
  45 + </dependency>
  46 +
  47 + <dependency>
  48 + <groupId>jakarta.validation</groupId>
  49 + <artifactId>jakarta.validation-api</artifactId>
  50 + </dependency>
  51 +
  52 + <!-- 三方云服务相关 -->
  53 +
  54 + <!-- SMS SDK begin -->
  55 + <dependency>
  56 + <groupId>com.yunpian.sdk</groupId>
  57 + <artifactId>yunpian-java-sdk</artifactId>
  58 + </dependency>
  59 +
  60 + <dependency>
  61 + <groupId>com.aliyun</groupId>
  62 + <artifactId>aliyun-java-sdk-core</artifactId>
  63 + </dependency>
  64 + <dependency>
  65 + <groupId>com.aliyun</groupId>
  66 + <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
  67 + </dependency>
  68 + <!-- SMS SDK end -->
  69 + </dependencies>
  70 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java
  View file @cf4eeab
@@ -11,8 +11,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
11 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; 11 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
12 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 12 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
13 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 13 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
14 -import cn.iocoder.yudao.framework.util.collection.MapUtils;  
15 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 14 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  15 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
16 import com.aliyuncs.AcsRequest; 16 import com.aliyuncs.AcsRequest;
17 import com.aliyuncs.AcsResponse; 17 import com.aliyuncs.AcsResponse;
18 import com.aliyuncs.DefaultAcsClient; 18 import com.aliyuncs.DefaultAcsClient;
@@ -34,8 +34,8 @@ import java.util.Objects; @@ -34,8 +34,8 @@ import java.util.Objects;
34 import java.util.function.Function; 34 import java.util.function.Function;
35 import java.util.stream.Collectors; 35 import java.util.stream.Collectors;
36 36
37 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
38 -import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT; 37 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  38 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
39 39
40 /** 40 /**
41 * 阿里短信客户端的实现类 41 * 阿里短信客户端的实现类
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java
  View file @cf4eeab
@@ -15,8 +15,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
15 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; 15 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
16 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 16 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
17 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 17 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
18 -import cn.iocoder.yudao.framework.util.collection.MapUtils;  
19 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 18 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  19 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
20 20
21 import java.util.HashMap; 21 import java.util.HashMap;
22 import java.util.List; 22 import java.util.List;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java
  View file @cf4eeab
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
12 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; 12 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
13 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 13 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
14 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 14 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
15 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 15 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
16 import com.fasterxml.jackson.annotation.JsonFormat; 16 import com.fasterxml.jackson.annotation.JsonFormat;
17 import com.fasterxml.jackson.annotation.JsonProperty; 17 import com.fasterxml.jackson.annotation.JsonProperty;
18 import com.google.common.annotations.VisibleForTesting; 18 import com.google.common.annotations.VisibleForTesting;
@@ -28,8 +28,8 @@ import java.util.function.Function; @@ -28,8 +28,8 @@ import java.util.function.Function;
28 import java.util.function.Supplier; 28 import java.util.function.Supplier;
29 import java.util.stream.Collectors; 29 import java.util.stream.Collectors;
30 30
31 -import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
32 -import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT; 31 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  32 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
33 33
34 /** 34 /**
35 * 云片短信客户端的实现类 35 * 云片短信客户端的实现类
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
  View file @cf4eeab
@@ -10,8 +10,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
10 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; 10 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
11 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 11 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
12 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 12 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
13 -import cn.iocoder.yudao.framework.util.collection.MapUtils;  
14 -import cn.iocoder.yudao.framework.util.date.DateUtils; 13 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  14 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
15 import com.aliyuncs.AcsRequest; 15 import com.aliyuncs.AcsRequest;
16 import com.aliyuncs.IAcsClient; 16 import com.aliyuncs.IAcsClient;
17 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; 17 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;
@@ -30,7 +30,7 @@ import java.util.function.Function; @@ -30,7 +30,7 @@ import java.util.function.Function;
30 30
31 import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; 31 import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR;
32 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; 32 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
33 -import static cn.iocoder.yudao.framework.util.json.JsonUtils.toJsonString; 33 +import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
34 import static org.junit.jupiter.api.Assertions.*; 34 import static org.junit.jupiter.api.Assertions.*;
35 import static org.mockito.ArgumentMatchers.any; 35 import static org.mockito.ArgumentMatchers.any;
36 import static org.mockito.ArgumentMatchers.argThat; 36 import static org.mockito.ArgumentMatchers.argThat;
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
2 2
3 -import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; 3 +import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 import org.junit.jupiter.api.Test; 6 import org.junit.jupiter.api.Test;
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
  View file @cf4eeab
@@ -10,7 +10,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; @@ -10,7 +10,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
10 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; 10 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
11 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; 11 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
12 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; 12 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
13 -import cn.iocoder.yudao.framework.util.date.DateUtils; 13 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
14 import com.google.common.collect.Lists; 14 import com.google.common.collect.Lists;
15 import com.yunpian.sdk.YunpianClient; 15 import com.yunpian.sdk.YunpianClient;
16 import com.yunpian.sdk.api.SmsApi; 16 import com.yunpian.sdk.api.SmsApi;
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java renamed to yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
  View file @cf4eeab
1 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
2 2
3 -import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; 3 +import cn.iocoder.dashboard.framework.test.core.ut.BaseMockitoUnitTest;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; 5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 import org.junit.jupiter.api.Test; 6 import org.junit.jupiter.api.Test;
yudao-framework/yudao-spring-boot-starter-config/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-config</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>配置中心，基于 Apollo 魔改实现</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <!-- Spring 核心 -->
  20 + <dependency>
  21 + <groupId>org.springframework.boot</groupId>
  22 + <artifactId>spring-boot-starter</artifactId>
  23 + </dependency>
  24 +
  25 + <!-- Config 配置中心相关 -->
  26 + <dependency>
  27 + <groupId>com.ctrip.framework.apollo</groupId>
  28 + <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 -->
  29 + </dependency>
  30 + </dependencies>
  31 +
  32 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java renamed to yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-excel/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>Excel 拓展</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <!-- Web 相关 -->
  20 + <dependency>
  21 + <groupId>jakarta.servlet</groupId>
  22 + <artifactId>jakarta.servlet-api</artifactId>
  23 + <scope>provided</scope> <!-- 设置为 provided，只有 ExcelUtils 使用 -->
  24 + </dependency>
  25 +
  26 + <!-- 工具类相关 -->
  27 + <dependency>
  28 + <groupId>com.alibaba</groupId>
  29 + <artifactId>easyexcel</artifactId>
  30 + </dependency>
  31 + </dependencies>
  32 +
  33 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/annotations/DictFormat.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.excel.core.annotations; 1 +package cn.iocoder.yudao.framework.excel.core.annotations;
2 2
3 import java.lang.annotation.*; 3 import java.lang.annotation.*;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.excel.core.convert; 1 +package cn.iocoder.yudao.framework.excel.core.convert;
2 2
3 3
4 import cn.hutool.core.convert.Convert; 4 import cn.hutool.core.convert.Convert;
5 -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO;  
6 -import cn.iocoder.dashboard.framework.dict.core.util.DictUtils;  
7 -import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; 5 +import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
  6 +import cn.iocoder.yudao.framework.dict.core.util.DictUtils;
  7 +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
8 import com.alibaba.excel.converters.Converter; 8 import com.alibaba.excel.converters.Converter;
9 import com.alibaba.excel.enums.CellDataTypeEnum; 9 import com.alibaba.excel.enums.CellDataTypeEnum;
10 import com.alibaba.excel.metadata.CellData; 10 import com.alibaba.excel.metadata.CellData;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/JsonConvert.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.excel.core.convert; 1 +package cn.iocoder.yudao.framework.excel.core.convert;
2 2
3 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 3 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
4 import com.alibaba.excel.converters.Converter; 4 import com.alibaba.excel.converters.Converter;
5 import com.alibaba.excel.enums.CellDataTypeEnum; 5 import com.alibaba.excel.enums.CellDataTypeEnum;
6 import com.alibaba.excel.metadata.CellData; 6 import com.alibaba.excel.metadata.CellData;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.excel.core.util; 1 +package cn.iocoder.yudao.framework.excel.core.util;
2 2
3 import com.alibaba.excel.EasyExcel; 3 import com.alibaba.excel.EasyExcel;
4 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; 4 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/package-info.java
  View file @cf4eeab
1 /** 1 /**
2 * 基于 EasyExcel 实现 Excel 相关的操作 2 * 基于 EasyExcel 实现 Excel 相关的操作
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.excel; 4 +package cn.iocoder.yudao.framework.excel;
yudao-framework/yudao-spring-boot-starter-job/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-job</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>定时任务，基于 Quartz 拓展</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <!-- Job 定时任务相关 -->
  20 + <dependency>
  21 + <groupId>org.springframework.boot</groupId>
  22 + <artifactId>spring-boot-starter-quartz</artifactId>
  23 + </dependency>
  24 + </dependencies>
  25 +
  26 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java
  View file @cf4eeab
@@ -15,7 +15,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean; @@ -15,7 +15,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean;
15 import javax.annotation.Resource; 15 import javax.annotation.Resource;
16 import java.util.Date; 16 import java.util.Date;
17 17
18 -import static cn.iocoder.yudao.framework.util.date.DateUtils.diff; 18 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.diff;
19 import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; 19 import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
20 20
21 /** 21 /**
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md renamed to yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
  View file @cf4eeab
@@ -15,4 +15,49 @@ @@ -15,4 +15,49 @@
15 <description>服务监控，提供链路追踪、日志服务、指标收集等等功能</description> 15 <description>服务监控，提供链路追踪、日志服务、指标收集等等功能</description>
16 <url>https://github.com/YunaiV/ruoyi-vue-pro</url> 16 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
17 17
  18 + <dependencies>
  19 + <dependency>
  20 + <groupId>cn.iocoder.boot</groupId>
  21 + <artifactId>yudao-common</artifactId>
  22 + </dependency>
  23 +
  24 + <!-- Spring 核心 -->
  25 + <dependency>
  26 + <groupId>org.springframework.boot</groupId>
  27 + <artifactId>spring-boot-starter-aop</artifactId>
  28 + </dependency>
  29 +
  30 + <!-- Web 相关 -->
  31 + <dependency>
  32 + <groupId>org.springframework</groupId>
  33 + <artifactId>spring-web</artifactId>
  34 + <scope>provided</scope> <!-- 设置为 provided，只有 TraceFilter 使用 -->
  35 + </dependency>
  36 +
  37 + <dependency>
  38 + <groupId>jakarta.servlet</groupId>
  39 + <artifactId>jakarta.servlet-api</artifactId>
  40 + <scope>provided</scope> <!-- 设置为 provided，只有 TraceFilter 使用 -->
  41 + </dependency>
  42 +
  43 + <!-- 监控相关 -->
  44 + <dependency>
  45 + <groupId>org.apache.skywalking</groupId>
  46 + <artifactId>apm-toolkit-trace</artifactId>
  47 + </dependency>
  48 + <dependency>
  49 + <groupId>org.apache.skywalking</groupId>
  50 + <artifactId>apm-toolkit-logback-1.x</artifactId>
  51 + </dependency>
  52 + <dependency>
  53 + <groupId>org.apache.skywalking</groupId>
  54 + <artifactId>apm-toolkit-opentracing</artifactId>
  55 + </dependency>
  56 +
  57 + <dependency>
  58 + <groupId>de.codecentric</groupId>
  59 + <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
  60 + </dependency>
  61 + </dependencies>
  62 +
18 </project> 63 </project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerAutoConfiguration.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.tracer.config; 1 +package cn.iocoder.yudao.framework.tracer.config;
2 2
3 -import cn.iocoder.dashboard.framework.tracer.core.aop.BizTraceAspect;  
4 -import cn.iocoder.dashboard.framework.tracer.core.filter.TraceFilter; 3 +import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
  4 +import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
5 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; 5 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
6 import io.opentracing.Tracer; 6 import io.opentracing.Tracer;
7 import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer; 7 import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerProperties.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.tracer.config; 1 +package cn.iocoder.yudao.framework.tracer.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-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/annotation/BizTrace.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.tracer.core.annotation; 1 +package cn.iocoder.yudao.framework.tracer.core.annotation;
2 2
3 import java.lang.annotation.*; 3 import java.lang.annotation.*;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.tracer.core.aop; 1 +package cn.iocoder.yudao.framework.tracer.core.aop;
2 2
3 import cn.hutool.core.map.MapUtil; 3 import cn.hutool.core.map.MapUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
5 -import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace;  
6 -import cn.iocoder.yudao.framework.util.sping.SpringExpressionUtils; 5 +import cn.iocoder.yudao.framework.tracer.core.annotation.BizTrace;
  6 +import cn.iocoder.yudao.framework.common.util.sping.SpringExpressionUtils;
7 import io.opentracing.Span; 7 import io.opentracing.Span;
8 import io.opentracing.Tracer; 8 import io.opentracing.Tracer;
9 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/filter/TraceFilter.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.tracer.core.filter; 1 +package cn.iocoder.yudao.framework.tracer.core.filter;
2 2
3 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 3 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
4 import org.springframework.web.filter.OncePerRequestFilter; 4 import org.springframework.web.filter.OncePerRequestFilter;
5 5
6 import javax.servlet.FilterChain; 6 import javax.servlet.FilterChain;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/package-info.java
  View file @cf4eeab
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * @author 芋道源码 4 * @author 芋道源码
5 */ 5 */
6 -package cn.iocoder.dashboard.framework.tracer; 6 +package cn.iocoder.yudao.framework.tracer;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
  View file @cf4eeab
@@ -22,8 +22,7 @@ @@ -22,8 +22,7 @@
22 <dependencies> 22 <dependencies>
23 <dependency> 23 <dependency>
24 <groupId>cn.iocoder.boot</groupId> 24 <groupId>cn.iocoder.boot</groupId>
25 - <artifactId>yudao-framework-all</artifactId>  
26 - <version>${revision}</version> 25 + <artifactId>yudao-common</artifactId>
27 </dependency> 26 </dependency>
28 27
29 <!-- Web 相关 --> 28 <!-- Web 相关 -->
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java
  View file @cf4eeab
1 package cn.iocoder.yudao.framework.mybatis.core.type; 1 package cn.iocoder.yudao.framework.mybatis.core.type;
2 2
3 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 3 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
4 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; 4 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
5 import com.fasterxml.jackson.core.type.TypeReference; 5 import com.fasterxml.jackson.core.type.TypeReference;
6 6
yudao-framework/yudao-spring-boot-starter-protection/pom.xml
  View file @cf4eeab
@@ -15,4 +15,24 @@ @@ -15,4 +15,24 @@
15 <description>服务保证，提供分布式锁、幂等、限流、熔断等等功能</description> 15 <description>服务保证，提供分布式锁、幂等、限流、熔断等等功能</description>
16 <url>https://github.com/YunaiV/ruoyi-vue-pro</url> 16 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
17 17
  18 + <dependencies>
  19 + <!-- DB 相关 -->
  20 + <dependency>
  21 + <groupId>cn.iocoder.boot</groupId>
  22 + <artifactId>yudao-spring-boot-starter-redis</artifactId>
  23 + <scope>provided</scope> <!-- 设置为 provider 范围，因为 IdempotentConfiguration 使用到 -->
  24 + </dependency>
  25 +
  26 + <!-- 服务保障相关 -->
  27 + <dependency>
  28 + <groupId>com.baomidou</groupId>
  29 + <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
  30 + </dependency>
  31 +
  32 + <dependency>
  33 + <groupId>io.github.resilience4j</groupId>
  34 + <artifactId>resilience4j-spring-boot2</artifactId>
  35 + </dependency>
  36 + </dependencies>
  37 +
18 </project> 38 </project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/IdempotentConfiguration.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.config; 1 +package cn.iocoder.yudao.framework.idempotent.config;
2 2
3 -import cn.iocoder.dashboard.framework.idempotent.core.aop.IdempotentAspect;  
4 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver;  
5 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver;  
6 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver;  
7 -import cn.iocoder.dashboard.framework.idempotent.core.redis.IdempotentRedisDAO; 3 +import cn.iocoder.yudao.framework.idempotent.core.aop.IdempotentAspect;
  4 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver;
  5 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver;
  6 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
  7 +import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO;
8 import org.springframework.boot.autoconfigure.AutoConfigureAfter; 8 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
9 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; 9 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
10 import org.springframework.context.annotation.Bean; 10 import org.springframework.context.annotation.Bean;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/annotation/Idempotent.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.annotation; 1 +package cn.iocoder.yudao.framework.idempotent.core.annotation;
2 2
3 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver;  
4 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver; 3 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver;
  4 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
5 5
6 import java.lang.annotation.ElementType; 6 import java.lang.annotation.ElementType;
7 import java.lang.annotation.Retention; 7 import java.lang.annotation.Retention;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/aop/IdempotentAspect.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.aop; 1 +package cn.iocoder.yudao.framework.idempotent.core.aop;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ServiceException; 3 import cn.iocoder.yudao.framework.common.exception.ServiceException;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
5 -import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent;  
6 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver;  
7 -import cn.iocoder.dashboard.framework.idempotent.core.redis.IdempotentRedisDAO;  
8 -import cn.iocoder.yudao.framework.util.collection.CollectionUtils; 5 +import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
  6 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
  7 +import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO;
  8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
10 import org.aspectj.lang.JoinPoint; 10 import org.aspectj.lang.JoinPoint;
11 import org.aspectj.lang.annotation.Aspect; 11 import org.aspectj.lang.annotation.Aspect;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.keyresolver; 1 +package cn.iocoder.yudao.framework.idempotent.core.keyresolver;
2 2
3 -import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent; 3 +import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
4 import org.aspectj.lang.JoinPoint; 4 import org.aspectj.lang.JoinPoint;
5 5
6 /** 6 /**
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.keyresolver.impl; 1 +package cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import cn.hutool.crypto.SecureUtil; 4 import cn.hutool.crypto.SecureUtil;
5 -import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent;  
6 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver; 5 +import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
  6 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
7 import org.aspectj.lang.JoinPoint; 7 import org.aspectj.lang.JoinPoint;
8 8
9 /** 9 /**
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.keyresolver.impl; 1 +package cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 -import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent;  
5 -import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver; 4 +import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
  5 +import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
6 import org.aspectj.lang.JoinPoint; 6 import org.aspectj.lang.JoinPoint;
7 import org.aspectj.lang.reflect.MethodSignature; 7 import org.aspectj.lang.reflect.MethodSignature;
8 import org.springframework.core.LocalVariableTableParameterNameDiscoverer; 8 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/redis/IdempotentRedisDAO.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.idempotent.core.redis; 1 +package cn.iocoder.yudao.framework.idempotent.core.redis;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; 3 +import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
5 import org.springframework.data.redis.core.StringRedisTemplate; 5 import org.springframework.data.redis.core.StringRedisTemplate;
6 6
7 import java.util.concurrent.TimeUnit; 7 import java.util.concurrent.TimeUnit;
8 8
9 -import static cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; 9 +import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING;
10 10
11 /** 11 /**
12 * 幂等 Redis DAO 12 * 幂等 Redis DAO
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/package-info.java
  View file @cf4eeab
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 * 此时，我们偏向使用 Lock4j 组件。原则上，一个组件只提供一种单一的能力。 9 * 此时，我们偏向使用 Lock4j 组件。原则上，一个组件只提供一种单一的能力。
10 * 2. 考虑到组件的通用性，我们并未像 it4alla/idempotent 组件一样使用 Redisson RMap 结构，而是直接使用 Redis 的 String 数据格式。 10 * 2. 考虑到组件的通用性，我们并未像 it4alla/idempotent 组件一样使用 Redisson RMap 结构，而是直接使用 Redis 的 String 数据格式。
11 */ 11 */
12 -package cn.iocoder.dashboard.framework.idempotent; 12 +package cn.iocoder.yudao.framework.idempotent;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/Lock4jConfiguration.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.lock4j.config; 1 +package cn.iocoder.yudao.framework.lock4j.config;
2 2
3 import cn.hutool.core.util.ClassUtil; 3 import cn.hutool.core.util.ClassUtil;
4 -import cn.iocoder.dashboard.framework.lock4j.core.DefaultLockFailureStrategy;  
5 -import cn.iocoder.dashboard.framework.lock4j.core.Lock4jRedisKeyConstants; 4 +import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy;
  5 +import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants;
6 import org.springframework.context.annotation.Bean; 6 import org.springframework.context.annotation.Bean;
7 import org.springframework.context.annotation.Configuration; 7 import org.springframework.context.annotation.Configuration;
8 8
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.lock4j.core; 1 +package cn.iocoder.yudao.framework.lock4j.core;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ServiceException; 3 import cn.iocoder.yudao.framework.common.exception.ServiceException;
4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/Lock4jRedisKeyConstants.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.lock4j.core; 1 +package cn.iocoder.yudao.framework.lock4j.core;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; 3 +import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
4 import org.redisson.api.RLock; 4 import org.redisson.api.RLock;
5 5
6 -import static cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.KeyTypeEnum.HASH; 6 +import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.HASH;
7 7
8 /** 8 /**
9 * Lock4j Redis Key 枚举类 9 * Lock4j Redis Key 枚举类
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/package-info.java
  View file @cf4eeab
1 /** 1 /**
2 * 分布式锁组件，使用 https://gitee.com/baomidou/lock4j 开源项目 2 * 分布式锁组件，使用 https://gitee.com/baomidou/lock4j 开源项目
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.lock4j; 4 +package cn.iocoder.yudao.framework.lock4j;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java
  View file @cf4eeab
@@ -6,4 +6,4 @@ @@ -6,4 +6,4 @@
6 * 4. 重试 6 * 4. 重试
7 * 5. 限时器 7 * 5. 限时器
8 */ 8 */
9 -package cn.iocoder.dashboard.framework.resilience4j; 9 +package cn.iocoder.yudao.framework.resilience4j;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-redis/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-redis</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>Redis 封装拓展</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 + <dependencies>
  19 + <dependency>
  20 + <groupId>cn.iocoder.boot</groupId>
  21 + <artifactId>yudao-common</artifactId>
  22 + </dependency>
  23 +
  24 + <!-- DB 相关 -->
  25 + <dependency>
  26 + <groupId>org.redisson</groupId>
  27 + <artifactId>redisson-spring-boot-starter</artifactId>
  28 + </dependency>
  29 + </dependencies>
  30 +
  31 +</project>
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/RedisConfig.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.config; 1 +package cn.iocoder.yudao.framework.redis.config;
2 2
3 import cn.hutool.system.SystemUtil; 3 import cn.hutool.system.SystemUtil;
4 -import cn.iocoder.dashboard.framework.redis.core.pubsub.AbstractChannelMessageListener;  
5 -import cn.iocoder.dashboard.framework.redis.core.stream.AbstractStreamMessageListener; 4 +import cn.iocoder.yudao.framework.redis.core.pubsub.AbstractChannelMessageListener;
  5 +import cn.iocoder.yudao.framework.redis.core.stream.AbstractStreamMessageListener;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
7 import org.springframework.context.annotation.Bean; 7 import org.springframework.context.annotation.Bean;
8 import org.springframework.context.annotation.Configuration; 8 import org.springframework.context.annotation.Configuration;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyDefine.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core; 1 +package cn.iocoder.yudao.framework.redis.core;
2 2
3 import com.fasterxml.jackson.annotation.JsonValue; 3 import com.fasterxml.jackson.annotation.JsonValue;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyRegistry.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core; 1 +package cn.iocoder.yudao.framework.redis.core;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/pubsub/AbstractChannelMessageListener.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.pubsub; 1 +package cn.iocoder.yudao.framework.redis.core.pubsub;
2 2
3 import cn.hutool.core.util.TypeUtil; 3 import cn.hutool.core.util.TypeUtil;
4 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 4 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
5 import lombok.SneakyThrows; 5 import lombok.SneakyThrows;
6 import org.springframework.data.redis.connection.Message; 6 import org.springframework.data.redis.connection.Message;
7 import org.springframework.data.redis.connection.MessageListener; 7 import org.springframework.data.redis.connection.MessageListener;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/pubsub/ChannelMessage.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.pubsub; 1 +package cn.iocoder.yudao.framework.redis.core.pubsub;
2 2
3 import com.fasterxml.jackson.annotation.JsonIgnore; 3 import com.fasterxml.jackson.annotation.JsonIgnore;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/stream/AbstractStreamMessageListener.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.stream; 1 +package cn.iocoder.yudao.framework.redis.core.stream;
2 2
3 import cn.hutool.core.util.TypeUtil; 3 import cn.hutool.core.util.TypeUtil;
4 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 4 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
5 import lombok.Getter; 5 import lombok.Getter;
6 import lombok.Setter; 6 import lombok.Setter;
7 import lombok.SneakyThrows; 7 import lombok.SneakyThrows;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/stream/StreamMessage.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.stream; 1 +package cn.iocoder.yudao.framework.redis.core.stream;
2 2
3 import com.fasterxml.jackson.annotation.JsonIgnore; 3 import com.fasterxml.jackson.annotation.JsonIgnore;
4 4
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/util/RedisMessageUtils.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework.redis.core.util; 1 +package cn.iocoder.yudao.framework.redis.core.util;
2 2
3 -import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage;  
4 -import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage;  
5 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 3 +import cn.iocoder.yudao.framework.redis.core.pubsub.ChannelMessage;
  4 +import cn.iocoder.yudao.framework.redis.core.stream.StreamMessage;
  5 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
6 import org.springframework.data.redis.connection.stream.RecordId; 6 import org.springframework.data.redis.connection.stream.RecordId;
7 import org.springframework.data.redis.connection.stream.StreamRecords; 7 import org.springframework.data.redis.connection.stream.StreamRecords;
8 import org.springframework.data.redis.core.RedisTemplate; 8 import org.springframework.data.redis.core.RedisTemplate;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/package-info.java
  View file @cf4eeab
1 /** 1 /**
2 * 采用 Spring Data Redis 操作 Redis，底层使用 Redisson 作为客户端 2 * 采用 Spring Data Redis 操作 Redis，底层使用 Redisson 作为客户端
3 */ 3 */
4 -package cn.iocoder.dashboard.framework.redis; 4 +package cn.iocoder.yudao.framework.redis;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/JwtAuthenticationTokenFilter.java
  View file @cf4eeab
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
7 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; 7 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService;
8 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; 8 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
9 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; 9 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
10 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 10 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 import org.springframework.web.filter.OncePerRequestFilter; 12 import org.springframework.web.filter.OncePerRequestFilter;
13 13
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java
  View file @cf4eeab
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.security.core.handler; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.security.core.handler;
3 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 3 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; 5 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
6 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 6 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
7 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
8 import org.springframework.security.access.AccessDeniedException; 8 import org.springframework.security.access.AccessDeniedException;
9 import org.springframework.security.web.access.AccessDeniedHandler; 9 import org.springframework.security.web.access.AccessDeniedHandler;
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.security.core.handler; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.security.core.handler;
2 2
3 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 3 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 5 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
6 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
7 import org.springframework.security.core.AuthenticationException; 7 import org.springframework.security.core.AuthenticationException;
8 import org.springframework.security.web.AuthenticationEntryPoint; 8 import org.springframework.security.web.AuthenticationEntryPoint;
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/LogoutSuccessHandlerImpl.java
  View file @cf4eeab
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.security.config.SecurityProperties; 5 import cn.iocoder.yudao.framework.security.config.SecurityProperties;
6 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; 6 import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService;
7 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; 7 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
8 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 8 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
9 import org.springframework.security.core.Authentication; 9 import org.springframework.security.core.Authentication;
10 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; 10 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
yudao-framework/yudao-spring-boot-starter-test/pom.xml 0 → 100644
  View file @cf4eeab
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao-framework</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-spring-boot-starter-test</artifactId>
  12 + <packaging>jar</packaging>
  13 +
  14 + <name>${artifactId}</name>
  15 + <description>测试组件，用于单元测试、集成测试</description>
  16 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
  17 +
  18 +
  19 + <dependencies>
  20 + <!-- Test 测试相关 -->
  21 + <dependency>
  22 + <groupId>org.springframework.boot</groupId>
  23 + <artifactId>spring-boot-starter-test</artifactId>
  24 + </dependency>
  25 +
  26 + <dependency>
  27 + <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 -->
  28 + <artifactId>h2</artifactId>
  29 + </dependency>
  30 +
  31 + <dependency>
  32 + <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 -->
  33 + <artifactId>jedis-mock</artifactId>
  34 + </dependency>
  35 +
  36 + <dependency>
  37 + <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 -->
  38 + <artifactId>podam</artifactId>
  39 + </dependency>
  40 + </dependencies>
  41 +</project>
yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/ut/BaseMockitoUnitTest.java
  View file @cf4eeab
1 -package cn.iocoder.dashboard.framework; 1 +package cn.iocoder.dashboard.framework.test.core.ut;
2 2
3 import org.junit.jupiter.api.extension.ExtendWith; 3 import org.junit.jupiter.api.extension.ExtendWith;
4 import org.mockito.junit.jupiter.MockitoExtension; 4 import org.mockito.junit.jupiter.MockitoExtension;
yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/ut/package-info.java 0 → 100644
  View file @cf4eeab
  1 +/**
  2 + * 提供单元测试 Unit Test 的基类
  3 + */
  4 +package cn.iocoder.dashboard.framework.test.core.ut;
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java
  View file @cf4eeab
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
  View file @cf4eeab
yudao-framework/yudao-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md 0 → 100644
  View file @cf4eeab
  1 +<https://www.iocoder.cn/Spring-Boot/Unit-Test/?yudao>
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
  View file @cf4eeab
@@ -7,12 +7,12 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant @@ -7,12 +7,12 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant
7 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 7 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8 import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; 8 import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService;
9 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; 9 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO;
10 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 10 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
11 import cn.iocoder.yudao.framework.web.config.WebProperties; 11 import cn.iocoder.yudao.framework.web.config.WebProperties;
12 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; 12 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
13 -import cn.iocoder.yudao.framework.util.date.DateUtils;  
14 -import cn.iocoder.yudao.framework.util.json.JsonUtils;  
15 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 13 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
  14 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
  15 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
16 import lombok.RequiredArgsConstructor; 16 import lombok.RequiredArgsConstructor;
17 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
18 import org.springframework.web.filter.OncePerRequestFilter; 18 import org.springframework.web.filter.OncePerRequestFilter;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.jackson.config; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.jackson.config;
2 2
3 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer; 3 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer;
4 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer; 4 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer;
5 -import cn.iocoder.yudao.framework.util.json.JsonUtils; 5 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
6 import com.fasterxml.jackson.databind.ObjectMapper; 6 import com.fasterxml.jackson.databind.ObjectMapper;
7 import com.fasterxml.jackson.databind.module.SimpleModule; 7 import com.fasterxml.jackson.databind.module.SimpleModule;
8 import org.springframework.context.annotation.Bean; 8 import org.springframework.context.annotation.Bean;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyFilter.java
  View file @cf4eeab
1 package cn.iocoder.yudao.framework.web.core.filter; 1 package cn.iocoder.yudao.framework.web.core.filter;
2 2
3 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 3 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
4 import org.springframework.web.filter.OncePerRequestFilter; 4 import org.springframework.web.filter.OncePerRequestFilter;
5 5
6 import javax.servlet.FilterChain; 6 import javax.servlet.FilterChain;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java
  View file @cf4eeab
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.web.core.filter; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.framework.web.core.filter;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 5 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
6 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; 6 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
7 import org.springframework.web.filter.OncePerRequestFilter; 7 import org.springframework.web.filter.OncePerRequestFilter;
8 8
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java
  View file @cf4eeab
@@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil; @@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
6 import cn.hutool.core.util.ReflectUtil; 6 import cn.hutool.core.util.ReflectUtil;
7 import cn.hutool.core.util.StrUtil; 7 import cn.hutool.core.util.StrUtil;
8 import cn.hutool.http.HTMLFilter; 8 import cn.hutool.http.HTMLFilter;
9 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 9 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
10 10
11 import javax.servlet.ReadListener; 11 import javax.servlet.ReadListener;
12 import javax.servlet.ServletInputStream; 12 import javax.servlet.ServletInputStream;
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
  View file @cf4eeab
@@ -7,10 +7,10 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException; @@ -7,10 +7,10 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException;
7 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 7 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8 import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; 8 import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
9 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; 9 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO;
10 -import cn.iocoder.yudao.framework.util.monitor.TracerUtils; 10 +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
11 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; 11 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
12 -import cn.iocoder.yudao.framework.util.json.JsonUtils;  
13 -import cn.iocoder.yudao.framework.util.servlet.ServletUtils; 12 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
  13 +import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
14 import io.github.resilience4j.ratelimiter.RequestNotPermitted; 14 import io.github.resilience4j.ratelimiter.RequestNotPermitted;
15 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
16 import org.apache.commons.lang3.exception.ExceptionUtils; 16 import org.apache.commons.lang3.exception.ExceptionUtils;