Commit f281aad6cd63ad1a1775c1a0e5320bf1c56bcce1
1 parent
86a9d957
项目结构调整 x 13 : 将 yudao-common 独立拆分
Showing
427 changed files
with
903 additions
and
805 deletions
README.md
| ... | ... | @@ -87,6 +87,15 @@ |
| 87 | 87 | |
| 88 | 88 | ## 技术栈 |
| 89 | 89 | |
| 90 | +| 项目 | 说明 | | |
| 91 | +| --- | --- | --- | --- | | |
| 92 | +| `yudao-dependencies` | Maven 依赖版本管理 | | |
| 93 | +| `yudao-framework` | Java 框架拓展 | | |
| 94 | +| `yudao-admin-server` | 管理后台的服务端 | | |
| 95 | +| `yudao-admin-ui` | 管理后台的 UI 界面 | | |
| 96 | +| `yudao-user-server` | 用户前台的服务端 | | |
| 97 | +| `yudao-user-ui` | 用户前台的 UI 界面 | | |
| 98 | + | |
| 90 | 99 | ### 后端 |
| 91 | 100 | |
| 92 | 101 | | 框架 | 说明 | 版本 | 学习指南 | | ... | ... |
pom.xml
| ... | ... | @@ -3,7 +3,6 @@ |
| 3 | 3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 4 | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | - | |
| 7 | 6 | <groupId>cn.iocoder.boot</groupId> |
| 8 | 7 | <artifactId>yudao</artifactId> |
| 9 | 8 | <version>${revision}</version> | ... | ... |
yudao-admin-server/pom.xml
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; |
| ... | ... | @@ -21,8 +21,8 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 26 | 26 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; |
| 28 | 28 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("参数配置导出 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.config.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("参数配置分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.doc; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.FileUtil; |
| 4 | 4 | import cn.hutool.core.util.IdUtil; |
| 5 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 5 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 6 | 6 | import cn.smallbun.screw.core.Configuration; |
| 7 | 7 | import cn.smallbun.screw.core.engine.EngineConfig; |
| 8 | 8 | import cn.smallbun.screw.core.engine.EngineFileType; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.file; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.IoUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; |
| 11 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 11 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 12 | 12 | import io.swagger.annotations.Api; |
| 13 | 13 | import io.swagger.annotations.ApiImplicitParam; |
| 14 | 14 | import io.swagger.annotations.ApiImplicitParams; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; |
| 25 | 25 | import javax.validation.Valid; |
| 26 | 26 | import java.io.IOException; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "文件存储") |
| 31 | 31 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.file.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("文件分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| ... | ... | @@ -27,7 +27,7 @@ import java.util.Collections; |
| 27 | 27 | import java.util.Date; |
| 28 | 28 | import java.util.List; |
| 29 | 29 | |
| 30 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 30 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 31 | 31 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 32 | 32 | |
| 33 | 33 | @Api(tags = "定时任务") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| ... | ... | @@ -28,7 +28,7 @@ import java.io.IOException; |
| 28 | 28 | import java.util.Collection; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 32 | 32 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 33 | 33 | |
| 34 | 34 | @Api(tags = "定时任务日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java
| ... | ... | @@ -5,10 +5,9 @@ import io.swagger.annotations.ApiModelProperty; |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | -import javax.validation.constraints.NotNull; | |
| 9 | 8 | import java.util.Date; |
| 10 | 9 | |
| 11 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | 11 | |
| 13 | 12 | @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的") |
| 14 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("定时任务日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| ... | ... | @@ -12,13 +12,11 @@ import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiAccessLogConvert; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.logger.InfApiAccessLogService; |
| 14 | 14 | import io.swagger.annotations.Api; |
| 15 | -import io.swagger.annotations.ApiImplicitParam; | |
| 16 | 15 | import io.swagger.annotations.ApiOperation; |
| 17 | 16 | import org.springframework.security.access.prepost.PreAuthorize; |
| 18 | 17 | import org.springframework.validation.annotation.Validated; |
| 19 | 18 | import org.springframework.web.bind.annotation.GetMapping; |
| 20 | 19 | import org.springframework.web.bind.annotation.RequestMapping; |
| 21 | -import org.springframework.web.bind.annotation.RequestParam; | |
| 22 | 20 | import org.springframework.web.bind.annotation.RestController; |
| 23 | 21 | |
| 24 | 22 | import javax.annotation.Resource; |
| ... | ... | @@ -27,7 +25,7 @@ import javax.validation.Valid; |
| 27 | 25 | import java.io.IOException; |
| 28 | 26 | import java.util.List; |
| 29 | 27 | |
| 30 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 31 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 32 | 30 | |
| 33 | 31 | @Api(tags = "API 访问日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 31 | 31 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("API 访问日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("API 错误日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.redis; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; |
| 5 | 5 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyRegistry; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO; |
| ... | ... | @@ -20,7 +20,7 @@ import javax.annotation.Resource; |
| 20 | 20 | import java.util.List; |
| 21 | 21 | import java.util.Properties; |
| 22 | 22 | |
| 23 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 23 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | 24 | |
| 25 | 25 | @Api(tags = "Redis 监控") |
| 26 | 26 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 6 | 6 | import org.mapstruct.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.config.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 6 | 6 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.file.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.FileTypeUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.file.config.FileProperties; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| ... | ... | @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; |
| 12 | 12 | import javax.annotation.Resource; |
| 13 | 13 | import java.io.ByteArrayInputStream; |
| 14 | 14 | |
| 15 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 15 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 16 | 16 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; |
| 17 | 17 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; |
| 18 | 18 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.service.JobLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; |
| 5 | 5 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| ... | ... | @@ -21,9 +21,9 @@ import javax.annotation.Resource; |
| 21 | 21 | import java.util.Collection; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 24 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.containsAny; | |
| 26 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.containsAny; | |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * 定时任务 Service 实现类 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| ... | ... | @@ -19,7 +19,7 @@ import java.util.Date; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | import java.util.concurrent.Future; |
| 21 | 21 | |
| 22 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 22 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 23 | 23 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; |
| 24 | 24 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; |
| 25 | 25 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 6 | -import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; | |
| 7 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 8 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; |
| 9 | 8 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; |
| ... | ... | @@ -17,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; |
| 17 | 16 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 18 | 17 | import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; |
| 19 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 20 | -import cn.iocoder.dashboard.util.collection.SetUtils; | |
| 19 | +import cn.iocoder.yudao.util.collection.SetUtils; | |
| 21 | 20 | import io.swagger.annotations.Api; |
| 22 | 21 | import io.swagger.annotations.ApiOperation; |
| 23 | 22 | import org.springframework.validation.annotation.Validated; |
| ... | ... | @@ -27,11 +26,11 @@ import javax.annotation.Resource; |
| 27 | 26 | import javax.validation.Valid; |
| 28 | 27 | import java.util.List; |
| 29 | 28 | |
| 30 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 29 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 31 | 30 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 32 | 31 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; |
| 33 | -import static cn.iocoder.dashboard.util.servlet.ServletUtils.getClientIP; | |
| 34 | -import static cn.iocoder.dashboard.util.servlet.ServletUtils.getUserAgent; | |
| 32 | +import static cn.iocoder.yudao.util.servlet.ServletUtils.getClientIP; | |
| 33 | +import static cn.iocoder.yudao.util.servlet.ServletUtils.getUserAgent; | |
| 35 | 34 | |
| 36 | 35 | @Api(tags = "认证") |
| 37 | 36 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.convert.auth.SysUserSessionConvert; |
| ... | ... | @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 14 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 14 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 15 | 15 | import io.swagger.annotations.Api; |
| 16 | 16 | import io.swagger.annotations.ApiImplicitParam; |
| 17 | 17 | import io.swagger.annotations.ApiOperation; |
| ... | ... | @@ -24,8 +24,8 @@ import java.util.ArrayList; |
| 24 | 24 | import java.util.List; |
| 25 | 25 | import java.util.Map; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertList; | |
| 27 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertList; | |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "用户 Session") |
| 31 | 31 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.AllArgsConstructor; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| 7 | 7 | import lombok.EqualsAndHashCode; |
| 8 | 8 | |
| 9 | -import javax.validation.constraints.NotEmpty; | |
| 10 | - | |
| 11 | 9 | @ApiModel("在线用户 Session 分页 Request VO") |
| 12 | 10 | @Data |
| 13 | 11 | @EqualsAndHashCode(callSuper = true) | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.common; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; |
| 6 | 6 | import io.swagger.annotations.Api; |
| ... | ... | @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; |
| 11 | 11 | |
| 12 | 12 | import javax.annotation.Resource; |
| 13 | 13 | |
| 14 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 14 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 15 | 15 | |
| 16 | 16 | @Api(tags = "验证码") |
| 17 | 17 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.Valid; |
| 18 | 18 | import java.util.Comparator; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "部门") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| ... | ... | @@ -24,7 +24,7 @@ import java.util.Collections; |
| 24 | 24 | import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | 28 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "岗位") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "字典数据") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "字典类型") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("字典类型分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | import javax.validation.constraints.Size; |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("字典类型分页列表 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "错误码") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("错误码分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| ... | ... | @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 16 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 18 | 18 | import io.swagger.annotations.Api; |
| 19 | 19 | import io.swagger.annotations.ApiOperation; |
| 20 | 20 | import org.springframework.security.access.prepost.PreAuthorize; |
| ... | ... | @@ -32,7 +32,7 @@ import java.util.Collection; |
| 32 | 32 | import java.util.List; |
| 33 | 33 | import java.util.Map; |
| 34 | 34 | |
| 35 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 35 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 36 | 36 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 37 | 37 | |
| 38 | 38 | @Api(tags = "操作日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("登陆日志分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel("登陆日志分页列表 Request VO") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("操作日志分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 8 | 8 | |
| 9 | 9 | import java.util.Date; |
| 10 | 10 | |
| 11 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | 12 | |
| 13 | 13 | @ApiModel("操作日志分页列表 Request VO") |
| 14 | 14 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO; |
| ... | ... | @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; |
| 18 | 18 | import javax.annotation.Resource; |
| 19 | 19 | import javax.validation.Valid; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "通知公告") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.notice.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.Valid; |
| 18 | 18 | import java.util.Comparator; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "菜单") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleDataScopeReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleMenuReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignUserRoleReqVO; |
| ... | ... | @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; |
| 14 | 14 | import javax.annotation.Resource; |
| 15 | 15 | import java.util.Set; |
| 16 | 16 | |
| 17 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 17 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * 权限 Controller，提供赋予用户、角色的权限的 API 接口 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; |
| ... | ... | @@ -24,7 +24,7 @@ import java.util.Collections; |
| 24 | 24 | import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | 28 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "角色") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java
| ... | ... | @@ -3,12 +3,11 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; |
| 3 | 3 | import io.swagger.annotations.ApiModel; |
| 4 | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | 5 | import lombok.Data; |
| 6 | -import lombok.EqualsAndHashCode; | |
| 7 | 6 | import org.springframework.format.annotation.DateTimeFormat; |
| 8 | 7 | |
| 9 | 8 | import java.util.Date; |
| 10 | 9 | |
| 11 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | 11 | |
| 13 | 12 | @ApiModel("角色分页 Request VO") |
| 14 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel("角色分页 Request VO") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.URLUtil; |
| 4 | 4 | import cn.hutool.extra.servlet.ServletUtil; |
| 5 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; |
| ... | ... | @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; |
| 17 | 17 | import javax.annotation.Resource; |
| 18 | 18 | import javax.servlet.http.HttpServletRequest; |
| 19 | 19 | |
| 20 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 21 | 21 | |
| 22 | 22 | @Api(tags = "短信回调") |
| 23 | 23 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsChannelConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; |
| ... | ... | @@ -17,7 +17,7 @@ import javax.validation.Valid; |
| 17 | 17 | import java.util.Comparator; |
| 18 | 18 | import java.util.List; |
| 19 | 19 | |
| 20 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 21 | 21 | |
| 22 | 22 | @Api(tags = "短信渠道") |
| 23 | 23 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | |
| 31 | 31 | @Api(tags = "短信日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api("短信模板") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.channel; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信渠道分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "短信日志 Excel 导出 Request VO", description = "参数和 SysSmsLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "短信模板 Excel 导出 Request VO", description = "参数和 SysSmsTemplatePageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信模板分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; |
| ... | ... | @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 16 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 18 | 18 | import io.swagger.annotations.Api; |
| 19 | 19 | import io.swagger.annotations.ApiImplicitParam; |
| 20 | 20 | import io.swagger.annotations.ApiImplicitParams; |
| ... | ... | @@ -30,7 +30,7 @@ import javax.validation.Valid; |
| 30 | 30 | import java.io.IOException; |
| 31 | 31 | import java.util.*; |
| 32 | 32 | |
| 33 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 33 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 34 | 34 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 35 | 35 | |
| 36 | 36 | @Api(tags = "用户") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileRespVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; |
| ... | ... | @@ -28,7 +28,7 @@ import javax.validation.Valid; |
| 28 | 28 | import java.io.IOException; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 32 | 32 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 33 | 33 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_IS_EMPTY; |
| 34 | 34 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel(value = "用户导出 Request VO", description = "参数和 SysUserPageReqVO 是一致的") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user.vo.user; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.AllArgsConstructor; |
| ... | ... | @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 11 | 11 | |
| 12 | 12 | import java.util.Date; |
| 13 | 13 | |
| 14 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 15 | 15 | |
| 16 | 16 | @ApiModel("用户分页 Request VO") |
| 17 | 17 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
| ... | ... | @@ -9,7 +9,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum; |
| 12 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 12 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 13 | 13 | import org.mapstruct.Mapper; |
| 14 | 14 | import org.mapstruct.Mapping; |
| 15 | 15 | import org.mapstruct.factory.Mappers; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; |
| 6 | 6 | import org.mapstruct.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; |
| 7 | -import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; | |
| 8 | 7 | import org.mapstruct.Mapper; |
| 9 | 8 | import org.mapstruct.factory.Mappers; |
| 10 | 9 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 4 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| 6 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 7 | 6 | import org.mapstruct.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 9 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 9 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 10 | 10 | import org.mapstruct.Mapper; |
| 11 | 11 | import org.mapstruct.factory.Mappers; |
| 12 | 12 | |
| ... | ... | @@ -14,7 +14,7 @@ import java.util.List; |
| 14 | 14 | import java.util.Map; |
| 15 | 15 | import java.util.stream.Collectors; |
| 16 | 16 | |
| 17 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 17 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 18 | 18 | |
| 19 | 19 | @Mapper |
| 20 | 20 | public interface SysOperateLogConvert { | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableField; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; |
| 6 | 6 | import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.user; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 6 | 6 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; |
| 8 | -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
| 9 | 8 | import org.apache.ibatis.annotations.Mapper; |
| 10 | 9 | import org.apache.ibatis.annotations.Select; |
| 11 | 10 | |
| 12 | 11 | import java.util.Date; |
| 13 | -import java.util.List; | |
| 14 | 12 | |
| 15 | 13 | @Mapper |
| 16 | 14 | public interface SysSmsChannelMapper extends BaseMapperX<SysSmsChannelDO> { | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.user; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.dal.redis.auth; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; |
| 5 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 6 | 6 | import org.springframework.data.redis.core.StringRedisTemplate; |
| 7 | 7 | import org.springframework.stereotype.Repository; |
| 8 | 8 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.mq.producer.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.auth.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 6 | 6 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 19 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 19 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 20 | 20 | import lombok.extern.slf4j.Slf4j; |
| 21 | 21 | import org.springframework.security.authentication.AuthenticationManager; |
| 22 | 22 | import org.springframework.security.authentication.BadCredentialsException; |
| ... | ... | @@ -32,7 +32,7 @@ import org.springframework.util.Assert; |
| 32 | 32 | import javax.annotation.Resource; |
| 33 | 33 | import java.util.Set; |
| 34 | 34 | |
| 35 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 35 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 36 | 36 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 37 | 37 | import static java.util.Collections.singleton; |
| 38 | 38 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl; |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.IdUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.security.config.SecurityProperties; |
| 8 | 8 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 9 | 9 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| ... | ... | @@ -26,8 +26,8 @@ import java.time.Duration; |
| 26 | 26 | import java.util.*; |
| 27 | 27 | import java.util.stream.Collectors; |
| 28 | 28 | |
| 29 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; | |
| 30 | -import static cn.iocoder.dashboard.util.date.DateUtils.addTime; | |
| 29 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; | |
| 30 | +import static cn.iocoder.yudao.util.date.DateUtils.addTime; | |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * 在线用户 Session Service 实现类 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java
| ... | ... | @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| 8 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 8 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 9 | 9 | |
| 10 | 10 | import java.util.Collection; |
| 11 | 11 | import java.util.Collections; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO; |
| ... | ... | @@ -12,7 +12,7 @@ import org.springframework.lang.Nullable; |
| 12 | 12 | import java.util.Collection; |
| 13 | 13 | import java.util.List; |
| 14 | 14 | |
| 15 | -import static cn.iocoder.dashboard.util.collection.SetUtils.asSet; | |
| 15 | +import static cn.iocoder.yudao.util.collection.SetUtils.asSet; | |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * 岗位 Service 接口 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dept.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dept.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; |
| 7 | 7 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; |
| ... | ... | @@ -28,7 +28,7 @@ import java.util.Comparator; |
| 28 | 28 | import java.util.Date; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 32 | 32 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 33 | 33 | |
| 34 | 34 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; |
| ... | ... | @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; |
| 16 | 16 | import javax.annotation.Resource; |
| 17 | 17 | import java.util.List; |
| 18 | 18 | |
| 19 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 19 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 20 | 20 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 21 | 21 | |
| 22 | 22 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.errorcode.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| ... | ... | @@ -24,10 +24,10 @@ import java.util.Date; |
| 24 | 24 | import java.util.List; |
| 25 | 25 | import java.util.Map; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 27 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertMap; | |
| 30 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; | |
| 29 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertMap; | |
| 30 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; | |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * 错误码 Service 实现类 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.logger.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.logger.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 15 | -import cn.iocoder.dashboard.util.string.StrUtils; | |
| 15 | +import cn.iocoder.yudao.util.string.StrUtils; | |
| 16 | 16 | import lombok.extern.slf4j.Slf4j; |
| 17 | 17 | import org.springframework.scheduling.annotation.Async; |
| 18 | 18 | import org.springframework.scheduling.annotation.AsyncResult; |
| ... | ... | @@ -26,7 +26,7 @@ import java.util.concurrent.Future; |
| 26 | 26 | |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH; |
| 29 | -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; | |
| 29 | +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; | |
| 30 | 30 | |
| 31 | 31 | @Service |
| 32 | 32 | @Slf4j | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.notice.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.permission.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; |
| ... | ... | @@ -14,7 +14,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 17 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 18 | 18 | import com.google.common.annotations.VisibleForTesting; |
| 19 | 19 | import com.google.common.collect.ImmutableMap; |
| 20 | 20 | import com.google.common.collect.ImmutableMultimap; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
| ... | ... | @@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysPermissionP |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; |
| 17 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 18 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 17 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 18 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 19 | 19 | import com.google.common.collect.ImmutableMultimap; |
| 20 | 20 | import com.google.common.collect.Multimap; |
| 21 | 21 | import com.google.common.collect.Sets; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
| ... | ... | @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.collection.CollectionUtil; |
| 5 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| ... | ... | @@ -25,7 +25,7 @@ import java.util.Comparator; |
| 25 | 25 | import java.util.Date; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 28 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 29 | 29 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; |
| 30 | 30 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; |
| 31 | 31 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java
| ... | ... | @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 6 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 5 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -28,7 +28,7 @@ import java.util.List; |
| 28 | 28 | import java.util.Map; |
| 29 | 29 | import java.util.stream.Collectors; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 32 | 32 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 33 | 33 | |
| 34 | 34 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java
| ... | ... | @@ -3,8 +3,8 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.ReUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| ... | ... | @@ -33,7 +33,7 @@ import javax.annotation.Resource; |
| 33 | 33 | import java.util.*; |
| 34 | 34 | import java.util.regex.Pattern; |
| 35 | 35 | |
| 36 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 36 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 37 | 37 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 38 | 38 | |
| 39 | 39 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserCreateReqVO; |
| ... | ... | @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserImport |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 14 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 14 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 15 | 15 | |
| 16 | 16 | import java.io.InputStream; |
| 17 | 17 | import java.util.Collection; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
| ... | ... | @@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.io.IoUtil; |
| 5 | 5 | import cn.hutool.core.util.IdUtil; |
| 6 | 6 | import cn.hutool.core.util.StrUtil; |
| 7 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 8 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 9 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 7 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 8 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 9 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; |
| ... | ... | @@ -19,7 +19,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.user.SysUserMapper; |
| 19 | 19 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 20 | 20 | import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; |
| 21 | 21 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 22 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 22 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 23 | 23 | import com.google.common.annotations.VisibleForTesting; |
| 24 | 24 | import lombok.extern.slf4j.Slf4j; |
| 25 | 25 | import org.springframework.beans.factory.annotation.Value; |
| ... | ... | @@ -31,7 +31,7 @@ import javax.annotation.Resource; |
| 31 | 31 | import java.io.InputStream; |
| 32 | 32 | import java.util.*; |
| 33 | 33 | |
| 34 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 34 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 35 | 35 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 36 | 36 | |
| 37 | 37 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java
| ... | ... | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.tool.controller.codegen; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.IoUtil; |
| 4 | 4 | import cn.hutool.core.util.ZipUtil; |
| 5 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; |
| ... | ... | @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColum |
| 15 | 15 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; |
| 16 | 16 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO; |
| 17 | 17 | import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; |
| 18 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 19 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 18 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 19 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 20 | 20 | import io.swagger.annotations.Api; |
| 21 | 21 | import io.swagger.annotations.ApiImplicitParam; |
| 22 | 22 | import io.swagger.annotations.ApiImplicitParams; |
| ... | ... | @@ -35,7 +35,7 @@ import java.util.List; |
| 35 | 35 | import java.util.Map; |
| 36 | 36 | import java.util.Set; |
| 37 | 37 | |
| 38 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 38 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 39 | 39 | |
| 40 | 40 | @Api(tags = "代码生成器") |
| 41 | 41 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("表定义分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.controller.test; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.thread.ThreadUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 8 | 8 | import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; |
| ... | ... | @@ -25,7 +25,7 @@ import java.util.Collection; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | import java.util.concurrent.TimeUnit; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | |
| 31 | 31 | @Api(tags = "测试示例") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "字典类型 Excel 导出 Request VO", description = "参数和 ToolTestDemoPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.controller.test.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("字典类型分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.convert.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.convert.test; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.mysql.test; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.service.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
| ... | ... | @@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil; |
| 5 | 5 | import cn.hutool.extra.template.TemplateConfig; |
| 6 | 6 | import cn.hutool.extra.template.TemplateEngine; |
| 7 | 7 | import cn.hutool.extra.template.engine.velocity.VelocityEngine; |
| 8 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 9 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 10 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 11 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 8 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 9 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 10 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 11 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 12 | 12 | import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; |
| 13 | 13 | import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; |
| 14 | 14 | import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; |
| ... | ... | @@ -20,8 +20,8 @@ import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; |
| 20 | 20 | import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; |
| 21 | 21 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; |
| 22 | 22 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; |
| 23 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 24 | -import cn.iocoder.dashboard.util.date.DateUtils; | |
| 23 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 24 | +import cn.iocoder.yudao.util.date.DateUtils; | |
| 25 | 25 | import com.google.common.collect.Maps; |
| 26 | 26 | import org.springframework.stereotype.Component; |
| 27 | 27 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.service.codegen.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; |
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaColumnMappe |
| 16 | 16 | import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper; |
| 17 | 17 | import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenImportTypeEnum; |
| 18 | 18 | import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; |
| 19 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 19 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 20 | 20 | import org.apache.commons.collections4.KeyValue; |
| 21 | 21 | import org.springframework.stereotype.Service; |
| 22 | 22 | import org.springframework.transaction.annotation.Transactional; |
| ... | ... | @@ -28,7 +28,7 @@ import java.util.Map; |
| 28 | 28 | import java.util.Set; |
| 29 | 29 | import java.util.stream.Collectors; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 32 | 32 | import static cn.iocoder.dashboard.modules.tool.enums.ToolErrorCodeConstants.*; |
| 33 | 33 | |
| 34 | 34 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.service.test; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.service.test.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoPageReqVO; | ... | ... |
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; | ... | ... |
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; | ... | ... |
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; | ... | ... |
yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.hutool.core.thread.ThreadUtil; |
| 5 | 5 | import cn.iocoder.dashboard.BaseDbAndRedisIntegrationTest; |
| 6 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.config.SmsConfiguration; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.mq.consumer.sms.SysSmsSendConsumer; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.config; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; |
| ... | ... | @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper; |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.config.impl.InfConfigServiceImpl; |
| 14 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 15 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 14 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 15 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -23,10 +23,10 @@ import java.util.function.Consumer; |
| 23 | 23 | |
| 24 | 24 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 28 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 29 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.*; |
| 31 | 31 | import static org.mockito.Mockito.times; |
| 32 | 32 | import static org.mockito.Mockito.verify; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java
| ... | ... | @@ -2,25 +2,25 @@ package cn.iocoder.dashboard.modules.infra.service.file; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.resource.ResourceUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.file.config.FileProperties; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.service.file.impl.InfFileServiceImpl; |
| 11 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 11 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 12 | 12 | import org.junit.jupiter.api.Test; |
| 13 | 13 | import org.springframework.context.annotation.Import; |
| 14 | 14 | |
| 15 | 15 | import javax.annotation.Resource; |
| 16 | 16 | |
| 17 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 17 | 18 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; |
| 18 | 19 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; |
| 19 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 20 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 21 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 22 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 23 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 20 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 21 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 22 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; | |
| 23 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 24 | 24 | import static org.junit.jupiter.api.Assertions.*; |
| 25 | 25 | |
| 26 | 26 | @Import({InfFileServiceImpl.class, FileProperties.class}) | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | 3 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 4 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 5 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 6 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 7 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 8 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 4 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 5 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 6 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 7 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; | |
| 8 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 9 | 9 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 10 | 10 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 11 | 11 | |
| ... | ... | @@ -18,14 +18,14 @@ import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| 19 | 19 | |
| 20 | 20 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 21 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 21 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 22 | 22 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 23 | 23 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| 24 | 24 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; |
| 25 | 25 | import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobLogMapper; |
| 26 | 26 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; |
| 27 | 27 | import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobLogServiceImpl; |
| 28 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 28 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * {@link InfJobLogServiceImpl} 的单元测试 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java
| ... | ... | @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB |
| 7 | 7 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; |
| 8 | 8 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; |
| 9 | 9 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; |
| 10 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 11 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 12 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 13 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 10 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 11 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 12 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 13 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; | |
| 14 | 14 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 15 | 15 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 16 | 16 | import static org.junit.jupiter.api.Assertions.assertNull; |
| ... | ... | @@ -29,7 +29,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; |
| 29 | 29 | import org.springframework.context.annotation.Import; |
| 30 | 30 | |
| 31 | 31 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 32 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 32 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 33 | 33 | import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; |
| 34 | 34 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| 35 | 35 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; |
| ... | ... | @@ -40,7 +40,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO; |
| 40 | 40 | import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobMapper; |
| 41 | 41 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum; |
| 42 | 42 | import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobServiceImpl; |
| 43 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 43 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * {@link InfJobServiceImpl} 的单元测试 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java
| ... | ... | @@ -2,17 +2,17 @@ package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; |
| 14 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 15 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 14 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 15 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| 18 | 18 | |
| ... | ... | @@ -21,8 +21,8 @@ import java.util.Date; |
| 21 | 21 | import java.util.List; |
| 22 | 22 | import java.util.concurrent.Future; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 25 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 24 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 25 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 26 | 26 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 27 | 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
| ... | ... | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| ... | ... | @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; |
| 13 | 13 | import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; |
| 14 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 15 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 14 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 15 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| 18 | 18 | |
| ... | ... | @@ -23,9 +23,9 @@ import java.util.concurrent.Future; |
| 23 | 23 | |
| 24 | 24 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; |
| 26 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 28 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 29 | 29 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 31 | 31 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 15 | -import cn.iocoder.dashboard.util.test.AssertUtils; | |
| 15 | +import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -28,8 +28,8 @@ import javax.annotation.Resource; |
| 28 | 28 | import java.util.Set; |
| 29 | 29 | |
| 30 | 30 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 31 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 32 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 32 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 33 | 33 | import static java.util.Collections.singleton; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.ArgumentMatchers.eq; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | |
| 3 | 3 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 4 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 5 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomDate; | |
| 6 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 7 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 8 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 9 | -import static cn.iocoder.dashboard.util.date.DateUtils.addTime; | |
| 4 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 5 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDate; | |
| 6 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 7 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 8 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; | |
| 9 | +import static cn.iocoder.yudao.util.date.DateUtils.addTime; | |
| 10 | 10 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 11 | 11 | import static org.junit.jupiter.api.Assertions.assertNotEquals; |
| 12 | 12 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| ... | ... | @@ -27,8 +27,8 @@ import org.springframework.context.annotation.Import; |
| 27 | 27 | |
| 28 | 28 | import cn.hutool.core.date.DateUtil; |
| 29 | 29 | import cn.iocoder.dashboard.BaseDbAndRedisUnitTest; |
| 30 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 31 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 30 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 31 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 32 | 32 | import cn.iocoder.dashboard.framework.security.config.SecurityProperties; |
| 33 | 33 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 34 | 34 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| ... | ... | @@ -42,9 +42,9 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi |
| 42 | 42 | import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; |
| 43 | 43 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; |
| 44 | 44 | import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; |
| 45 | -import cn.iocoder.dashboard.util.test.AssertUtils; | |
| 46 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 47 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 45 | +import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; | |
| 46 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 47 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * SysUserSessionServiceImpl Tester. | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; |
| 10 | 10 | |
| 11 | 11 | import javax.annotation.Resource; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; | |
| 13 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; | |
| 14 | 14 | import static org.junit.jupiter.api.Assertions.*; |
| 15 | 15 | |
| 16 | 16 | @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dept; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; |
| ... | ... | @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysDeptMapper; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; |
| 13 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | 15 | import com.google.common.collect.Multimap; |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -26,9 +26,9 @@ import java.util.function.Consumer; |
| 26 | 26 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 27 | 27 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 30 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 31 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; |
| 33 | 33 | import static org.mockito.Mockito.times; |
| 34 | 34 | import static org.mockito.Mockito.verify; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dept; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO; |
| ... | ... | @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdate |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.dept.impl.SysPostServiceImpl; |
| 13 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | 15 | import org.junit.jupiter.api.Test; |
| 16 | 16 | import org.springframework.context.annotation.Import; |
| 17 | 17 | |
| ... | ... | @@ -21,10 +21,10 @@ import java.util.function.Consumer; |
| 21 | 21 | |
| 22 | 22 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 23 | 23 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 24 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 25 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 26 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 27 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 24 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 25 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 27 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 28 | 28 | import static org.junit.jupiter.api.Assertions.*; |
| 29 | 29 | |
| 30 | 30 | /** | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO; |
| ... | ... | @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictDataServiceImpl; |
| 15 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | 17 | import com.google.common.collect.ImmutableTable; |
| 18 | 18 | import org.junit.jupiter.api.Test; |
| 19 | 19 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -26,9 +26,9 @@ import java.util.function.Consumer; |
| 26 | 26 | |
| 27 | 27 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 30 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 31 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; |
| 33 | 33 | import static org.mockito.ArgumentMatchers.eq; |
| 34 | 34 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.dict; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; |
| ... | ... | @@ -10,8 +10,8 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUp |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictTypeServiceImpl; |
| 13 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | 15 | import org.junit.jupiter.api.Test; |
| 16 | 16 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -22,10 +22,10 @@ import java.util.function.Consumer; |
| 22 | 22 | |
| 23 | 23 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 24 | 24 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 25 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 26 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 27 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 28 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 25 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 27 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 28 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 29 | 29 | import static org.junit.jupiter.api.Assertions.*; |
| 30 | 30 | import static org.mockito.ArgumentMatchers.eq; |
| 31 | 31 | import static org.mockito.Mockito.when; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.errorcode; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| ... | ... | @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCode |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.dal.mysql.errorcode.SysErrorCodeMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl; |
| 15 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | 17 | import org.assertj.core.util.Lists; |
| 18 | 18 | import org.junit.jupiter.api.Test; |
| 19 | 19 | import org.mockito.Mock; |
| ... | ... | @@ -27,10 +27,10 @@ import java.util.function.Consumer; |
| 27 | 27 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; |
| 29 | 29 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; |
| 30 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 32 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 32 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 33 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 34 | 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
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| ... | ... | @@ -12,16 +12,16 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; |
| 15 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 16 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 16 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | 17 | import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| 19 | 19 | |
| 20 | 20 | import javax.annotation.Resource; |
| 21 | 21 | import java.util.List; |
| 22 | 22 | |
| 23 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 24 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 23 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 24 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 25 | 25 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 26 | 26 | |
| 27 | 27 | @Import(SysLoginLogServiceImpl.class) | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java
| ... | ... | @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; |
| 9 | 9 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 10 | 10 | import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; |
| ... | ... | @@ -16,8 +16,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 19 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 20 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 19 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 20 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 21 | 21 | import org.junit.jupiter.api.Test; |
| 22 | 22 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 23 | 23 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -27,9 +27,9 @@ import java.util.*; |
| 27 | 27 | import java.util.concurrent.ExecutionException; |
| 28 | 28 | import java.util.concurrent.Future; |
| 29 | 29 | |
| 30 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 32 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 32 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 33 | 33 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 34 | 34 | import static org.mockito.Mockito.when; |
| 35 | 35 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.notice; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; |
| ... | ... | @@ -10,7 +10,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.notice.impl.SysNoticeServiceImpl; |
| 13 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 14 | 14 | import org.junit.jupiter.api.Test; |
| 15 | 15 | import org.springframework.context.annotation.Import; |
| 16 | 16 | |
| ... | ... | @@ -20,10 +20,10 @@ import java.util.function.Consumer; |
| 20 | 20 | |
| 21 | 21 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 22 | 22 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; |
| 23 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 24 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 25 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 26 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 23 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 24 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 25 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 27 | 27 | import static org.junit.jupiter.api.Assertions.*; |
| 28 | 28 | |
| 29 | 29 | @Import(SysNoticeServiceImpl.class) | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission; |
| 3 | 3 | import cn.hutool.core.bean.BeanUtil; |
| 4 | 4 | import cn.hutool.core.lang.Assert; |
| 5 | 5 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 6 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO; |
| ... | ... | @@ -12,9 +12,9 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; |
| 15 | -import cn.iocoder.dashboard.util.sping.SpringAopUtils; | |
| 16 | -import cn.iocoder.dashboard.util.test.RandomUtils; | |
| 17 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.util.sping.SpringAopUtils; | |
| 16 | +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; | |
| 17 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 18 | 18 | import com.google.common.collect.Multimap; |
| 19 | 19 | import org.junit.jupiter.api.Assertions; |
| 20 | 20 | import org.junit.jupiter.api.Test; |
| ... | ... | @@ -25,9 +25,9 @@ import javax.annotation.Resource; |
| 25 | 25 | import java.util.*; |
| 26 | 26 | |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 28 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 29 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 30 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 28 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 29 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 31 | 31 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 32 | 32 | import static org.mockito.Mockito.verify; |
| 33 | 33 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java
| ... | ... | @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; |
| 14 | 14 | import javax.annotation.Resource; |
| 15 | 15 | import java.util.List; |
| 16 | 16 | |
| 17 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 18 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; | |
| 19 | -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; | |
| 17 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 18 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; | |
| 19 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; | |
| 20 | 20 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 21 | 21 | import static org.mockito.Mockito.verify; |
| 22 | 22 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java
| ... | ... | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.permission; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.bean.BeanUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; |
| ... | ... | @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl; |
| 16 | -import cn.iocoder.dashboard.util.sping.SpringAopUtils; | |
| 16 | +import cn.iocoder.yudao.util.sping.SpringAopUtils; | |
| 17 | 17 | import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 19 | 19 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -23,10 +23,10 @@ import java.util.*; |
| 23 | 23 | import java.util.stream.Collectors; |
| 24 | 24 | |
| 25 | 25 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 27 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 28 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 29 | -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; | |
| 26 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 27 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 28 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 29 | +import static cn.iocoder.yudao.util.object.ObjectUtils.max; | |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.*; |
| 31 | 31 | import static org.mockito.Mockito.verify; |
| 32 | 32 | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java
| ... | ... | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.bean.BeanUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; |
| ... | ... | @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsChannelMapper; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsChannelServiceImpl; |
| 15 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | 17 | import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 19 | 19 | import org.springframework.context.annotation.Import; |
| ... | ... | @@ -25,10 +25,10 @@ import java.util.function.Consumer; |
| 25 | 25 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 26 | 26 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; |
| 28 | -import static cn.iocoder.dashboard.util.test.AssertUtils.*; | |
| 29 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 30 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 31 | -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; | |
| 28 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*; | |
| 29 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 30 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 31 | +import static cn.iocoder.yudao.util.object.ObjectUtils.max; | |
| 32 | 32 | import static org.junit.jupiter.api.Assertions.*; |
| 33 | 33 | import static org.mockito.ArgumentMatchers.eq; |
| 34 | 34 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java
| ... | ... | @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; |
| ... | ... | @@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsLogServiceImpl; |
| 17 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 18 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 17 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 18 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 19 | 19 | import org.junit.jupiter.api.Test; |
| 20 | 20 | import org.springframework.context.annotation.Import; |
| 21 | 21 | |
| ... | ... | @@ -27,9 +27,9 @@ import java.util.function.Consumer; |
| 27 | 27 | |
| 28 | 28 | import static cn.hutool.core.util.RandomUtil.randomBoolean; |
| 29 | 29 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 30 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 31 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 32 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 30 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 31 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 32 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 33 | 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/SysSmsServiceTest.java
| ... | ... | @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseMockitoUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 6 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 5 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -25,8 +25,8 @@ import java.util.Map; |
| 25 | 25 | |
| 26 | 26 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 28 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 29 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 28 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 29 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 30 | 30 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 31 | 31 | import static org.mockito.ArgumentMatchers.eq; |
| 32 | 32 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.service.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 6 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -18,8 +18,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsTemplateMapper; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; |
| 19 | 19 | import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; |
| 20 | 20 | import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsTemplateServiceImpl; |
| 21 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 22 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 21 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 22 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 23 | 23 | import com.google.common.collect.Lists; |
| 24 | 24 | import org.junit.jupiter.api.Test; |
| 25 | 25 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -34,11 +34,11 @@ import java.util.function.Consumer; |
| 34 | 34 | import static cn.hutool.core.bean.BeanUtil.getFieldValue; |
| 35 | 35 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 36 | 36 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 37 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 38 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 39 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 40 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 41 | -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; | |
| 37 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 38 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 39 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 40 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 41 | +import static cn.iocoder.yudao.util.object.ObjectUtils.max; | |
| 42 | 42 | import static org.junit.jupiter.api.Assertions.*; |
| 43 | 43 | import static org.mockito.ArgumentMatchers.eq; |
| 44 | 44 | import static org.mockito.Mockito.*; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java
| ... | ... | @@ -3,8 +3,8 @@ package cn.iocoder.dashboard.modules.system.service.user; |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.RandomUtil; |
| 5 | 5 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 6 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; |
| ... | ... | @@ -17,9 +17,9 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; |
| 19 | 19 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 20 | -import cn.iocoder.dashboard.util.collection.ArrayUtils; | |
| 21 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 22 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 20 | +import cn.iocoder.yudao.util.collection.ArrayUtils; | |
| 21 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 22 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 23 | 23 | import org.junit.jupiter.api.Test; |
| 24 | 24 | import org.mockito.stubbing.Answer; |
| 25 | 25 | import org.springframework.boot.test.mock.mockito.MockBean; |
| ... | ... | @@ -35,10 +35,10 @@ import java.util.function.Consumer; |
| 35 | 35 | import static cn.hutool.core.util.RandomUtil.randomBytes; |
| 36 | 36 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 37 | 37 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 38 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; | |
| 39 | -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; | |
| 40 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 41 | -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; | |
| 38 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 39 | +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; | |
| 40 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 41 | +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 42 | 42 | import static org.assertj.core.util.Lists.newArrayList; |
| 43 | 43 | import static org.junit.jupiter.api.Assertions.assertEquals; |
| 44 | 44 | import static org.junit.jupiter.api.Assertions.assertNull; | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -20,6 +20,7 @@ |
| 20 | 20 | <!-- Web 相关 --> |
| 21 | 21 | <knife4j.version>3.0.2</knife4j.version> |
| 22 | 22 | <swagger-annotations.version>1.5.22</swagger-annotations.version> |
| 23 | + <servlet.versoin>2.5</servlet.versoin> | |
| 23 | 24 | <!-- DB 相关 --> |
| 24 | 25 | <mysql-connector-java.version>5.1.46</mysql-connector-java.version> |
| 25 | 26 | <druid.version>1.2.4</druid.version> |
| ... | ... | @@ -45,6 +46,7 @@ |
| 45 | 46 | <easyexcel.verion>2.2.7</easyexcel.verion> |
| 46 | 47 | <velocity.version>2.2</velocity.version> |
| 47 | 48 | <screw.version>1.0.5</screw.version> |
| 49 | + <guava.version>30.1.1-jre</guava.version> | |
| 48 | 50 | <!-- 三方云服务相关 --> |
| 49 | 51 | <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version> |
| 50 | 52 | <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version> |
| ... | ... | @@ -60,12 +62,6 @@ |
| 60 | 62 | <version>${spring.boot.version}</version> |
| 61 | 63 | <type>pom</type> |
| 62 | 64 | <scope>import</scope> |
| 63 | - <exclusions> | |
| 64 | - <exclusion> | |
| 65 | - <groupId>mysql</groupId> | |
| 66 | - <artifactId>mysql-connector-java</artifactId> | |
| 67 | - </exclusion> | |
| 68 | - </exclusions> | |
| 69 | 65 | </dependency> |
| 70 | 66 | |
| 71 | 67 | <!-- Spring 核心 --> |
| ... | ... | @@ -213,6 +209,12 @@ |
| 213 | 209 | |
| 214 | 210 | <!-- 工具类相关 --> |
| 215 | 211 | <dependency> |
| 212 | + <groupId>cn.iocoder.boot</groupId> | |
| 213 | + <artifactId>yudao-common</artifactId> | |
| 214 | + <version>${revision}</version> | |
| 215 | + </dependency> | |
| 216 | + | |
| 217 | + <dependency> | |
| 216 | 218 | <groupId>org.projectlombok</groupId> |
| 217 | 219 | <artifactId>lombok</artifactId> |
| 218 | 220 | <version>${lombok.version}</version> |
| ... | ... | @@ -258,6 +260,12 @@ |
| 258 | 260 | <version>${screw.version}</version> |
| 259 | 261 | </dependency> |
| 260 | 262 | |
| 263 | + <dependency> | |
| 264 | + <groupId>com.google.guava</groupId> | |
| 265 | + <artifactId>guava</artifactId> | |
| 266 | + <version>${guava.version}</version> | |
| 267 | + </dependency> | |
| 268 | + | |
| 261 | 269 | <!-- 三方云服务相关 --> |
| 262 | 270 | |
| 263 | 271 | <!-- SMS SDK begin --> | ... | ... |
yudao-framework/pom.xml
yudao-framework/yudao-common/pom.xml
| ... | ... | @@ -8,149 +8,53 @@ |
| 8 | 8 | <version>${revision}</version> |
| 9 | 9 | </parent> |
| 10 | 10 | <modelVersion>4.0.0</modelVersion> |
| 11 | - | |
| 12 | 11 | <artifactId>yudao-common</artifactId> |
| 13 | 12 | <packaging>jar</packaging> |
| 14 | 13 | |
| 15 | 14 | <name>${artifactId}</name> |
| 16 | - <description>基础框架，各种组件的拓展</description> | |
| 15 | + <description>定义基础 pojo 类、枚举、工具类等等</description> | |
| 17 | 16 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 18 | 17 | |
| 19 | 18 | <dependencies> |
| 20 | 19 | <!-- Spring 核心 --> |
| 21 | 20 | <dependency> |
| 22 | - <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 --> | |
| 23 | - <groupId>org.springframework.boot</groupId> | |
| 24 | - <artifactId>spring-boot-configuration-processor</artifactId> | |
| 25 | - <optional>true</optional> | |
| 21 | + <groupId>org.springframework</groupId> | |
| 22 | + <artifactId>spring-core</artifactId> | |
| 23 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 26 | 24 | </dependency> |
| 27 | - | |
| 28 | 25 | <dependency> |
| 29 | - <groupId>org.springframework.boot</groupId> | |
| 30 | - <artifactId>spring-boot-starter-aop</artifactId> | |
| 26 | + <groupId>org.springframework</groupId> | |
| 27 | + <artifactId>spring-expression</artifactId> | |
| 28 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 31 | 29 | </dependency> |
| 32 | - | |
| 33 | - <!-- Web 相关 --> | |
| 34 | 30 | <dependency> |
| 35 | - <groupId>org.springframework.boot</groupId> | |
| 36 | - <artifactId>spring-boot-starter-web</artifactId> | |
| 31 | + <groupId>org.springframework</groupId> | |
| 32 | + <artifactId>spring-aop</artifactId> | |
| 33 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 37 | 34 | </dependency> |
| 38 | - | |
| 39 | 35 | <dependency> |
| 40 | - <groupId>org.springframework.boot</groupId> | |
| 41 | - <artifactId>spring-boot-starter-security</artifactId> | |
| 36 | + <groupId>org.aspectj</groupId> | |
| 37 | + <artifactId>aspectjweaver</artifactId> | |
| 38 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 42 | 39 | </dependency> |
| 43 | 40 | |
| 41 | + <!-- Web 相关 --> | |
| 44 | 42 | <dependency> |
| 45 | - <groupId>org.springframework.boot</groupId> | |
| 46 | - <artifactId>spring-boot-starter-validation</artifactId> | |
| 43 | + <groupId>org.springframework</groupId> | |
| 44 | + <artifactId>spring-web</artifactId> | |
| 45 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 47 | 46 | </dependency> |
| 48 | 47 | |
| 49 | 48 | <dependency> |
| 50 | - <groupId>com.github.xiaoymin</groupId> | |
| 51 | - <artifactId>knife4j-spring-boot-starter</artifactId> | |
| 49 | + <groupId>jakarta.servlet</groupId> | |
| 50 | + <artifactId>jakarta.servlet-api</artifactId> | |
| 51 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 52 | 52 | </dependency> |
| 53 | + | |
| 53 | 54 | <dependency> |
| 54 | 55 | <groupId>io.swagger</groupId> |
| 55 | 56 | <artifactId>swagger-annotations</artifactId> |
| 56 | - </dependency> | |
| 57 | - | |
| 58 | - <!-- DB 相关 --> | |
| 59 | - <dependency> | |
| 60 | - <groupId>mysql</groupId> | |
| 61 | - <artifactId>mysql-connector-java</artifactId> | |
| 62 | - <version>5.1.46</version> <!-- TODO 强制版本 --> | |
| 63 | - </dependency> | |
| 64 | - <dependency> | |
| 65 | - <groupId>com.alibaba</groupId> | |
| 66 | - <artifactId>druid-spring-boot-starter</artifactId> | |
| 67 | - </dependency> | |
| 68 | - <dependency> | |
| 69 | - <groupId>com.baomidou</groupId> | |
| 70 | - <artifactId>mybatis-plus-boot-starter</artifactId> | |
| 71 | - </dependency> | |
| 72 | - <dependency> | |
| 73 | - <groupId>com.baomidou</groupId> | |
| 74 | - <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | |
| 75 | - </dependency> | |
| 76 | - | |
| 77 | - <dependency> | |
| 78 | - <groupId>org.redisson</groupId> | |
| 79 | - <artifactId>redisson-spring-boot-starter</artifactId> | |
| 80 | - </dependency> | |
| 81 | - | |
| 82 | - <!-- Config 配置中心相关 --> | |
| 83 | - <dependency> | |
| 84 | - <groupId>com.ctrip.framework.apollo</groupId> | |
| 85 | - <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> | |
| 86 | - </dependency> | |
| 87 | - | |
| 88 | - <!-- Job 定时任务相关 --> | |
| 89 | - <dependency> | |
| 90 | - <groupId>org.springframework.boot</groupId> | |
| 91 | - <artifactId>spring-boot-starter-quartz</artifactId> | |
| 92 | - </dependency> | |
| 93 | - | |
| 94 | - <!-- 服务保障相关 --> | |
| 95 | - <dependency> | |
| 96 | - <groupId>com.baomidou</groupId> | |
| 97 | - <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | |
| 98 | - </dependency> | |
| 99 | - | |
| 100 | - <dependency> | |
| 101 | - <groupId>io.github.resilience4j</groupId> | |
| 102 | - <artifactId>resilience4j-spring-boot2</artifactId> | |
| 103 | - </dependency> | |
| 104 | - | |
| 105 | - <!-- 监控相关 --> | |
| 106 | - <dependency> | |
| 107 | - <groupId>org.apache.skywalking</groupId> | |
| 108 | - <artifactId>apm-toolkit-trace</artifactId> | |
| 109 | - </dependency> | |
| 110 | - <dependency> | |
| 111 | - <groupId>org.apache.skywalking</groupId> | |
| 112 | - <artifactId>apm-toolkit-logback-1.x</artifactId> | |
| 113 | - </dependency> | |
| 114 | - <dependency> | |
| 115 | - <groupId>org.apache.skywalking</groupId> | |
| 116 | - <artifactId>apm-toolkit-opentracing</artifactId> | |
| 117 | - </dependency> | |
| 118 | - | |
| 119 | - <dependency> | |
| 120 | - <groupId>de.codecentric</groupId> | |
| 121 | - <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | |
| 122 | - </dependency> | |
| 123 | - <dependency> | |
| 124 | - <groupId>de.codecentric</groupId> | |
| 125 | - <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | |
| 126 | - </dependency> | |
| 127 | - | |
| 128 | - <!-- Test 测试相关 --> | |
| 129 | - <dependency> | |
| 130 | - <groupId>org.springframework.boot</groupId> | |
| 131 | - <artifactId>spring-boot-starter-test</artifactId> | |
| 132 | - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 133 | - <optional>true</optional> | |
| 134 | - </dependency> | |
| 135 | - | |
| 136 | - <dependency> | |
| 137 | - <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 --> | |
| 138 | - <artifactId>h2</artifactId> | |
| 139 | - <optional>true</optional> | |
| 140 | - </dependency> | |
| 141 | - | |
| 142 | - <dependency> | |
| 143 | - <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 --> | |
| 144 | - <artifactId>jedis-mock</artifactId> | |
| 145 | - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 146 | - <optional>true</optional> | |
| 147 | - </dependency> | |
| 148 | - | |
| 149 | - <dependency> | |
| 150 | - <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 --> | |
| 151 | - <artifactId>podam</artifactId> | |
| 152 | - <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 153 | - <optional>true</optional> | |
| 57 | + <scope>provided</scope> <!-- 设置为 provided，主要是 PageParam 使用到 --> | |
| 154 | 58 | </dependency> |
| 155 | 59 | |
| 156 | 60 | <!-- 工具类相关 --> |
| ... | ... | @@ -161,11 +65,11 @@ |
| 161 | 65 | |
| 162 | 66 | <dependency> |
| 163 | 67 | <groupId>org.mapstruct</groupId> |
| 164 | - <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> | |
| 68 | + <artifactId>mapstruct</artifactId> | |
| 165 | 69 | </dependency> |
| 166 | 70 | <dependency> |
| 167 | 71 | <groupId>org.mapstruct</groupId> |
| 168 | - <artifactId>mapstruct-jdk8</artifactId> | |
| 72 | + <artifactId>mapstruct-jdk8</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> | |
| 169 | 73 | </dependency> |
| 170 | 74 | <dependency> |
| 171 | 75 | <groupId>org.mapstruct</groupId> |
| ... | ... | @@ -178,42 +82,33 @@ |
| 178 | 82 | </dependency> |
| 179 | 83 | |
| 180 | 84 | <dependency> |
| 181 | - <groupId>com.alibaba</groupId> | |
| 182 | - <artifactId>easyexcel</artifactId> | |
| 85 | + <groupId>com.google.guava</groupId> | |
| 86 | + <artifactId>guava</artifactId> | |
| 87 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 183 | 88 | </dependency> |
| 184 | 89 | |
| 185 | 90 | <dependency> |
| 186 | - <groupId>org.apache.velocity</groupId> | |
| 187 | - <artifactId>velocity-engine-core</artifactId> | |
| 91 | + <groupId>com.fasterxml.jackson.core</groupId> | |
| 92 | + <artifactId>jackson-databind</artifactId> | |
| 93 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 188 | 94 | </dependency> |
| 189 | - | |
| 190 | 95 | <dependency> |
| 191 | - <groupId>cn.smallbun.screw</groupId> | |
| 192 | - <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> | |
| 96 | + <groupId>com.fasterxml.jackson.core</groupId> | |
| 97 | + <artifactId>jackson-core</artifactId> | |
| 98 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 193 | 99 | </dependency> |
| 194 | 100 | |
| 195 | - <!-- 三方云服务相关 --> | |
| 196 | - | |
| 197 | - <!-- SMS SDK begin --> | |
| 198 | 101 | <dependency> |
| 199 | - <groupId>com.yunpian.sdk</groupId> | |
| 200 | - <artifactId>yunpian-java-sdk</artifactId> | |
| 102 | + <groupId>org.slf4j</groupId> | |
| 103 | + <artifactId>slf4j-api</artifactId> | |
| 104 | + <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 --> | |
| 201 | 105 | </dependency> |
| 202 | 106 | |
| 203 | 107 | <dependency> |
| 204 | - <groupId>com.aliyun</groupId> | |
| 205 | - <artifactId>aliyun-java-sdk-core</artifactId> | |
| 108 | + <groupId>jakarta.validation</groupId> | |
| 109 | + <artifactId>jakarta.validation-api</artifactId> | |
| 110 | + <scope>provided</scope> <!-- 设置为 provided，主要是 PageParam 使用到 --> | |
| 206 | 111 | </dependency> |
| 207 | - <dependency> | |
| 208 | - <groupId>com.aliyun</groupId> | |
| 209 | - <artifactId>aliyun-java-sdk-dysmsapi</artifactId> | |
| 210 | - </dependency> | |
| 211 | - <!-- SMS SDK end --> | |
| 212 | - | |
| 213 | 112 | </dependencies> |
| 214 | 113 | |
| 215 | - <build> | |
| 216 | - <!-- 设置构建的 jar 包名 --> | |
| 217 | - <finalName>${artifactId}</finalName> | |
| 218 | - </build> | |
| 219 | 114 | </project> | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/package-info.java deleted
| 1 | -package cn.iocoder.dashboard; |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/IntArrayValuable.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/KeyValue.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/CommonStatusEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/UserTypeEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ErrorCode.java
| 1 | -package cn.iocoder.dashboard.common.exception; | |
| 1 | +package cn.iocoder.yudao.common.exception; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.ServiceErrorCodeRange; | |
| 3 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; | |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | |
| 7 | 7 | /** | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ServiceException.java
| 1 | -package cn.iocoder.dashboard.common.exception; | |
| 1 | +package cn.iocoder.yudao.common.exception; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.enums.ServiceErrorCodeRange; | |
| 3 | +import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; | |
| 4 | 4 | import lombok.Data; |
| 5 | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/GlobalErrorCodeConstants.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/ServiceErrorCodeRange.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/util/ServiceExceptionUtil.java
| 1 | -package cn.iocoder.dashboard.common.exception.util; | |
| 1 | +package cn.iocoder.yudao.common.exception.util; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 5 | 5 | import com.google.common.annotations.VisibleForTesting; |
| 6 | +import lombok.extern.slf4j.Slf4j; | |
| 6 | 7 | import org.slf4j.Logger; |
| 7 | 8 | import org.slf4j.LoggerFactory; |
| 8 | 9 | |
| ... | ... | @@ -23,10 +24,9 @@ import java.util.concurrent.ConcurrentMap; |
| 23 | 24 | * 3. 异常提示信息，写在 Apollo 等等配置中心中，从而实现可动态刷新 |
| 24 | 25 | * 4. 异常提示信息，存储在 db 等等数据库中，从而实现可动态刷新 |
| 25 | 26 | */ |
| 27 | +@Slf4j | |
| 26 | 28 | public class ServiceExceptionUtil { |
| 27 | 29 | |
| 28 | - private static final Logger LOGGER = LoggerFactory.getLogger(ServiceExceptionUtil.class); | |
| 29 | - | |
| 30 | 30 | /** |
| 31 | 31 | * 错误码提示模板 |
| 32 | 32 | */ |
| ... | ... | @@ -101,7 +101,7 @@ public class ServiceExceptionUtil { |
| 101 | 101 | for (l = 0; l < params.length; l++) { |
| 102 | 102 | j = messagePattern.indexOf("{}", i); |
| 103 | 103 | if (j == -1) { |
| 104 | - LOGGER.error("[doFormat][参数过多：错误码({})|错误内容({})|参数({})", code, messagePattern, params); | |
| 104 | + log.error("[doFormat][参数过多：错误码({})|错误内容({})|参数({})", code, messagePattern, params); | |
| 105 | 105 | if (i == 0) { |
| 106 | 106 | return messagePattern; |
| 107 | 107 | } else { |
| ... | ... | @@ -115,7 +115,7 @@ public class ServiceExceptionUtil { |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | if (messagePattern.indexOf("{}", i) != -1) { |
| 118 | - LOGGER.error("[doFormat][参数过少：错误码({})|错误内容({})|参数({})", code, messagePattern, params); | |
| 118 | + log.error("[doFormat][参数过少：错误码({})|错误内容({})|参数({})", code, messagePattern, params); | |
| 119 | 119 | } |
| 120 | 120 | sbuf.append(messagePattern.substring(i)); |
| 121 | 121 | return sbuf.toString(); | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/CommonResult.java
| 1 | -package cn.iocoder.dashboard.common.pojo; | |
| 1 | +package cn.iocoder.yudao.common.pojo; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 5 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 5 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 6 | 6 | import com.fasterxml.jackson.annotation.JsonIgnore; |
| 7 | 7 | import lombok.Data; |
| 8 | 8 | import org.springframework.util.Assert; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageParam.java
| 1 | -package cn.iocoder.dashboard.common.pojo; | |
| 1 | +package cn.iocoder.yudao.common.pojo; | |
| 2 | 2 | |
| 3 | 3 | import io.swagger.annotations.ApiModel; |
| 4 | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | 5 | import lombok.Data; |
| 6 | -import org.hibernate.validator.constraints.Range; | |
| 7 | 6 | |
| 8 | 7 | import javax.validation.constraints.Min; |
| 8 | +import javax.validation.constraints.Max; | |
| 9 | 9 | import javax.validation.constraints.NotNull; |
| 10 | 10 | import java.io.Serializable; |
| 11 | 11 | |
| ... | ... | @@ -23,7 +23,8 @@ public class PageParam implements Serializable { |
| 23 | 23 | |
| 24 | 24 | @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10") |
| 25 | 25 | @NotNull(message = "每页条数不能为空") |
| 26 | - @Range(min = 1, max = 100, message = "条数范围为 [1, 100]") | |
| 26 | + @Min(value = 1, message = "页码最小值为 1") | |
| 27 | + @Max(value = 100, message = "页码最大值为 100") | |
| 27 | 28 | private Integer pageSize = PAGE_SIZE; |
| 28 | 29 | |
| 29 | 30 | } | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageResult.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/SortingField.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/ArrayUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/CollectionUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/MapUtils.java
| 1 | -package cn.iocoder.dashboard.util.collection; | |
| 1 | +package cn.iocoder.yudao.util.collection; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.collection.CollectionUtil; |
| 5 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 5 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 6 | 6 | import com.google.common.collect.Maps; |
| 7 | 7 | import com.google.common.collect.Multimap; |
| 8 | 8 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/SetUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/date/DateUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/json/JsonUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/object/ObjectUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/servlet/ServletUtils.java
| 1 | -package cn.iocoder.dashboard.util.servlet; | |
| 1 | +package cn.iocoder.yudao.util.servlet; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.IoUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 6 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 7 | 7 | import org.springframework.http.MediaType; |
| 8 | 8 | import org.springframework.web.context.request.RequestAttributes; |
| 9 | 9 | import org.springframework.web.context.request.RequestContextHolder; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringAopUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringExpressionUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/string/StrUtils.java
yudao-framework/yudao-framework-all/pom.xml
0 → 100644
| 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 | + <dependency> | |
| 28 | + <groupId>org.springframework.boot</groupId> | |
| 29 | + <artifactId>spring-boot-starter-aop</artifactId> | |
| 30 | + </dependency> | |
| 31 | + | |
| 32 | + <!-- Web 相关 --> | |
| 33 | + <dependency> | |
| 34 | + <groupId>org.springframework.boot</groupId> | |
| 35 | + <artifactId>spring-boot-starter-web</artifactId> | |
| 36 | + </dependency> | |
| 37 | + | |
| 38 | + <dependency> | |
| 39 | + <groupId>org.springframework.boot</groupId> | |
| 40 | + <artifactId>spring-boot-starter-security</artifactId> | |
| 41 | + </dependency> | |
| 42 | + | |
| 43 | + <dependency> | |
| 44 | + <groupId>org.springframework.boot</groupId> | |
| 45 | + <artifactId>spring-boot-starter-validation</artifactId> | |
| 46 | + </dependency> | |
| 47 | + | |
| 48 | + <dependency> | |
| 49 | + <groupId>com.github.xiaoymin</groupId> | |
| 50 | + <artifactId>knife4j-spring-boot-starter</artifactId> | |
| 51 | + </dependency> | |
| 52 | + <dependency> | |
| 53 | + <groupId>io.swagger</groupId> | |
| 54 | + <artifactId>swagger-annotations</artifactId> | |
| 55 | + </dependency> | |
| 56 | + | |
| 57 | + <!-- DB 相关 --> | |
| 58 | + <dependency> | |
| 59 | + <groupId>mysql</groupId> | |
| 60 | + <artifactId>mysql-connector-java</artifactId> | |
| 61 | + <version>5.1.46</version> <!-- TODO 强制版本 --> | |
| 62 | + </dependency> | |
| 63 | + <dependency> | |
| 64 | + <groupId>com.alibaba</groupId> | |
| 65 | + <artifactId>druid-spring-boot-starter</artifactId> | |
| 66 | + </dependency> | |
| 67 | + <dependency> | |
| 68 | + <groupId>com.baomidou</groupId> | |
| 69 | + <artifactId>mybatis-plus-boot-starter</artifactId> | |
| 70 | + </dependency> | |
| 71 | + <dependency> | |
| 72 | + <groupId>com.baomidou</groupId> | |
| 73 | + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | |
| 74 | + </dependency> | |
| 75 | + | |
| 76 | + <dependency> | |
| 77 | + <groupId>org.redisson</groupId> | |
| 78 | + <artifactId>redisson-spring-boot-starter</artifactId> | |
| 79 | + </dependency> | |
| 80 | + | |
| 81 | + <!-- Config 配置中心相关 --> | |
| 82 | + <dependency> | |
| 83 | + <groupId>com.ctrip.framework.apollo</groupId> | |
| 84 | + <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> | |
| 85 | + </dependency> | |
| 86 | + | |
| 87 | + <!-- Job 定时任务相关 --> | |
| 88 | + <dependency> | |
| 89 | + <groupId>org.springframework.boot</groupId> | |
| 90 | + <artifactId>spring-boot-starter-quartz</artifactId> | |
| 91 | + </dependency> | |
| 92 | + | |
| 93 | + <!-- 服务保障相关 --> | |
| 94 | + <dependency> | |
| 95 | + <groupId>com.baomidou</groupId> | |
| 96 | + <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | |
| 97 | + </dependency> | |
| 98 | + | |
| 99 | + <dependency> | |
| 100 | + <groupId>io.github.resilience4j</groupId> | |
| 101 | + <artifactId>resilience4j-spring-boot2</artifactId> | |
| 102 | + </dependency> | |
| 103 | + | |
| 104 | + <!-- 监控相关 --> | |
| 105 | + <dependency> | |
| 106 | + <groupId>org.apache.skywalking</groupId> | |
| 107 | + <artifactId>apm-toolkit-trace</artifactId> | |
| 108 | + </dependency> | |
| 109 | + <dependency> | |
| 110 | + <groupId>org.apache.skywalking</groupId> | |
| 111 | + <artifactId>apm-toolkit-logback-1.x</artifactId> | |
| 112 | + </dependency> | |
| 113 | + <dependency> | |
| 114 | + <groupId>org.apache.skywalking</groupId> | |
| 115 | + <artifactId>apm-toolkit-opentracing</artifactId> | |
| 116 | + </dependency> | |
| 117 | + | |
| 118 | + <dependency> | |
| 119 | + <groupId>de.codecentric</groupId> | |
| 120 | + <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | |
| 121 | + </dependency> | |
| 122 | + <dependency> | |
| 123 | + <groupId>de.codecentric</groupId> | |
| 124 | + <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | |
| 125 | + </dependency> | |
| 126 | + | |
| 127 | + <!-- Test 测试相关 --> | |
| 128 | + <dependency> | |
| 129 | + <groupId>org.springframework.boot</groupId> | |
| 130 | + <artifactId>spring-boot-starter-test</artifactId> | |
| 131 | + <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 132 | + <optional>true</optional> | |
| 133 | + </dependency> | |
| 134 | + | |
| 135 | + <dependency> | |
| 136 | + <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 --> | |
| 137 | + <artifactId>h2</artifactId> | |
| 138 | + <optional>true</optional> | |
| 139 | + </dependency> | |
| 140 | + | |
| 141 | + <dependency> | |
| 142 | + <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 --> | |
| 143 | + <artifactId>jedis-mock</artifactId> | |
| 144 | + <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 145 | + <optional>true</optional> | |
| 146 | + </dependency> | |
| 147 | + | |
| 148 | + <dependency> | |
| 149 | + <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 --> | |
| 150 | + <artifactId>podam</artifactId> | |
| 151 | + <scope>provided</scope> <!-- 特殊，因为默认是 test 类型，会导致编译不通过，所以设置为 provided --> | |
| 152 | + <optional>true</optional> | |
| 153 | + </dependency> | |
| 154 | + | |
| 155 | + <!-- 工具类相关 --> | |
| 156 | + <dependency> | |
| 157 | + <groupId>cn.iocoder.boot</groupId> | |
| 158 | + <artifactId>yudao-common</artifactId> | |
| 159 | + </dependency> | |
| 160 | + | |
| 161 | + <dependency> | |
| 162 | + <groupId>com.alibaba</groupId> | |
| 163 | + <artifactId>easyexcel</artifactId> | |
| 164 | + </dependency> | |
| 165 | + | |
| 166 | + <dependency> | |
| 167 | + <groupId>org.apache.velocity</groupId> | |
| 168 | + <artifactId>velocity-engine-core</artifactId> | |
| 169 | + </dependency> | |
| 170 | + | |
| 171 | + <dependency> | |
| 172 | + <groupId>cn.smallbun.screw</groupId> | |
| 173 | + <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> | |
| 174 | + </dependency> | |
| 175 | + | |
| 176 | + <!-- 三方云服务相关 --> | |
| 177 | + | |
| 178 | + <!-- SMS SDK begin --> | |
| 179 | + <dependency> | |
| 180 | + <groupId>com.yunpian.sdk</groupId> | |
| 181 | + <artifactId>yunpian-java-sdk</artifactId> | |
| 182 | + </dependency> | |
| 183 | + | |
| 184 | + <dependency> | |
| 185 | + <groupId>com.aliyun</groupId> | |
| 186 | + <artifactId>aliyun-java-sdk-core</artifactId> | |
| 187 | + </dependency> | |
| 188 | + <dependency> | |
| 189 | + <groupId>com.aliyun</groupId> | |
| 190 | + <artifactId>aliyun-java-sdk-dysmsapi</artifactId> | |
| 191 | + </dependency> | |
| 192 | + <!-- SMS SDK end --> | |
| 193 | + | |
| 194 | + </dependencies> | |
| 195 | +</project> | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java
| ... | ... | @@ -2,12 +2,10 @@ package cn.iocoder.dashboard.framework.apollo.internals; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.ClassUtil; |
| 5 | -import cn.hutool.core.util.ObjectUtil; | |
| 6 | 5 | import cn.hutool.core.util.ReflectUtil; |
| 7 | 6 | import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; |
| 8 | 7 | import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; |
| 9 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 10 | -import cn.iocoder.dashboard.util.object.ObjectUtils; | |
| 8 | +import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 11 | 9 | import com.ctrip.framework.apollo.Apollo; |
| 12 | 10 | import com.ctrip.framework.apollo.build.ApolloInjector; |
| 13 | 11 | import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.errorcode.core.generator; |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.ClassUtil; |
| 5 | 5 | import cn.hutool.core.util.ReflectUtil; |
| 6 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 8 | 8 | import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; |
| 9 | 9 | import lombok.RequiredArgsConstructor; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java
| 1 | 1 | package cn.iocoder.dashboard.framework.errorcode.core.loader; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 3 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * 错误码加载器 |
| 7 | 7 | * |
| 8 | - * 注意，错误码最终加载到 {@link cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！ | |
| 8 | + * 注意，错误码最终加载到 {@link cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！ | |
| 9 | 9 | * |
| 10 | 10 | * @author dlyan |
| 11 | 11 | */ | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.errorcode.core.loader; |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; |
| 6 | -import cn.iocoder.dashboard.util.date.DateUtils; | |
| 6 | +import cn.iocoder.yudao.util.date.DateUtils; | |
| 7 | 7 | import lombok.RequiredArgsConstructor; |
| 8 | 8 | import lombok.extern.slf4j.Slf4j; |
| 9 | 9 | import org.springframework.boot.context.event.ApplicationReadyEvent; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java
| 1 | 1 | package cn.iocoder.dashboard.framework.excel.core.convert; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 3 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 4 | 4 | import com.alibaba.excel.converters.Converter; |
| 5 | 5 | import com.alibaba.excel.enums.CellDataTypeEnum; |
| 6 | 6 | import com.alibaba.excel.metadata.CellData; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java
| 1 | 1 | package cn.iocoder.dashboard.framework.idempotent.core.aop; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent; |
| 6 | 6 | import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver; |
| 7 | 7 | import cn.iocoder.dashboard.framework.idempotent.core.redis.IdempotentRedisDAO; |
| 8 | -import cn.iocoder.dashboard.util.collection.CollectionUtils; | |
| 8 | +import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 9 | 9 | import lombok.extern.slf4j.Slf4j; |
| 10 | 10 | import org.aspectj.lang.JoinPoint; |
| 11 | 11 | import org.aspectj.lang.annotation.Aspect; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.jackson.config; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.jackson.deser.LocalDateTimeDeserializer; |
| 4 | 4 | import cn.iocoder.dashboard.framework.jackson.ser.LocalDateTimeSerializer; |
| 5 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 6 | 6 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 7 | 7 | import com.fasterxml.jackson.databind.module.SimpleModule; |
| 8 | 8 | import org.springframework.context.annotation.Bean; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java
| 1 | 1 | package cn.iocoder.dashboard.framework.lock4j.core; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import com.baomidou.lock.LockFailureStrategy; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | - * 自定义获取锁失败策略，抛出 {@link cn.iocoder.dashboard.common.exception.ServiceException} 异常 | |
| 9 | + * 自定义获取锁失败策略，抛出 {@link cn.iocoder.yudao.common.exception.ServiceException} 异常 | |
| 10 | 10 | */ |
| 11 | 11 | @Slf4j |
| 12 | 12 | public class DefaultLockFailureStrategy implements LockFailureStrategy { | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java
| ... | ... | @@ -3,16 +3,16 @@ package cn.iocoder.dashboard.framework.logger.apilog.core.filter; |
| 3 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; |
| 9 | 9 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 11 | 11 | import cn.iocoder.dashboard.framework.web.config.WebProperties; |
| 12 | 12 | import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; |
| 13 | -import cn.iocoder.dashboard.util.date.DateUtils; | |
| 14 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 15 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 13 | +import cn.iocoder.yudao.util.date.DateUtils; | |
| 14 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 16 | 16 | import lombok.RequiredArgsConstructor; |
| 17 | 17 | import lombok.extern.slf4j.Slf4j; |
| 18 | 18 | import org.springframework.web.filter.OncePerRequestFilter; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java
| ... | ... | @@ -4,15 +4,15 @@ import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.util.ArrayUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | 6 | import cn.hutool.extra.servlet.ServletUtil; |
| 7 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 7 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 9 | 9 | import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; |
| 11 | 11 | import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; |
| 12 | 12 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 13 | 13 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 14 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 15 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 14 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 16 | 16 | import com.google.common.collect.Maps; |
| 17 | 17 | import io.swagger.annotations.Api; |
| 18 | 18 | import io.swagger.annotations.ApiOperation; |
| ... | ... | @@ -35,8 +35,8 @@ import java.util.*; |
| 35 | 35 | import java.util.function.Predicate; |
| 36 | 36 | import java.util.stream.IntStream; |
| 37 | 37 | |
| 38 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; | |
| 39 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 38 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; | |
| 39 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * 拦截使用 @OperateLog 注解，如果满足条件，则生成操作日志。 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java
| 1 | 1 | package cn.iocoder.dashboard.framework.mybatis.core.mapper; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils; |
| 6 | 6 | import com.baomidou.mybatisplus.core.conditions.Wrapper; |
| 7 | 7 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java
| 1 | 1 | package cn.iocoder.dashboard.framework.mybatis.core.type; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 3 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 4 | 4 | import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; |
| 5 | 5 | import com.fasterxml.jackson.core.type.TypeReference; |
| 6 | 6 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java
| 1 | 1 | package cn.iocoder.dashboard.framework.mybatis.core.util; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollectionUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.PageParam; | |
| 5 | -import cn.iocoder.dashboard.common.pojo.SortingField; | |
| 4 | +import cn.iocoder.yudao.common.pojo.PageParam; | |
| 5 | +import cn.iocoder.yudao.common.pojo.SortingField; | |
| 6 | 6 | import com.baomidou.mybatisplus.core.metadata.OrderItem; |
| 7 | 7 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| 8 | 8 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java
| ... | ... | @@ -15,7 +15,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean; |
| 15 | 15 | import javax.annotation.Resource; |
| 16 | 16 | import java.util.Date; |
| 17 | 17 | |
| 18 | -import static cn.iocoder.dashboard.util.date.DateUtils.diff; | |
| 18 | +import static cn.iocoder.yudao.util.date.DateUtils.diff; | |
| 19 | 19 | import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; |
| 20 | 20 | |
| 21 | 21 | /** | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java
| 1 | 1 | package cn.iocoder.dashboard.framework.redis.core.pubsub; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.TypeUtil; |
| 4 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 4 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 5 | 5 | import lombok.SneakyThrows; |
| 6 | 6 | import org.springframework.data.redis.connection.Message; |
| 7 | 7 | import org.springframework.data.redis.connection.MessageListener; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.redis.core.util; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; |
| 4 | 4 | import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage; |
| 5 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 6 | 6 | import org.springframework.data.redis.connection.stream.RecordId; |
| 7 | 7 | import org.springframework.data.redis.connection.stream.StreamRecords; |
| 8 | 8 | import org.springframework.data.redis.core.RedisTemplate; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java
| 1 | 1 | package cn.iocoder.dashboard.framework.security.core; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | 4 | import com.fasterxml.jackson.annotation.JsonIgnore; |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | import org.springframework.security.core.GrantedAuthority; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java
| 1 | 1 | package cn.iocoder.dashboard.framework.security.core.filter; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.config.SecurityProperties; |
| 6 | 6 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 7 | 7 | import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; |
| 8 | 8 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 9 | 9 | import cn.iocoder.dashboard.framework.web.core.handler.GlobalExceptionHandler; |
| 10 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 10 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 11 | 11 | import org.springframework.stereotype.Component; |
| 12 | 12 | import org.springframework.web.filter.OncePerRequestFilter; |
| 13 | 13 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java
| 1 | 1 | package cn.iocoder.dashboard.framework.security.core.handler; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 6 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 6 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; |
| 8 | 8 | import org.springframework.security.access.AccessDeniedException; |
| 9 | 9 | import org.springframework.security.web.access.AccessDeniedHandler; |
| ... | ... | @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; |
| 16 | 16 | import javax.servlet.http.HttpServletResponse; |
| 17 | 17 | import java.io.IOException; |
| 18 | 18 | |
| 19 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 19 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java
| 1 | 1 | package cn.iocoder.dashboard.framework.security.core.handler; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 3 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | import org.springframework.security.core.AuthenticationException; |
| 8 | 8 | import org.springframework.security.web.AuthenticationEntryPoint; |
| ... | ... | @@ -13,7 +13,7 @@ import javax.servlet.FilterChain; |
| 13 | 13 | import javax.servlet.http.HttpServletRequest; |
| 14 | 14 | import javax.servlet.http.HttpServletResponse; |
| 15 | 15 | |
| 16 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 16 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java
| 1 | 1 | package cn.iocoder.dashboard.framework.security.core.handler; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.config.SecurityProperties; |
| 6 | 6 | import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; |
| 7 | 7 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 8 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 8 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 9 | 9 | import org.springframework.security.core.Authentication; |
| 10 | 10 | import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; |
| 11 | 11 | import org.springframework.stereotype.Component; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 5 | 5 | |
| 6 | 6 | import java.util.function.Function; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java
| ... | ... | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.framework.sms.core.client; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.lang.Assert; |
| 5 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 6 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 8 | 8 | import lombok.Data; |
| 9 | 9 | import lombok.EqualsAndHashCode; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; |
| 6 | 6 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 3 | 3 | import cn.hutool.core.lang.Assert; |
| 4 | 4 | import cn.hutool.core.util.ReflectUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| ... | ... | @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | 11 | import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; |
| 12 | 12 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 13 | 13 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 14 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 15 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 14 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 15 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 16 | 16 | import com.aliyuncs.AcsRequest; |
| 17 | 17 | import com.aliyuncs.AcsResponse; |
| 18 | 18 | import com.aliyuncs.DefaultAcsClient; |
| ... | ... | @@ -34,8 +34,8 @@ import java.util.Objects; |
| 34 | 34 | import java.util.function.Function; |
| 35 | 35 | import java.util.stream.Collectors; |
| 36 | 36 | |
| 37 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 38 | -import static cn.iocoder.dashboard.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 37 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 38 | +import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | 41 | * 阿里短信客户端的实现类 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; |
| 6 | 6 | |
| 7 | 7 | import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; |
| 6 | 6 | |
| 7 | 7 | import java.util.Objects; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java
| ... | ... | @@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil; |
| 7 | 7 | import cn.hutool.crypto.digest.DigestUtil; |
| 8 | 8 | import cn.hutool.crypto.digest.HmacAlgorithm; |
| 9 | 9 | import cn.hutool.http.HttpUtil; |
| 10 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 10 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 11 | 11 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 12 | 12 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 13 | 13 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| ... | ... | @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 15 | 15 | import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; |
| 16 | 16 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 17 | 17 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 18 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 19 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 18 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 19 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 20 | 20 | |
| 21 | 21 | import java.util.HashMap; |
| 22 | 22 | import java.util.List; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java
| ... | ... | @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.lang.Assert; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | 6 | import cn.hutool.core.util.URLUtil; |
| 7 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 7 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 12 | 12 | import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; |
| 13 | 13 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 14 | 14 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 15 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 16 | 16 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 17 | 17 | import com.fasterxml.jackson.annotation.JsonProperty; |
| 18 | 18 | import com.google.common.annotations.VisibleForTesting; |
| ... | ... | @@ -28,8 +28,8 @@ import java.util.function.Function; |
| 28 | 28 | import java.util.function.Supplier; |
| 29 | 29 | import java.util.stream.Collectors; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 32 | -import static cn.iocoder.dashboard.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 31 | +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 32 | +import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * 云片短信客户端的实现类 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 3 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; |
| 5 | 5 | |
| 6 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 6 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 7 | 7 | import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; |
| 8 | 8 | import static com.yunpian.sdk.constant.Code.*; |
| 9 | 9 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/package-info.java
0 → 100644
| 1 | +package cn.iocoder.dashboard.framework.test.core; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java
| 1 | -package cn.iocoder.dashboard.util.test; | |
| 1 | +package cn.iocoder.dashboard.framework.test.core.util; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ArrayUtil; |
| 4 | 4 | import cn.hutool.core.util.ReflectUtil; |
| 5 | -import cn.iocoder.dashboard.common.exception.ErrorCode; | |
| 6 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 7 | -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 7 | +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 8 | 8 | import org.junit.jupiter.api.Assertions; |
| 9 | 9 | import org.junit.jupiter.api.function.Executable; |
| 10 | 10 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java
| 1 | -package cn.iocoder.dashboard.util.test; | |
| 1 | +package cn.iocoder.dashboard.framework.test.core.util; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ArrayUtil; |
| 4 | 4 | import cn.hutool.core.util.RandomUtil; |
| 5 | -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 6 | 6 | import uk.co.jemos.podam.api.PodamFactory; |
| 7 | 7 | import uk.co.jemos.podam.api.PodamFactoryImpl; |
| 8 | 8 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
0 → 100644
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.tracer.core.aop; |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | 5 | import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; |
| 6 | -import cn.iocoder.dashboard.util.sping.SpringExpressionUtils; | |
| 6 | +import cn.iocoder.yudao.util.sping.SpringExpressionUtils; | |
| 7 | 7 | import io.opentracing.Span; |
| 8 | 8 | import io.opentracing.Tracer; |
| 9 | 9 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java
| 1 | 1 | package cn.iocoder.dashboard.framework.validator; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.core.IntArrayValuable; | |
| 3 | +import cn.iocoder.yudao.common.core.IntArrayValuable; | |
| 4 | 4 | |
| 5 | 5 | import javax.validation.Constraint; |
| 6 | 6 | import javax.validation.Payload; |
| ... | ... | @@ -32,4 +32,4 @@ public @interface InEnum { |
| 32 | 32 | |
| 33 | 33 | Class<? extends Payload>[] payload() default {}; |
| 34 | 34 | |
| 35 | -} | |
| 36 | 35 | \ No newline at end of file |
| 36 | +} | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java
| 1 | 1 | package cn.iocoder.dashboard.framework.web.core.filter; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 6 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 6 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 7 | 7 | import org.springframework.web.filter.OncePerRequestFilter; |
| 8 | 8 | |
| 9 | 9 | import javax.servlet.FilterChain; |
| 10 | 10 | import javax.servlet.http.HttpServletRequest; |
| 11 | 11 | import javax.servlet.http.HttpServletResponse; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; | |
| 13 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; | |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * 演示 Filter，禁止用户发起写操作，避免影响测试数据 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java
| ... | ... | @@ -6,8 +6,7 @@ import cn.hutool.core.util.ArrayUtil; |
| 6 | 6 | import cn.hutool.core.util.ReflectUtil; |
| 7 | 7 | import cn.hutool.core.util.StrUtil; |
| 8 | 8 | import cn.hutool.http.HTMLFilter; |
| 9 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 10 | -import org.springframework.http.MediaType; | |
| 9 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 11 | 10 | |
| 12 | 11 | import javax.servlet.ReadListener; |
| 13 | 12 | import javax.servlet.ServletInputStream; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java
| ... | ... | @@ -3,15 +3,15 @@ package cn.iocoder.dashboard.framework.web.core.handler; |
| 3 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | -import cn.iocoder.dashboard.common.exception.ServiceException; | |
| 7 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.common.exception.ServiceException; | |
| 7 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; |
| 9 | 9 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 11 | 11 | import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; |
| 12 | 12 | import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; |
| 13 | -import cn.iocoder.dashboard.util.json.JsonUtils; | |
| 14 | -import cn.iocoder.dashboard.util.servlet.ServletUtils; | |
| 13 | +import cn.iocoder.yudao.util.json.JsonUtils; | |
| 14 | +import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 15 | 15 | import io.github.resilience4j.ratelimiter.RequestNotPermitted; |
| 16 | 16 | import lombok.extern.slf4j.Slf4j; |
| 17 | 17 | import org.apache.commons.lang3.exception.ExceptionUtils; |
| ... | ... | @@ -36,7 +36,7 @@ import javax.validation.ValidationException; |
| 36 | 36 | import java.util.Date; |
| 37 | 37 | import java.util.Map; |
| 38 | 38 | |
| 39 | -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.*; | |
| 39 | +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.*; | |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java
| 1 | 1 | package cn.iocoder.dashboard.framework.web.core.handler; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; |
| 5 | 5 | import org.springframework.core.MethodParameter; |
| 6 | 6 | import org.springframework.http.MediaType; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java
| 1 | 1 | package cn.iocoder.dashboard.framework.web.core.util; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.dashboard.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | 5 | |
| 6 | 6 | import javax.servlet.ServletRequest; |
| 7 | 7 | import javax.servlet.http.HttpServletRequest; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md renamed to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
| ... | ... | @@ -2,16 +2,16 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ReflectUtil; |
| 4 | 4 | import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 6 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | 11 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 12 | 12 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 13 | -import cn.iocoder.dashboard.util.collection.MapUtils; | |
| 14 | -import cn.iocoder.dashboard.util.date.DateUtils; | |
| 13 | +import cn.iocoder.yudao.util.collection.MapUtils; | |
| 14 | +import cn.iocoder.yudao.util.date.DateUtils; | |
| 15 | 15 | import com.aliyuncs.AcsRequest; |
| 16 | 16 | import com.aliyuncs.IAcsClient; |
| 17 | 17 | import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; |
| ... | ... | @@ -29,8 +29,8 @@ import java.util.List; |
| 29 | 29 | import java.util.function.Function; |
| 30 | 30 | |
| 31 | 31 | import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; |
| 32 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 33 | -import static cn.iocoder.dashboard.util.json.JsonUtils.toJsonString; | |
| 32 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 33 | +import static cn.iocoder.yudao.util.json.JsonUtils.toJsonString; | |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.ArgumentMatchers.any; |
| 36 | 36 | import static org.mockito.ArgumentMatchers.argThat; | ... | ... |
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 6 | 6 | import org.junit.jupiter.api.Test; |
| 7 | 7 | import org.mockito.InjectMocks; |
| 8 | 8 | |
| 9 | -import static org.junit.jupiter.api.Assertions.*; | |
| 9 | +import static org.junit.jupiter.api.Assertions.assertEquals; | |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * {@link AliyunSmsCodeMapping} 的单元测试 | ... | ... |
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
| ... | ... | @@ -2,15 +2,15 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.ReflectUtil; |
| 4 | 4 | import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; |
| 5 | -import cn.iocoder.dashboard.common.core.KeyValue; | |
| 6 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | +import cn.iocoder.yudao.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| 8 | 8 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 9 | 9 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; |
| 10 | 10 | import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; |
| 11 | 11 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; |
| 12 | 12 | import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; |
| 13 | -import cn.iocoder.dashboard.util.date.DateUtils; | |
| 13 | +import cn.iocoder.yudao.util.date.DateUtils; | |
| 14 | 14 | import com.google.common.collect.Lists; |
| 15 | 15 | import com.yunpian.sdk.YunpianClient; |
| 16 | 16 | import com.yunpian.sdk.api.SmsApi; |
| ... | ... | @@ -29,7 +29,7 @@ import java.util.Map; |
| 29 | 29 | import java.util.function.Function; |
| 30 | 30 | import java.util.function.Supplier; |
| 31 | 31 | |
| 32 | -import static cn.iocoder.dashboard.util.test.RandomUtils.*; | |
| 32 | +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; | |
| 33 | 33 | import static com.yunpian.sdk.constant.Code.OK; |
| 34 | 34 | import static org.junit.jupiter.api.Assertions.*; |
| 35 | 35 | import static org.mockito.Mockito.*; | ... | ... |
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; |
| 4 | -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; |
| 6 | 6 | import org.junit.jupiter.api.Test; |
| 7 | 7 | import org.mockito.InjectMocks; | ... | ... |
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java renamed to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java