Commit 750ce01ecd29a9bf6cee1e1842515955b97c56e5
1 parent
f281aad6
项目结构调整 x 14 : 将 yudao-spring-boot-starter-mybatis 拆分
Showing
320 changed files
with
758 additions
and
688 deletions
README.md
yudao-admin-server/pom.xml
| ... | ... | @@ -23,6 +23,12 @@ |
| 23 | 23 | <version>${revision}</version> |
| 24 | 24 | </dependency> |
| 25 | 25 | |
| 26 | + <!-- DB 相关 --> | |
| 27 | + <dependency> | |
| 28 | + <groupId>cn.iocoder.boot</groupId> | |
| 29 | + <artifactId>yudao-spring-boot-starter-mybatis</artifactId> | |
| 30 | + </dependency> | |
| 31 | + | |
| 26 | 32 | <!-- Test 测试相关 --> |
| 27 | 33 | <dependency> |
| 28 | 34 | <groupId>org.springframework.boot</groupId> | ... | ... |
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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.util.servlet.ServletUtils; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.servlet.ServletUtils; | |
| 11 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 30 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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
| ... | ... | @@ -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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的") |
| 13 | 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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -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.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | |
| 31 | 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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 23 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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/config/InfConfigDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 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/infra/dal/dataobject/file/InfFileDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import com.baomidou.mybatisplus.annotation.IdType; |
| 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/infra/dal/dataobject/job/InfJobDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum; |
| 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/infra/dal/dataobject/job/InfJobLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandler; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
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.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | 8 | import lombok.*; | ... | ... |
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.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.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; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 8 | 8 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 15 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 24 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.containsAny; | |
| 26 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 22 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; |
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 19 | -import cn.iocoder.yudao.util.collection.SetUtils; | |
| 19 | +import cn.iocoder.yudao.framework.util.collection.SetUtils; | |
| 20 | 20 | import io.swagger.annotations.Api; |
| 21 | 21 | import io.swagger.annotations.ApiOperation; |
| 22 | 22 | import org.springframework.validation.annotation.Validated; |
| ... | ... | @@ -26,11 +26,11 @@ import javax.annotation.Resource; |
| 26 | 26 | import javax.validation.Valid; |
| 27 | 27 | import java.util.List; |
| 28 | 28 | |
| 29 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 30 | 30 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 31 | 31 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; |
| 32 | -import static cn.iocoder.yudao.util.servlet.ServletUtils.getClientIP; | |
| 33 | -import static cn.iocoder.yudao.util.servlet.ServletUtils.getUserAgent; | |
| 32 | +import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP; | |
| 33 | +import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getUserAgent; | |
| 34 | 34 | |
| 35 | 35 | @Api(tags = "认证") |
| 36 | 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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.MapUtils; | |
| 14 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 28 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.convertList; | |
| 27 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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/common/SysCaptchaController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.common; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 14 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 35 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 17 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.framework.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
| ... | ... | @@ -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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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/permission/vo/role/SysRolePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 33 | +import static cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | +import static cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 12 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 6 | 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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.MapUtils; | |
| 9 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 17 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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/auth/SysUserSessionDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.IdType; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | 7 | import lombok.Data; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | 7 | import lombok.Data; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | 7 | import lombok.Data; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableField; |
| 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/system/dal/dataobject/errorcode/SysErrorCodeDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum; |
| 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/logger/SysLoginLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
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.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableField; |
| 8 | 8 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import com.baomidou.mybatisplus.annotation.TableId; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableName; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import com.baomidou.mybatisplus.annotation.TableId; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableName; |
| 6 | 6 | import lombok.Data; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | 7 | import lombok.Data; | ... | ... |
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.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.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; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableField; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableField; |
| 8 | 8 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; |
| 8 | 8 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| 7 | 7 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 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; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO; | ... | ... |
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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 6 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 6 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 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; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO; |
| 8 | 8 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 7 | 7 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleMenuDO; |
| 5 | 5 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 6 | 6 | import org.apache.ibatis.annotations.Mapper; |
| ... | ... | @@ -33,7 +33,7 @@ public interface SysRoleMenuMapper extends BaseMapperX<SysRoleMenuDO> { |
| 33 | 33 | delete(new QueryWrapper<SysRoleMenuDO>().eq("role_id", roleId) |
| 34 | 34 | .in("menu_id", menuIds)); |
| 35 | 35 | } |
| 36 | - | |
| 36 | + | |
| 37 | 37 | default void deleteListByMenuId(Long menuId) { |
| 38 | 38 | delete(new QueryWrapper<SysRoleMenuDO>().eq("menu_id", menuId)); |
| 39 | 39 | } | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.mysql.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysUserRoleDO; |
| 5 | 5 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 6 | 6 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.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 | 8 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | ... | ... |
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.yudao.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.servlet.ServletUtils; | |
| 19 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 35 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils.convertSet; | |
| 30 | -import static cn.iocoder.yudao.util.date.DateUtils.addTime; | |
| 29 | +import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertSet; | |
| 30 | +import static cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 8 | +import cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.SetUtils.asSet; | |
| 15 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 6 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 6 | +import cn.iocoder.yudao.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; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; | ... | ... |
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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; |
| 7 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 7 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO; |
| ... | ... | @@ -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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 19 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 27 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 28 | 28 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 29 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.convertMap; | |
| 30 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; | |
| 29 | +import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertMap; | |
| 30 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.string.StrUtils; | |
| 15 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils.convertSet; | |
| 29 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.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; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO; |
| ... | ... | @@ -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.yudao.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 18 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 17 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 18 | +import cn.iocoder.yudao.framework.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,10 +2,10 @@ 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.yudao.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 7 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 8 | +import cn.iocoder.yudao.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; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.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; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; |
| ... | ... | @@ -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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.core.KeyValue; | |
| 6 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.framework.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,9 +3,9 @@ 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.yudao.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 8 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 6 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 8 | +import cn.iocoder.yudao.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; |
| 11 | 11 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; |
| ... | ... | @@ -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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 36 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 14 | +import cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 8 | -import cn.iocoder.yudao.common.exception.ServiceException; | |
| 9 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 7 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 8 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 9 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 22 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 34 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 19 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 18 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 19 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 38 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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/codegen/ToolCodegenColumnDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenColumnHtmlTypeEnum; |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenColumnListConditionEnum; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableId; |
| 8 | 8 | import com.baomidou.mybatisplus.annotation.TableName; |
| 9 | -import lombok.Builder; | |
| 10 | 9 | import lombok.Data; |
| 11 | 10 | import lombok.EqualsAndHashCode; |
| 12 | 11 | import lombok.experimental.Accessors; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenTemplateTypeEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | -import lombok.Builder; | |
| 8 | 7 | import lombok.Data; |
| 9 | 8 | import lombok.EqualsAndHashCode; |
| 10 | 9 | import lombok.experimental.Accessors; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.dataobject.test; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 5 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
| 6 | 7 | import lombok.*; |
| ... | ... | @@ -31,7 +32,7 @@ public class ToolTestDemoDO extends BaseDO { |
| 31 | 32 | /** |
| 32 | 33 | * 状态 |
| 33 | 34 | * |
| 34 | - * 枚举 {@link cn.iocoder.yudao.common.enums.CommonStatusEnum} | |
| 35 | + * 枚举 {@link CommonStatusEnum} | |
| 35 | 36 | */ |
| 36 | 37 | private Integer status; |
| 37 | 38 | /** | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; |
| 5 | 5 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 6 | 6 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; |
| 8 | 8 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO; |
| 5 | 5 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 6 | 6 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO; |
| 6 | 6 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 7 | 7 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.test.ToolTestDemoDO; | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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/ToolCodegenBuilder.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.tool.service.codegen.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.tool.convert.codegen.ToolCodegenConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
| ... | ... | @@ -5,23 +5,23 @@ 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.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; | |
| 8 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 9 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 10 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 11 | +import cn.iocoder.yudao.framework.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; |
| 15 | 15 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 16 | 16 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 17 | 17 | import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; |
| 18 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 19 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 20 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 18 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 19 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 20 | +import cn.iocoder.yudao.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.yudao.util.collection.CollectionUtils; | |
| 24 | -import cn.iocoder.yudao.util.date.DateUtils; | |
| 23 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 24 | +import cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 19 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 31 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.framework.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/BaseDbAndRedisIntegrationTest.java
| 1 | 1 | package cn.iocoder.dashboard; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.datasource.config.DataSourceConfiguration; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.config.MybatisConfiguration; | |
| 3 | +import cn.iocoder.yudao.framework.datasource.config.DataSourceConfiguration; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.config.MybatisConfiguration; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.redis.config.RedisConfig; |
| 6 | 6 | import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; |
| 7 | 7 | import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java
| 1 | 1 | package cn.iocoder.dashboard; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.config.RedisTestConfiguration; |
| 4 | -import cn.iocoder.dashboard.framework.datasource.config.DataSourceConfiguration; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.config.MybatisConfiguration; | |
| 6 | 4 | import cn.iocoder.dashboard.framework.redis.config.RedisConfig; |
| 5 | +import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; | |
| 6 | +import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; | |
| 7 | 7 | import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; |
| 8 | 8 | import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; |
| 9 | 9 | import org.redisson.spring.starter.RedissonAutoConfiguration; |
| ... | ... | @@ -29,12 +29,12 @@ public class BaseDbAndRedisUnitTest { |
| 29 | 29 | |
| 30 | 30 | @Import({ |
| 31 | 31 | // DB 配置类 |
| 32 | - DataSourceConfiguration.class, // 自己的 DB 配置类 | |
| 32 | + YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 | |
| 33 | 33 | DataSourceAutoConfiguration.class, // Spring DB 自动配置类 |
| 34 | 34 | DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 |
| 35 | 35 | DruidDataSourceAutoConfigure.class, // Druid 自动配置类 |
| 36 | 36 | // MyBatis 配置类 |
| 37 | - MybatisConfiguration.class, // 自己的 MyBatis 配置类 | |
| 37 | + YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 | |
| 38 | 38 | MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 |
| 39 | 39 | // Redis 配置类 |
| 40 | 40 | RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java
| 1 | 1 | package cn.iocoder.dashboard; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.datasource.config.DataSourceConfiguration; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.config.MybatisConfiguration; | |
| 3 | +import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; | |
| 5 | 5 | import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; |
| 6 | 6 | import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; |
| 7 | 7 | import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; |
| ... | ... | @@ -25,12 +25,12 @@ public class BaseDbUnitTest { |
| 25 | 25 | |
| 26 | 26 | @Import({ |
| 27 | 27 | // DB 配置类 |
| 28 | - DataSourceConfiguration.class, // 自己的 DB 配置类 | |
| 28 | + YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 | |
| 29 | 29 | DataSourceAutoConfiguration.class, // Spring DB 自动配置类 |
| 30 | 30 | DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 |
| 31 | 31 | DruidDataSourceAutoConfigure.class, // Druid 自动配置类 |
| 32 | 32 | // MyBatis 配置类 |
| 33 | - MybatisConfiguration.class, // 自己的 MyBatis 配置类 | |
| 33 | + YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 | |
| 34 | 34 | MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 |
| 35 | 35 | }) |
| 36 | 36 | public static class Application { | ... | ... |
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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 15 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 15 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | 26 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 27 | 27 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 28 | 28 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 29 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 29 | +import static cn.iocoder.yudao.framework.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,13 +2,13 @@ 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.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.object.ObjectUtils; | |
| 11 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 12 | 12 | import org.junit.jupiter.api.Test; |
| 13 | 13 | import org.springframework.context.annotation.Import; |
| 14 | 14 | |
| ... | ... | @@ -20,7 +20,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FI |
| 20 | 20 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 21 | 21 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; |
| 22 | 22 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; |
| 23 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 23 | +import static cn.iocoder.yudao.framework.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
| ... | ... | @@ -5,7 +5,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPo |
| 5 | 5 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; |
| 6 | 6 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; |
| 7 | 7 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; |
| 8 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 8 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 21 | +import cn.iocoder.yudao.framework.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.yudao.util.object.ObjectUtils; | |
| 28 | +import cn.iocoder.yudao.framework.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
| ... | ... | @@ -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.yudao.common.pojo.PageResult; | |
| 32 | +import cn.iocoder.yudao.framework.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.yudao.util.object.ObjectUtils; | |
| 43 | +import cn.iocoder.yudao.framework.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,9 +2,9 @@ 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.yudao.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogD |
| 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 | 14 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 15 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| 18 | 18 | |
| ... | ... | @@ -22,7 +22,7 @@ import java.util.List; |
| 22 | 22 | import java.util.concurrent.Future; |
| 23 | 23 | |
| 24 | 24 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 25 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 25 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -12,7 +12,7 @@ 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 | 14 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 15 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 16 | 16 | import org.junit.jupiter.api.Test; |
| 17 | 17 | import org.springframework.context.annotation.Import; |
| 18 | 18 | |
| ... | ... | @@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; |
| 26 | 26 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 27 | 27 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 28 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
| ... | ... | @@ -6,7 +6,7 @@ import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDa |
| 6 | 6 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; |
| 7 | 7 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; |
| 8 | 8 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; |
| 9 | -import static cn.iocoder.yudao.util.date.DateUtils.addTime; | |
| 9 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 31 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 30 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 31 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -44,7 +44,7 @@ import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServic |
| 44 | 44 | import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; |
| 45 | 45 | import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; |
| 46 | 46 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 47 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 47 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * SysUserSessionServiceImpl Tester. | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 15 | 15 | import org.junit.jupiter.api.Test; |
| 16 | 16 | import org.springframework.context.annotation.Import; |
| 17 | 17 | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 14 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 14 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -25,7 +25,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 25 | 25 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 26 | 26 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 27 | 27 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 28 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 28 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -30,7 +30,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ER |
| 30 | 30 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 31 | 31 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 32 | 32 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 33 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 33 | +import static cn.iocoder.yudao.framework.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.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -13,7 +13,7 @@ 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 | 15 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 16 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 16 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 17 | 17 | import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.context.annotation.Import; |
| 19 | 19 | |
| ... | ... | @@ -21,7 +21,7 @@ import javax.annotation.Resource; |
| 21 | 21 | import java.util.List; |
| 22 | 22 | |
| 23 | 23 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 24 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 24 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -17,7 +17,7 @@ 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 | 19 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 20 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 20 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -29,7 +29,7 @@ import java.util.concurrent.Future; |
| 29 | 29 | |
| 30 | 30 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 31 | 31 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; |
| 32 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 32 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.util.object.ObjectUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 14 | 14 | import org.junit.jupiter.api.Test; |
| 15 | 15 | import org.springframework.context.annotation.Import; |
| 16 | 16 | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.sping.SpringAopUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.sping.SpringAopUtils; | |
| 16 | 16 | import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; |
| 17 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.sping.SpringAopUtils; | |
| 16 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -26,7 +26,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 26 | 26 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 27 | 27 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 28 | 28 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 29 | -import static cn.iocoder.yudao.util.object.ObjectUtils.max; | |
| 29 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 16 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 16 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -27,8 +27,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SM |
| 27 | 27 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; |
| 28 | 28 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*; |
| 29 | 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; | |
| 30 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; | |
| 31 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.UserTypeEnum; | |
| 6 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 18 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 17 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 18 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 19 | 19 | import org.junit.jupiter.api.Test; |
| 20 | 20 | import org.springframework.context.annotation.Import; |
| 21 | 21 | |
| ... | ... | @@ -29,7 +29,7 @@ import static cn.hutool.core.util.RandomUtil.randomBoolean; |
| 29 | 29 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 30 | 30 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 31 | 31 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 32 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 32 | +import static cn.iocoder.yudao.framework.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.yudao.common.core.KeyValue; | |
| 6 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 22 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 21 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 22 | +import cn.iocoder.yudao.framework.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; |
| ... | ... | @@ -37,8 +37,8 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 37 | 37 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 38 | 38 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 39 | 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; | |
| 40 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.buildTime; | |
| 41 | +import static cn.iocoder.yudao.framework.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.yudao.common.enums.CommonStatusEnum; | |
| 7 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.ArrayUtils; | |
| 21 | -import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 22 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 20 | +import cn.iocoder.yudao.framework.util.collection.ArrayUtils; | |
| 21 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 22 | +import cn.iocoder.yudao.framework.util.object.ObjectUtils; | |
| 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; |
| ... | ... | @@ -38,7 +38,7 @@ import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; |
| 38 | 38 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 39 | 39 | import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; |
| 40 | 40 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 41 | -import static cn.iocoder.yudao.util.date.DateUtils.buildTime; | |
| 41 | +import static cn.iocoder.yudao.framework.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
| ... | ... | @@ -22,7 +22,7 @@ |
| 22 | 22 | <swagger-annotations.version>1.5.22</swagger-annotations.version> |
| 23 | 23 | <servlet.versoin>2.5</servlet.versoin> |
| 24 | 24 | <!-- DB 相关 --> |
| 25 | - <mysql-connector-java.version>5.1.46</mysql-connector-java.version> | |
| 25 | + <mysql.version>5.1.46</mysql.version> | |
| 26 | 26 | <druid.version>1.2.4</druid.version> |
| 27 | 27 | <mybatis-plus.version>3.4.2</mybatis-plus.version> |
| 28 | 28 | <dynamic-datasource.version>3.3.2</dynamic-datasource.version> |
| ... | ... | @@ -62,6 +62,12 @@ |
| 62 | 62 | <version>${spring.boot.version}</version> |
| 63 | 63 | <type>pom</type> |
| 64 | 64 | <scope>import</scope> |
| 65 | + <exclusions> | |
| 66 | + <exclusion> | |
| 67 | + <groupId>mysql</groupId> | |
| 68 | + <artifactId>mysql-connector-java</artifactId> | |
| 69 | + </exclusion> | |
| 70 | + </exclusions> | |
| 65 | 71 | </dependency> |
| 66 | 72 | |
| 67 | 73 | <!-- Spring 核心 --> |
| ... | ... | @@ -100,9 +106,15 @@ |
| 100 | 106 | |
| 101 | 107 | <!-- DB 相关 --> |
| 102 | 108 | <dependency> |
| 109 | + <groupId>cn.iocoder.boot</groupId> | |
| 110 | + <artifactId>yudao-spring-boot-starter-mybatis</artifactId> | |
| 111 | + <version>1.0.0</version> | |
| 112 | + </dependency> | |
| 113 | + | |
| 114 | + <dependency> | |
| 103 | 115 | <groupId>mysql</groupId> |
| 104 | 116 | <artifactId>mysql-connector-java</artifactId> |
| 105 | - <version>${mysql-connector-java.version}</version> | |
| 117 | + <version>${mysql.version}</version> | |
| 106 | 118 | </dependency> |
| 107 | 119 | <dependency> |
| 108 | 120 | <groupId>com.alibaba</groupId> | ... | ... |
yudao-framework/pom.xml
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/IntArrayValuable.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/IntArrayValuable.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/KeyValue.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/KeyValue.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/CommonStatusEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/UserTypeEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/UserTypeEnum.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ErrorCode.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ErrorCode.java
| 1 | -package cn.iocoder.yudao.common.exception; | |
| 1 | +package cn.iocoder.yudao.framework.common.exception; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.enums.ServiceErrorCodeRange; | |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | |
| 7 | 7 | /** | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ServiceException.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServiceException.java
| 1 | -package cn.iocoder.yudao.common.exception; | |
| 1 | +package cn.iocoder.yudao.framework.common.exception; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; | |
| 3 | +import cn.iocoder.yudao.framework.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/yudao/common/exception/enums/GlobalErrorCodeConstants.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/ServiceErrorCodeRange.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/util/ServiceExceptionUtil.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/util/ServiceExceptionUtil.java
| 1 | -package cn.iocoder.yudao.common.exception.util; | |
| 1 | +package cn.iocoder.yudao.framework.common.exception.util; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.yudao.common.exception.ServiceException; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 5 | 5 | import com.google.common.annotations.VisibleForTesting; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | -import org.slf4j.Logger; | |
| 8 | -import org.slf4j.LoggerFactory; | |
| 9 | 7 | |
| 10 | 8 | import java.util.Map; |
| 11 | 9 | import java.util.concurrent.ConcurrentHashMap; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/CommonResult.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java
| 1 | -package cn.iocoder.yudao.common.pojo; | |
| 1 | +package cn.iocoder.yudao.framework.common.pojo; | |
| 2 | 2 | |
| 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; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 5 | +import cn.iocoder.yudao.framework.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/yudao/common/pojo/PageParam.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageResult.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/SortingField.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/SortingField.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/ArrayUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/ArrayUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/CollectionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/CollectionUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/MapUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/MapUtils.java
| 1 | -package cn.iocoder.yudao.util.collection; | |
| 1 | +package cn.iocoder.yudao.framework.util.collection; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.collection.CollectionUtil; |
| 5 | -import cn.iocoder.yudao.common.core.KeyValue; | |
| 5 | +import cn.iocoder.yudao.framework.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/yudao/util/collection/SetUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/SetUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/date/DateUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/date/DateUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/json/JsonUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/json/JsonUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/object/ObjectUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/object/ObjectUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/package-info.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/package-info.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/servlet/ServletUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/servlet/ServletUtils.java
| 1 | -package cn.iocoder.yudao.util.servlet; | |
| 1 | +package cn.iocoder.yudao.framework.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.yudao.util.json.JsonUtils; | |
| 6 | +import cn.iocoder.yudao.framework.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/yudao/util/sping/SpringAopUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringAopUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringExpressionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringExpressionUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/string/StrUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/string/StrUtils.java
yudao-framework/yudao-framework-all/pom.xml
| ... | ... | @@ -56,24 +56,6 @@ |
| 56 | 56 | |
| 57 | 57 | <!-- DB 相关 --> |
| 58 | 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 | 59 | <groupId>org.redisson</groupId> |
| 78 | 60 | <artifactId>redisson-spring-boot-starter</artifactId> |
| 79 | 61 | </dependency> | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java
| ... | ... | @@ -5,7 +5,6 @@ import cn.hutool.core.util.ClassUtil; |
| 5 | 5 | import cn.hutool.core.util.ReflectUtil; |
| 6 | 6 | import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; |
| 7 | 7 | import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; |
| 8 | -import cn.iocoder.yudao.util.object.ObjectUtils; | |
| 9 | 8 | import com.ctrip.framework.apollo.Apollo; |
| 10 | 9 | import com.ctrip.framework.apollo.build.ApolloInjector; |
| 11 | 10 | import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java
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.yudao.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.util.ServiceExceptionUtil; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * 错误码加载器 |
| 7 | 7 | * |
| 8 | - * 注意，错误码最终加载到 {@link cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！ | |
| 8 | + * 注意，错误码最终加载到 {@link ServiceExceptionUtil} 的 MESSAGES 变量中！ | |
| 9 | 9 | * |
| 10 | 10 | * @author dlyan |
| 11 | 11 | */ | ... | ... |
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.yudao.util.date.DateUtils; | |
| 6 | +import cn.iocoder.yudao.framework.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-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.yudao.util.json.JsonUtils; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.ServiceException; | |
| 4 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.CollectionUtils; | |
| 8 | +import cn.iocoder.yudao.framework.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-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.yudao.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.ServiceException; | |
| 4 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.ServiceException} 异常 | |
| 9 | + * 自定义获取锁失败策略，抛出 {@link ServiceException} 异常 | |
| 10 | 10 | */ |
| 11 | 11 | @Slf4j |
| 12 | 12 | public class DefaultLockFailureStrategy implements LockFailureStrategy { | ... | ... |
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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils; | |
| 14 | -import cn.iocoder.yudao.util.json.JsonUtils; | |
| 15 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.date.DateUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | |
| 16 | 16 | import lombok.RequiredArgsConstructor; |
| 17 | 17 | import lombok.extern.slf4j.Slf4j; |
| 18 | 18 | import org.springframework.web.filter.OncePerRequestFilter; | ... | ... |
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.yudao.common.pojo.CommonResult; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.json.JsonUtils; | |
| 15 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; | |
| 39 | -import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 38 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; | |
| 39 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * 拦截使用 @OperateLog 注解，如果满足条件，则生成操作日志。 | ... | ... |
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.yudao.util.date.DateUtils.diff; | |
| 18 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.diff; | |
| 19 | 19 | import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; |
| 20 | 20 | |
| 21 | 21 | /** | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/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.yudao.util.json.JsonUtils; | |
| 4 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java
| 1 | 1 | package cn.iocoder.dashboard.framework.redis.core.stream; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.TypeUtil; |
| 4 | -import cn.iocoder.yudao.util.json.JsonUtils; | |
| 4 | +import cn.iocoder.yudao.framework.util.json.JsonUtils; | |
| 5 | 5 | import lombok.Getter; |
| 6 | 6 | import lombok.Setter; |
| 7 | 7 | import lombok.SneakyThrows; | ... | ... |
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.yudao.util.json.JsonUtils; | |
| 5 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
| ... | ... | @@ -26,7 +26,7 @@ import javax.annotation.Resource; |
| 26 | 26 | /** |
| 27 | 27 | * spring security配置 |
| 28 | 28 | * |
| 29 | - * @author ruoyi | |
| 29 | + * @author 芋道源码 | |
| 30 | 30 | */ |
| 31 | 31 | @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) |
| 32 | 32 | @EnableConfigurationProperties(SecurityProperties.class) | ... | ... |
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.yudao.common.enums.CommonStatusEnum; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.servlet.ServletUtils; | |
| 10 | +import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | |
| 11 | 11 | import org.springframework.stereotype.Component; |
| 12 | 12 | import org.springframework.web.filter.OncePerRequestFilter; |
| 13 | 13 | ... | ... |
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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 6 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 19 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。 | ... | ... |
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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 16 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; | |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页 | ... | ... |
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.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.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.yudao.util.servlet.ServletUtils; | |
| 8 | +import cn.iocoder.yudao.framework.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-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.yudao.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.ErrorCode; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.ErrorCode; | |
| 6 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.framework.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-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.yudao.common.core.KeyValue; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.MapUtils; | |
| 15 | -import cn.iocoder.yudao.util.json.JsonUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 15 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 38 | -import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 37 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 38 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | 41 | * 阿里短信客户端的实现类 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.framework.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-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.yudao.common.exception.ErrorCode; | |
| 4 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 4 | +import cn.iocoder.yudao.framework.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-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.yudao.common.core.KeyValue; | |
| 10 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.MapUtils; | |
| 19 | -import cn.iocoder.yudao.util.json.JsonUtils; | |
| 18 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 19 | +import cn.iocoder.yudao.framework.util.json.JsonUtils; | |
| 20 | 20 | |
| 21 | 21 | import java.util.HashMap; |
| 22 | 22 | import java.util.List; | ... | ... |
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.yudao.common.core.KeyValue; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.json.JsonUtils; | |
| 15 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 32 | -import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 31 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 32 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT; | |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * 云片短信客户端的实现类 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java
| 1 | 1 | package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.ErrorCode; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; |
| 5 | 5 | |
| 6 | -import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; | |
| 6 | +import static cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java
| ... | ... | @@ -2,9 +2,9 @@ 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.yudao.common.exception.ErrorCode; | |
| 6 | -import cn.iocoder.yudao.common.exception.ServiceException; | |
| 7 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.framework.common.exception.ErrorCode; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 7 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java
| ... | ... | @@ -2,7 +2,7 @@ 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.yudao.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.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/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.yudao.util.sping.SpringExpressionUtils; | |
| 6 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java
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.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 6 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; | |
| 13 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; | |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * 演示 Filter，禁止用户发起写操作，避免影响测试数据 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java
| ... | ... | @@ -6,7 +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.yudao.util.servlet.ServletUtils; | |
| 9 | +import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | |
| 10 | 10 | |
| 11 | 11 | import javax.servlet.ReadListener; |
| 12 | 12 | import javax.servlet.ServletInputStream; | ... | ... |
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.yudao.common.exception.ServiceException; | |
| 7 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | |
| 7 | +import cn.iocoder.yudao.framework.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.yudao.util.json.JsonUtils; | |
| 14 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.json.JsonUtils; | |
| 14 | +import cn.iocoder.yudao.framework.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.yudao.common.exception.enums.GlobalErrorCodeConstants.*; | |
| 39 | +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*; | |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 | ... | ... |
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.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.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-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.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | |
| 6 | 6 | import javax.servlet.ServletRequest; |
| 7 | 7 | import javax.servlet.http.HttpServletRequest; | ... | ... |
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.yudao.common.core.KeyValue; | |
| 6 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | +import cn.iocoder.yudao.framework.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.collection.MapUtils; | |
| 14 | -import cn.iocoder.yudao.util.date.DateUtils; | |
| 13 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.date.DateUtils; | |
| 15 | 15 | import com.aliyuncs.AcsRequest; |
| 16 | 16 | import com.aliyuncs.IAcsClient; |
| 17 | 17 | import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; |
| ... | ... | @@ -30,7 +30,7 @@ import java.util.function.Function; |
| 30 | 30 | |
| 31 | 31 | import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; |
| 32 | 32 | import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; |
| 33 | -import static cn.iocoder.yudao.util.json.JsonUtils.toJsonString; | |
| 33 | +import static cn.iocoder.yudao.framework.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-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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.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-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.yudao.common.core.KeyValue; | |
| 6 | -import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 5 | +import cn.iocoder.yudao.framework.common.core.KeyValue; | |
| 6 | +import cn.iocoder.yudao.framework.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.yudao.util.date.DateUtils; | |
| 13 | +import cn.iocoder.yudao.framework.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; | ... | ... |
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.yudao.common.exception.enums.GlobalErrorCodeConstants; | |
| 4 | +import cn.iocoder.yudao.framework.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-spring-boot-starter-mybatis/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-spring-boot-starter-mybatis</artifactId> | |
| 12 | + <packaging>jar</packaging> | |
| 13 | + | |
| 14 | + <name>${artifactId}</name> | |
| 15 | + <description>数据库连接池、多数据源、事务、MyBatis 拓展</description> | |
| 16 | + <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | |
| 17 | + | |
| 18 | + <properties> | |
| 19 | + <mysql.version>5.1.46</mysql.version> | |
| 20 | + </properties> | |
| 21 | + | |
| 22 | + <dependencies> | |
| 23 | + <dependency> | |
| 24 | + <groupId>cn.iocoder.boot</groupId> | |
| 25 | + <artifactId>yudao-framework-all</artifactId> | |
| 26 | + <version>${revision}</version> | |
| 27 | + </dependency> | |
| 28 | + | |
| 29 | + <!-- Web 相关 --> | |
| 30 | + <dependency> | |
| 31 | + <groupId>org.springframework</groupId> | |
| 32 | + <artifactId>spring-web</artifactId> | |
| 33 | + <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 --> | |
| 34 | + </dependency> | |
| 35 | + | |
| 36 | + <dependency> | |
| 37 | + <groupId>jakarta.servlet</groupId> | |
| 38 | + <artifactId>jakarta.servlet-api</artifactId> | |
| 39 | + <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 --> | |
| 40 | + </dependency> | |
| 41 | + | |
| 42 | + <!-- DB 相关 --> | |
| 43 | + <dependency> | |
| 44 | + <groupId>mysql</groupId> | |
| 45 | + <artifactId>mysql-connector-java</artifactId> | |
| 46 | + <version>${mysql.version}</version> | |
| 47 | + </dependency> | |
| 48 | + <dependency> | |
| 49 | + <groupId>com.alibaba</groupId> | |
| 50 | + <artifactId>druid-spring-boot-starter</artifactId> | |
| 51 | + </dependency> | |
| 52 | + <dependency> | |
| 53 | + <groupId>com.baomidou</groupId> | |
| 54 | + <artifactId>mybatis-plus-boot-starter</artifactId> | |
| 55 | + </dependency> | |
| 56 | + <dependency> | |
| 57 | + <groupId>com.baomidou</groupId> | |
| 58 | + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | |
| 59 | + </dependency> | |
| 60 | + </dependencies> | |
| 61 | + | |
| 62 | +</project> | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.datasource.config; | |
| 1 | +package cn.iocoder.yudao.framework.datasource.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.datasource.core.filter.DruidAdRemoveFilter; | |
| 3 | +import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter; | |
| 4 | 4 | import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; |
| 5 | 5 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; |
| 6 | +import org.springframework.boot.context.properties.EnableConfigurationProperties; | |
| 6 | 7 | import org.springframework.boot.web.servlet.FilterRegistrationBean; |
| 7 | 8 | import org.springframework.context.annotation.Bean; |
| 8 | 9 | import org.springframework.context.annotation.Configuration; |
| ... | ... | @@ -15,7 +16,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; |
| 15 | 16 | */ |
| 16 | 17 | @Configuration |
| 17 | 18 | @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理 |
| 18 | -public class DataSourceConfiguration { | |
| 19 | +@EnableConfigurationProperties(DruidStatProperties.class) | |
| 20 | +public class YudaoDataSourceAutoConfiguration { | |
| 19 | 21 | |
| 20 | 22 | /** |
| 21 | 23 | * 创建 DruidAdRemoveFilter 过滤器，过滤 common.js 的广告 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/enums/DataSourceEnum.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/filter/DruidAdRemoveFilter.java
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/package-info.java
0 → 100644
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.mybatis.config; | |
| 1 | +package cn.iocoder.yudao.framework.mybatis.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.handler.DefaultDBFieldHandler; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler; | |
| 4 | 4 | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; |
| 5 | 5 | import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; |
| 6 | 6 | import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; |
| ... | ... | @@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration; |
| 17 | 17 | @Configuration |
| 18 | 18 | @MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class, |
| 19 | 19 | lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试 |
| 20 | -public class MybatisConfiguration { | |
| 20 | +public class YudaoMybatisAutoConfiguration { | |
| 21 | 21 | |
| 22 | 22 | @Bean |
| 23 | 23 | public MybatisPlusInterceptor mybatisPlusInterceptor() { | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java
| 1 | -package cn.iocoder.dashboard.framework.mybatis.core.handler; | |
| 1 | +package cn.iocoder.yudao.framework.mybatis.core.handler; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.security.core.LoginUser; |
| 5 | 5 | import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; |
| 6 | 6 | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
| 1 | -package cn.iocoder.dashboard.framework.mybatis.core.mapper; | |
| 1 | +package cn.iocoder.yudao.framework.mybatis.core.mapper; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; | |
| 6 | 6 | import com.baomidou.mybatisplus.core.conditions.Wrapper; |
| 7 | 7 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 8 | 8 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java
| 1 | -package cn.iocoder.dashboard.framework.mybatis.core.type; | |
| 1 | +package cn.iocoder.yudao.framework.mybatis.core.type; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.util.json.JsonUtils; | |
| 3 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java
| 1 | -package cn.iocoder.dashboard.framework.mybatis.core.util; | |
| 1 | +package cn.iocoder.yudao.framework.mybatis.core.util; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollectionUtil; |
| 4 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 5 | -import cn.iocoder.yudao.common.pojo.SortingField; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 5 | +import cn.iocoder.yudao.framework.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-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/package-info.java
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework; | ... | ... |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
0 → 100644
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md renamed to yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md renamed to yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md