diff --git a/README.md b/README.md index b6b313734..387d44048 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,15 @@ ## 技术栈 +| 项目 | 说明 | +| --- | --- | --- | --- | +| `yudao-dependencies` | Maven 依赖版本管理 | +| `yudao-framework` | Java 框架拓展 | +| `yudao-admin-server` | 管理后台的服务端 | +| `yudao-admin-ui` | 管理后台的 UI 界面 | +| `yudao-user-server` | 用户前台的服务端 | +| `yudao-user-ui` | 用户前台的 UI 界面 | + ### 后端 | 框架 | 说明 | 版本 | 学习指南 | diff --git a/pom.xml b/pom.xml index 4836de07f..eec621676 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.iocoder.boot yudao ${revision} diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index b1a940c67..dab902e60 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -19,7 +19,7 @@ cn.iocoder.boot - yudao-common + yudao-framework-all ${revision} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java index a0a9ec62f..a23c6e661 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java index d8f549c9b..99f7d8ad6 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("参数配置导出 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java index be4710d74..e93465282 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.config.vo; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("参数配置分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java index 6d21d772c..b96b5ccf3 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java +++ b/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; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import cn.smallbun.screw.core.Configuration; import cn.smallbun.screw.core.engine.EngineConfig; import cn.smallbun.screw.core.engine.EngineFileType; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java index a21f0d817..1b6160805 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java @@ -1,14 +1,14 @@ package cn.iocoder.dashboard.modules.infra.controller.file; import cn.hutool.core.io.IoUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert; import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "文件存储") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java index 8eae6e6c7..adce71e56 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.file.vo; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("文件分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java index 90894c6d4..332a20fa7 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "定时任务") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java index 704e951d9..6abb9cf41 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "定时任务日志") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java index a2e700ee5..e5854c21c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java index 81c1d5899..90b7ec94a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java +++ b/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; import javax.validation.constraints.NotNull; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java index e5fd05a77..6e1cb83c5 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java @@ -5,10 +5,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java index 5a679ab69..5105fab9f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("定时任务日志分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java index 4a40424d7..0b2050856 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; @@ -12,13 +12,11 @@ import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiAccessLogConvert; import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; import cn.iocoder.dashboard.modules.infra.service.logger.InfApiAccessLogService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -27,7 +25,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "API 访问日志") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java index 4e868fe50..93c73799b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; @@ -25,7 +25,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java index 04dbf39ce..416f99728 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java +++ b/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; import javax.validation.constraints.NotNull; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java index 7821cfc89..cb410577f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java index df0b12b9f..6f6ec0a67 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("API 访问日志分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java index ca9aa0cbe..97bd7e0d2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java +++ b/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; import javax.validation.constraints.NotNull; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java index 991987d0e..2707bad32 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java index c966ab068..6b915584c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("API 错误日志分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java index 61932e6df..25c1b7ef1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.controller.redis; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; import cn.iocoder.dashboard.framework.redis.core.RedisKeyRegistry; import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO; @@ -20,7 +20,7 @@ import javax.annotation.Resource; import java.util.List; import java.util.Properties; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "Redis 监控") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java index 93b3d2273..9bc693274 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.config; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java index 9b8d49b6a..b6db2338c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.file; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; import org.mapstruct.Mapper; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java index 2f871361c..08612dca9 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExcelVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java index b08e03028..24ab38366 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogRespVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java index be013240f..8a0ca27cc 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java index f949da21e..5c050c201 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.convert.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java index ff32cea16..653c8e60e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java index dbe326cb7..da8b6e3a9 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.enums.UserTypeEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java index 9357f9cce..efbdab25d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.config; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java index 351d12cad..e4914ba81 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.file; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java index 956f073ab..83bdfe04f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java index de41aa3b8..16052b164 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java index 740bfeb7b..30d2da846 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java index a9267d7f1..32e66cac4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java index e02119b6c..b7f9fd786 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.enums; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; /** * Infra 错误码枚举类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java index d7d120c19..e588c60b4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.config; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java index 211ec52d2..8c9b42c91 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.service.config.impl; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java index 771828266..b3f281434 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.file; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java index 9a697f3d2..b73097181 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.service.file.impl; import cn.hutool.core.io.FileTypeUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.file.config.FileProperties; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.ByteArrayInputStream; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java index dd9edeb9a..9b3489c50 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.quartz.core.service.JobLogFrameworkService; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java index 9f2e638ce..042f3ff58 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.job; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java index 99c028651..be287eca1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.job.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java index 156c423c6..ede819e40 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.job.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; @@ -21,9 +21,9 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.List; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.containsAny; +import static cn.iocoder.yudao.util.collection.CollectionUtils.containsAny; /** * 定时任务 Service 实现类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java index c04e69cb9..a0250ce52 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java index 0da7bb892..82a3a7d71 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java index 7ed83d9e1..2fde688f6 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.logger.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java index 647c0621b..dd8a38020 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.infra.service.logger.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java index e3a100073..c58e47a1a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java @@ -1,9 +1,8 @@ package cn.iocoder.dashboard.modules.system.controller.auth; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; -import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; @@ -17,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.collection.SetUtils; +import cn.iocoder.yudao.util.collection.SetUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -27,11 +26,11 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; -import static cn.iocoder.dashboard.util.servlet.ServletUtils.getClientIP; -import static cn.iocoder.dashboard.util.servlet.ServletUtils.getUserAgent; +import static cn.iocoder.yudao.util.servlet.ServletUtils.getClientIP; +import static cn.iocoder.yudao.util.servlet.ServletUtils.getUserAgent; @Api(tags = "认证") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java index 7ffd6318a..21b4559b8 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.auth; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO; import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; import cn.iocoder.dashboard.modules.system.convert.auth.SysUserSessionConvert; @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.collection.MapUtils; +import cn.iocoder.yudao.util.collection.MapUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertList; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertList; @Api(tags = "用户 Session") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java index 3cc1e09af..37c016306 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java index 3a2fca733..f26a213b0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java @@ -1,13 +1,11 @@ package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotEmpty; - @ApiModel("在线用户 Session 分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java index 487389331..5cc31378e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.common; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; import io.swagger.annotations.Api; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "验证码") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java index 9651275c1..5ccfa7bc2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.dept; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.*; import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert; import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "部门") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java index 125cd5d61..4701c198c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.controller.dept; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "岗位") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java index 777edcb42..cb0c22096 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java index 6eda1162d..1b169389d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "字典数据") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java index 9e6ce7edb..71355c782 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "字典类型") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java index ad5a07536..cab130a6d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java index 19730c7c4..2f8326faa 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("字典类型分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java index 32c6d42df..75292125b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.Size; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("字典类型分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java index 93d5bdffc..51e4b923e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "错误码") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java index a9253d4f8..0b4419af7 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java index 667110cf2..42e5a1343 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("错误码分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java index 21159ab74..7162e2f6b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java index 003e9ee0d..3ad95cac1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; 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 import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.collection.MapUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.MapUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,7 +32,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "操作日志") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java index 478175fbb..4f292a38f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("登陆日志分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java index c90bfff0b..0e02bdd15 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("登陆日志分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java index c1f23b2e4..7a91e46bd 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("操作日志分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java index b5b05e7fe..9c9eb098f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("操作日志分页列表 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java index 8a3f17032..13de8b667 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.notice; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "通知公告") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java index a463bfc0a..3efd2b4a1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.notice.vo; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java index 120949252..738572bac 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*; import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert; import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "菜单") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java index 2de34ff8a..945aef458 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.permission; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleDataScopeReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleMenuReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignUserRoleReqVO; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Set; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; /** * 权限 Controller，提供赋予用户、角色的权限的 API 接口 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java index eb12d2a78..1dda5d877 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.controller.permission; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "角色") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java index 129fd103d..c0949efb0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java @@ -3,12 +3,11 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("角色分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java index 3dddb4354..699539458 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("角色分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java index 30d75bca5..659fafc3a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java +++ b/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; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "短信回调") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java index 1e1a916c1..ed6fcbea0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.*; import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsChannelConvert; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; @@ -17,7 +17,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "短信渠道") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java index 1d0a2fed0..ffb17c813 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; @@ -25,7 +25,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "短信日志") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java index 1c442b71c..cfaa39c38 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; @@ -21,7 +21,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api("短信模板") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java index 523a6c375..4e52b9fb7 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.channel; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("短信渠道分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java index 89add180a..b9bf34f1e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "短信日志 Excel 导出 Request VO", description = "参数和 SysSmsLogPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java index 6573e15a7..21a2ea084 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("短信日志分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java index 34f940253..f4d519860 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "短信模板 Excel 导出 Request VO", description = "参数和 SysSmsTemplatePageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java index b5f1e5bfb..bd1e0f617 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("短信模板分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java index dcfce4d5b..76bf5d956 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java @@ -1,9 +1,9 @@ package cn.iocoder.dashboard.modules.system.controller.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.collection.MapUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.MapUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -30,7 +30,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.*; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "用户") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java index a1b8b0cb9..4ba1bdcd8 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.controller.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileRespVO; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; @@ -28,7 +28,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_IS_EMPTY; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java index 8076c4748..c0470e6c3 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "用户导出 Request VO", description = "参数和 SysUserPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java index 03efb8ceb..1339e3aff 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("用户分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java index 48c909534..e2eb56d3b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java +++ b/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; import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java index 62b254ff4..7d7a8334d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.dept; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; import org.mapstruct.Mapper; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java index 90551d641..fb8d276ec 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java @@ -1,10 +1,9 @@ package cn.iocoder.dashboard.modules.system.convert.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; -import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java index 6465e6709..9c24cc1bc 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java @@ -1,7 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; import org.mapstruct.Mapper; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java index 695c2fa02..d53e66ccc 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.errorcode; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java index 13c286273..2d193ec8c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java index 7eca70d49..36b1564e2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java @@ -1,12 +1,12 @@ package cn.iocoder.dashboard.modules.system.convert.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; -import cn.iocoder.dashboard.util.collection.MapUtils; +import cn.iocoder.yudao.util.collection.MapUtils; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; @Mapper public interface SysOperateLogConvert { diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java index 8d6f20646..23c10567e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.notice; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java index f8a0e71e2..23b9f1548 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java index 6cb1f650a..3fa873999 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogRespVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java index 5d73771eb..f8790377b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.convert.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExcelVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java index e116bd3b0..2ed0ff027 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.dept; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java index ba5f3e0ad..e3f0bd45d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.dept; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java index ae9ff6e75..0b236bb5d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.dict; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java index 164bb7120..7385a18e1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.dict; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java index 4c7bc431b..fbe96e427 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java index dc89207a7..0b4860d56 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.notice; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java index 82956e9f9..c82e41016 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java index 5b891f12d..410d9b85b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java index 7b0b3f072..19d45f0eb 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java index 076e18f39..aa47d4d74 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.enums.UserTypeEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java index 9316358df..c99be50ec 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.sms; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java index 6eab991c1..547290231 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.user; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.mybatis.core.type.JsonLongSetTypeHandler; import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java index bb311312d..9a6ed9f85 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.auth; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java index 39716e09c..bc823b6b6 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.dept; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java index 78a410563..cbf11556b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java index 0320457c4..03938d77d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java index 63be95295..d947c71f5 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.errorcode; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java index 63ae620ac..420264e17 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java index c61e85ef6..c2feb3518 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.logger; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java index ead252d85..0600f1c6b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.notice; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java index effab1628..5eee3f829 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.permission; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java index 69e329b90..a80345811 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java @@ -1,16 +1,14 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import java.util.Date; -import java.util.List; @Mapper public interface SysSmsChannelMapper extends BaseMapperX { diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java index e3345c835..a0f6d065c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java index a41e38b2d..d210a3bff 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java index e93a0e1f9..cd9eb8385 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.dal.mysql.user; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java index 02489e81a..816ca573f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java +++ b/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; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Repository; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java index 2d6eb305c..e516e208d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.enums; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; /** * System 错误码枚举类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java index be59a23ea..eef584c41 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.enums.errorcode; -import cn.iocoder.dashboard.common.core.IntArrayValuable; +import cn.iocoder.yudao.common.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java index 9bb30514a..58612097a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.mq.message.sms; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage; import lombok.Data; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java index d346ef02e..98abcc4c4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.mq.producer.sms; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.redis.core.util.RedisMessageUtils; import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsChannelRefreshMessage; import cn.iocoder.dashboard.modules.system.mq.message.sms.SysSmsSendMessage; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java index 9e946d901..655f8e2cf 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.auth; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java index 40eb79ae3..aacd4f583 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; @@ -32,7 +32,7 @@ import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.Set; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; import static java.util.Collections.singleton; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java index e185a1fbb..cf51012aa 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.security.config.SecurityProperties; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; @@ -26,8 +26,8 @@ import java.time.Duration; import java.util.*; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.dashboard.util.date.DateUtils.addTime; +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.util.date.DateUtils.addTime; /** * 在线用户 Session Service 实现类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java index b378fd18d..aa5e19b98 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java +++ b/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 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import java.util.Collection; import java.util.Collections; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java index 78a96ce29..333e1f2dd 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.dept; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO; @@ -12,7 +12,7 @@ import org.springframework.lang.Nullable; import java.util.Collection; import java.util.List; -import static cn.iocoder.dashboard.util.collection.SetUtils.asSet; +import static cn.iocoder.yudao.util.collection.SetUtils.asSet; /** * 岗位 Service 接口 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java index 96e3d1ad0..3980656ac 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.dept.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java index 36bb95cb2..d94c2dd15 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.dept.impl; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java index ffbd66d19..7f1c39af6 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java index 1d2fbe945..3c8c6d992 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.dict; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java index 20ed72ebe..d3371245e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.dict.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; @@ -28,7 +28,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java index c210e8e2b..de01773fb 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.dict.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java index 5d7354e7a..5c879dd19 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.errorcode; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java index 4a73ffe12..1b382591d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.errorcode.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; @@ -24,10 +24,10 @@ import java.util.Date; import java.util.List; import java.util.Map; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertMap; +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; /** * 错误码 Service 实现类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java index ffea8c54f..cdce77aec 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java index 689698e48..c10bd5a92 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.logger; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java index ed51a2122..571babee0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.logger.impl; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java index f92d8b1dd..6d1e1ec5d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; 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; import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.string.StrUtils; +import cn.iocoder.yudao.util.string.StrUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.AsyncResult; @@ -26,7 +26,7 @@ import java.util.concurrent.Future; import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH; -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.util.collection.CollectionUtils.convertSet; @Service @Slf4j diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java index 37a92267b..01b1901c5 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.notice; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java index 502f43c3b..089ee8f88 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.notice.impl; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java index 94506ec61..0359b0612 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.permission; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java index ec4ea5a9b..a4c8596dd 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; @@ -14,7 +14,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java index 9116d3e55..dee57c14d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java +++ b/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 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.collection.MapUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.MapUtils; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java index 89e51ad5e..d9a2b6a22 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java index c53d85e05..250e5d7c4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java index 52bb4a624..fcd5b648a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java index 1af5dae12..af349178e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.system.service.sms; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplateExportReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.SysSmsTemplatePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java index 16ecdecff..ee5512c7f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; @@ -25,7 +25,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java index 3145163c0..9d79ef611 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java index 46534d57f..14b90aedb 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.core.KeyValue; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.core.KeyValue; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.UserTypeEnum; import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java index 0a070aefb..aa3b34411 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java @@ -3,8 +3,8 @@ package cn.iocoder.dashboard.modules.system.service.sms.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; @@ -33,7 +33,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.regex.Pattern; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java index 5ef26ebc5..8cde57266 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; 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 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO; import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import java.io.InputStream; import java.util.Collection; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java index 4e882794a..abe0033c1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java +++ b/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; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; 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; import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -31,7 +31,7 @@ import javax.annotation.Resource; import java.io.InputStream; import java.util.*; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java index a4946cd67..a949ff854 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java +++ b/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; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ZipUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColum import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO; import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; @Api(tags = "代码生成器") @RestController diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java index 4b263a598..b64a80c5a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("表定义分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java index 80384c8b0..5e3632fbd 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.tool.controller.test; import cn.hutool.core.thread.ThreadUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import static cn.iocoder.dashboard.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.common.pojo.CommonResult.success; import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; @Api(tags = "测试示例") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java index 37933cf3f..c79c61a6f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java +++ b/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; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel(value = "字典类型 Excel 导出 Request VO", description = "参数和 ToolTestDemoPageReqVO 是一致的") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java index 5a0d5a408..9b3a63360 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.controller.test.vo; -import cn.iocoder.dashboard.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @ApiModel("字典类型分页 Request VO") @Data diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java index b3d154232..1302cbb31 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.convert.codegen; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java index 7e2b28a05..76d0caa7f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.convert.test; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExcelVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoRespVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java index 9d598ea11..03e48ea7e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java @@ -31,7 +31,7 @@ public class ToolTestDemoDO extends BaseDO { /** * 状态 * - * 枚举 {@link cn.iocoder.dashboard.common.enums.CommonStatusEnum} + * 枚举 {@link cn.iocoder.yudao.common.enums.CommonStatusEnum} */ private Integer status; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java index 52ce76f2b..d7879f8bf 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.dal.mysql.codegen; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java index ff0b5670e..1bf993836 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.dal.mysql.test; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java index b614b0ace..56764e839 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.enums; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; /** * Tool 错误码枚举类 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java index a398bb43e..324980355 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.service.codegen; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java index 7c61c9988..9dad5fa7d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java @@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.engine.velocity.VelocityEngine; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageParam; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; @@ -20,8 +20,8 @@ import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.date.DateUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.date.DateUtils; import com.google.common.collect.Maps; import org.springframework.stereotype.Component; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java index 0b35e0579..e9ac81c0f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.tool.service.codegen.impl; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; 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 import cn.iocoder.dashboard.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper; import cn.iocoder.dashboard.modules.tool.enums.codegen.ToolCodegenImportTypeEnum; import cn.iocoder.dashboard.modules.tool.service.codegen.ToolCodegenService; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import org.apache.commons.collections4.KeyValue; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.dashboard.modules.tool.enums.ToolErrorCodeConstants.*; /** diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java index 377eb0de4..53e0afd3f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.modules.tool.service.test; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoPageReqVO; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java index 5483bab0e..223cb6788 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.tool.service.test.impl; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoExportReqVO; import cn.iocoder.dashboard.modules.tool.controller.test.vo.ToolTestDemoPageReqVO; diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java index dc1904a3a..ef385527a 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java index 5815aa75c..825eb094f 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java index 73f1a472d..3099cdf0a 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; diff --git a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java index 7ec704b5d..4504863a4 100644 --- a/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java +++ b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.hutool.core.map.MapUtil; import cn.hutool.core.thread.ThreadUtil; import cn.iocoder.dashboard.BaseDbAndRedisIntegrationTest; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.enums.UserTypeEnum; import cn.iocoder.dashboard.framework.sms.config.SmsConfiguration; import cn.iocoder.dashboard.modules.system.mq.consumer.sms.SysSmsSendConsumer; import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java index 9f3f3f0b7..b10756da5 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.infra.service.config; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper; import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer; import cn.iocoder.dashboard.modules.infra.service.config.impl.InfConfigServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -23,10 +23,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java index 4507e9617..ee0f3b810 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java @@ -2,25 +2,25 @@ package cn.iocoder.dashboard.modules.infra.service.file; import cn.hutool.core.io.resource.ResourceUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.file.config.FileProperties; import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; import cn.iocoder.dashboard.modules.infra.service.file.impl.InfFileServiceImpl; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; @Import({InfFileServiceImpl.class, FileProperties.class}) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java index 4539390b2..af6c99492 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.modules.infra.service.job; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -18,14 +18,14 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobLogMapper; import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobLogServiceImpl; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; /** * {@link InfJobLogServiceImpl} 的单元测试 diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java index 9cb470071..dcf6400fa 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -29,7 +29,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; 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; import cn.iocoder.dashboard.modules.infra.dal.mysql.job.InfJobMapper; import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum; import cn.iocoder.dashboard.modules.infra.service.job.impl.InfJobServiceImpl; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; /** * {@link InfJobServiceImpl} 的单元测试 diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java index 8e6e2a696..b72891d58 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java @@ -2,17 +2,17 @@ package cn.iocoder.dashboard.modules.infra.service.logger; import cn.hutool.core.util.RandomUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -21,8 +21,8 @@ import java.util.Date; import java.util.List; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java index 3240e5c83..961dbce1b 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java +++ b/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; import cn.hutool.core.util.RandomUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -23,9 +23,9 @@ import java.util.concurrent.Future; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java index aecba9e4f..d7d8c12c2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.auth; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.test.AssertUtils; +import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -28,8 +28,8 @@ import javax.annotation.Resource; import java.util.Set; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java index 3e5e17224..c1e91b14a 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java @@ -1,12 +1,12 @@ package cn.iocoder.dashboard.modules.system.service.auth; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomDate; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; -import static cn.iocoder.dashboard.util.date.DateUtils.addTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomDate; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; +import static cn.iocoder.yudao.util.date.DateUtils.addTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -27,8 +27,8 @@ import org.springframework.context.annotation.Import; import cn.hutool.core.date.DateUtil; import cn.iocoder.dashboard.BaseDbAndRedisUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.security.config.SecurityProperties; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; @@ -42,9 +42,9 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; -import cn.iocoder.dashboard.util.test.AssertUtils; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.dashboard.framework.test.core.util.AssertUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; /** * SysUserSessionServiceImpl Tester. diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java index 273065e47..5350cd3f8 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.*; @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java index 9d17c4cb3..3237fc890 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.dept; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO; 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; import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum; import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer; import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java index b83937223..351c610b3 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.dept; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO; 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 import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper; import cn.iocoder.dashboard.modules.system.service.dept.impl.SysPostServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -21,10 +21,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java index 043220fc4..1e787e813 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.dict; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; 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; import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper; import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer; import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictDataServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import com.google.common.collect.ImmutableTable; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java index a554f0bfa..e8457f7f7 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.dict; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO; 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 import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper; import cn.iocoder.dashboard.modules.system.service.dict.impl.SysDictTypeServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -22,10 +22,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java index 84ca54130..434d9f9e1 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.errorcode; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; @@ -12,8 +12,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCode import cn.iocoder.dashboard.modules.system.dal.mysql.errorcode.SysErrorCodeMapper; import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum; import cn.iocoder.dashboard.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -27,10 +27,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java index e98ca5276..46769fe37 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java +++ b/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; import cn.hutool.core.util.RandomUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; @@ -12,16 +12,16 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; @Import(SysLoginLogServiceImpl.class) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java index 0bf98b635..ad6dc6def 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java +++ b/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; import cn.hutool.core.map.MapUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; @@ -16,8 +16,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -27,9 +27,9 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java index c20013da2..8098ca0ab 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.notice; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO; @@ -10,7 +10,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO; import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper; import cn.iocoder.dashboard.modules.system.enums.notice.SysNoticeTypeEnum; import cn.iocoder.dashboard.modules.system.service.notice.impl.SysNoticeServiceImpl; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -20,10 +20,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; @Import(SysNoticeServiceImpl.class) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java index bff5f5b4b..22438f9f5 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java +++ b/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; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; 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; import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; -import cn.iocoder.dashboard.util.sping.SpringAopUtils; -import cn.iocoder.dashboard.util.test.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.sping.SpringAopUtils; +import cn.iocoder.dashboard.framework.test.core.util.RandomUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import javax.annotation.Resource; import java.util.*; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java index 9d974c7bd..591e08b68 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java index 682472881..c3b6f82c0 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java +++ b/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; import cn.hutool.core.bean.BeanUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; 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; import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer; import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl; -import cn.iocoder.dashboard.util.sping.SpringAopUtils; +import cn.iocoder.yudao.util.sping.SpringAopUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -23,10 +23,10 @@ import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java index 60980a235..e602d365d 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java +++ b/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; import cn.hutool.core.bean.BeanUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO; 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; import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsChannelMapper; import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsChannelServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -25,10 +25,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; -import static cn.iocoder.dashboard.util.test.AssertUtils.*; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; +import static cn.iocoder.yudao.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java index 0e1208b3d..cd09f4640 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java +++ b/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; import cn.hutool.core.map.MapUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsLogDO; @@ -14,8 +14,8 @@ import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsReceiveStatusEnum; import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsSendStatusEnum; import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsLogServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -27,9 +27,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBoolean; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java index 7b944275a..ecdd8eb5b 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java +++ b/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; import cn.hutool.core.map.MapUtil; import cn.iocoder.dashboard.BaseMockitoUnitTest; -import cn.iocoder.dashboard.common.core.KeyValue; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.core.KeyValue; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.UserTypeEnum; import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -25,8 +25,8 @@ import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java index db6f06ce1..ce8bd7e2b 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java @@ -1,9 +1,9 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; import cn.iocoder.dashboard.framework.sms.core.client.SmsClientFactory; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -18,8 +18,8 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.sms.SysSmsTemplateMapper; import cn.iocoder.dashboard.modules.system.enums.sms.SysSmsTemplateTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.sms.SysSmsProducer; import cn.iocoder.dashboard.modules.system.service.sms.impl.SysSmsTemplateServiceImpl; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import com.google.common.collect.Lists; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -34,11 +34,11 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; +import static cn.iocoder.yudao.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java index 9f1b7d3c3..68fe68919 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; @@ -17,9 +17,9 @@ import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; import cn.iocoder.dashboard.modules.system.service.dept.SysPostService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; -import cn.iocoder.dashboard.util.collection.ArrayUtils; -import cn.iocoder.dashboard.util.collection.CollectionUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.collection.ArrayUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import org.springframework.boot.test.mock.mockito.MockBean; @@ -35,10 +35,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBytes; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.date.DateUtils.buildTime; import static org.assertj.core.util.Lists.newArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index c0c81f208..6489c8dd5 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -20,6 +20,7 @@ 3.0.2 1.5.22 + 2.5 5.1.46 1.2.4 @@ -45,6 +46,7 @@ 2.2.7 2.2 1.0.5 + 30.1.1-jre 4.5.18 2.1.0 @@ -60,12 +62,6 @@ ${spring.boot.version} pom import - - - mysql - mysql-connector-java - - @@ -212,6 +208,12 @@ + + cn.iocoder.boot + yudao-common + ${revision} + + org.projectlombok lombok @@ -258,6 +260,12 @@ ${screw.version} + + com.google.guava + guava + ${guava.version} + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 93f2ca882..7e6f344aa 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -11,6 +11,7 @@ pom yudao-common + yudao-framework-all yudao-framework diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml index c7e2f27eb..f799c3d61 100644 --- a/yudao-framework/yudao-common/pom.xml +++ b/yudao-framework/yudao-common/pom.xml @@ -8,149 +8,53 @@ ${revision} 4.0.0 - yudao-common jar ${artifactId} - 基础框架，各种组件的拓展 + 定义基础 pojo 类、枚举、工具类等等 https://github.com/YunaiV/ruoyi-vue-pro - - org.springframework.boot - spring-boot-configuration-processor - true + org.springframework + spring-core + provided - - org.springframework.boot - spring-boot-starter-aop + org.springframework + spring-expression + provided + + + org.springframework + spring-aop + provided + + + org.aspectj + aspectjweaver + provided - org.springframework.boot - spring-boot-starter-web + org.springframework + spring-web + provided - org.springframework.boot - spring-boot-starter-security + jakarta.servlet + jakarta.servlet-api + provided - - org.springframework.boot - spring-boot-starter-validation - - - - com.github.xiaoymin - knife4j-spring-boot-starter - io.swagger swagger-annotations - - - - - mysql - mysql-connector-java - 5.1.46 - - - com.alibaba - druid-spring-boot-starter - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - - org.redisson - redisson-spring-boot-starter - - - - - com.ctrip.framework.apollo - apollo-client - - - - - org.springframework.boot - spring-boot-starter-quartz - - - - - com.baomidou - lock4j-redisson-spring-boot-starter - - - - io.github.resilience4j - resilience4j-spring-boot2 - - - - - org.apache.skywalking - apm-toolkit-trace - - - org.apache.skywalking - apm-toolkit-logback-1.x - - - org.apache.skywalking - apm-toolkit-opentracing - - - - de.codecentric - spring-boot-admin-starter-server - - - de.codecentric - spring-boot-admin-starter-client - - - - - org.springframework.boot - spring-boot-starter-test - provided - true - - - - com.h2database - h2 - true - - - - com.github.fppt - jedis-mock - provided - true - - - - uk.co.jemos.podam - podam - provided - true + provided @@ -161,11 +65,11 @@ org.mapstruct - mapstruct + mapstruct org.mapstruct - mapstruct-jdk8 + mapstruct-jdk8 org.mapstruct @@ -178,42 +82,33 @@ - com.alibaba - easyexcel + com.google.guava + guava + provided - org.apache.velocity - velocity-engine-core + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-core + provided - cn.smallbun.screw - screw-core - - - - - - - com.yunpian.sdk - yunpian-java-sdk + org.slf4j + slf4j-api + provided - com.aliyun - aliyun-java-sdk-core + jakarta.validation + jakarta.validation-api + provided - - com.aliyun - aliyun-java-sdk-dysmsapi - - - - - - ${artifactId} - diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/package-info.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/package-info.java deleted file mode 100644 index f49464f8e..000000000 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.dashboard; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/IntArrayValuable.java similarity index 80% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/IntArrayValuable.java index d9494d4cd..5bb69afe8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/IntArrayValuable.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.core; +package cn.iocoder.yudao.common.core; /** * 可生成 Int 数组的接口 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/KeyValue.java similarity index 86% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/KeyValue.java index 57fe08b5a..7adedd76d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/core/KeyValue.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.core; +package cn.iocoder.yudao.common.core; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/CommonStatusEnum.java similarity index 89% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/CommonStatusEnum.java index 336c2c2c7..1e00be07b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/CommonStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.enums; +package cn.iocoder.yudao.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/UserTypeEnum.java similarity index 90% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/UserTypeEnum.java index c93985e18..98572a2a3 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/enums/UserTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.enums; +package cn.iocoder.yudao.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ErrorCode.java similarity index 74% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ErrorCode.java index 065aece7c..8727320c6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ErrorCode.java @@ -1,7 +1,7 @@ -package cn.iocoder.dashboard.common.exception; +package cn.iocoder.yudao.common.exception; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.exception.enums.ServiceErrorCodeRange; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; import lombok.Data; /** diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ServiceException.java similarity index 90% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ServiceException.java index 2e2adec75..f40a0d6da 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/ServiceException.java @@ -1,6 +1,6 @@ -package cn.iocoder.dashboard.common.exception; +package cn.iocoder.yudao.common.exception; -import cn.iocoder.dashboard.common.exception.enums.ServiceErrorCodeRange; +import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/GlobalErrorCodeConstants.java similarity index 93% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/GlobalErrorCodeConstants.java index adda623e3..446b242c9 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/GlobalErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.dashboard.common.exception.enums; +package cn.iocoder.yudao.common.exception.enums; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; /** * 全局错误码枚举 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/ServiceErrorCodeRange.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/ServiceErrorCodeRange.java index be25c7062..76a67d0c4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/enums/ServiceErrorCodeRange.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.exception.enums; +package cn.iocoder.yudao.common.exception.enums; /** * 业务异常的错误码区间，解决：解决各模块错误码定义，避免重复，在此只声明不做实际使用 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/util/ServiceExceptionUtil.java similarity index 88% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/util/ServiceExceptionUtil.java index e6367c835..edb32bfe0 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/exception/util/ServiceExceptionUtil.java @@ -1,8 +1,9 @@ -package cn.iocoder.dashboard.common.exception.util; +package cn.iocoder.yudao.common.exception.util; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.exception.ServiceException; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ServiceException; import com.google.common.annotations.VisibleForTesting; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,10 +24,9 @@ import java.util.concurrent.ConcurrentMap; * 3. 异常提示信息，写在 Apollo 等等配置中心中，从而实现可动态刷新 * 4. 异常提示信息，存储在 db 等等数据库中，从而实现可动态刷新 */ +@Slf4j public class ServiceExceptionUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(ServiceExceptionUtil.class); - /** * 错误码提示模板 */ @@ -101,7 +101,7 @@ public class ServiceExceptionUtil { for (l = 0; l < params.length; l++) { j = messagePattern.indexOf("{}", i); if (j == -1) { - LOGGER.error("[doFormat][参数过多：错误码({})|错误内容({})|参数({})", code, messagePattern, params); + log.error("[doFormat][参数过多：错误码({})|错误内容({})|参数({})", code, messagePattern, params); if (i == 0) { return messagePattern; } else { @@ -115,7 +115,7 @@ public class ServiceExceptionUtil { } } if (messagePattern.indexOf("{}", i) != -1) { - LOGGER.error("[doFormat][参数过少：错误码({})|错误内容({})|参数({})", code, messagePattern, params); + log.error("[doFormat][参数过少：错误码({})|错误内容({})|参数({})", code, messagePattern, params); } sbuf.append(messagePattern.substring(i)); return sbuf.toString(); diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/package-info.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/package-info.java similarity index 71% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/package-info.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/package-info.java index 79cbafd83..6cade55f1 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/package-info.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/package-info.java @@ -3,4 +3,4 @@ * * 例如说，CommonResult 为通用返回 */ -package cn.iocoder.dashboard.common; +package cn.iocoder.yudao.common; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/CommonResult.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/CommonResult.java index bb7fbc345..285b772ee 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/CommonResult.java @@ -1,8 +1,8 @@ -package cn.iocoder.dashboard.common.pojo; +package cn.iocoder.yudao.common.pojo; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import org.springframework.util.Assert; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageParam.java similarity index 81% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageParam.java index 2385fc193..80b50619c 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageParam.java @@ -1,11 +1,11 @@ -package cn.iocoder.dashboard.common.pojo; +package cn.iocoder.yudao.common.pojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.hibernate.validator.constraints.Range; import javax.validation.constraints.Min; +import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -23,7 +23,8 @@ public class PageParam implements Serializable { @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10") @NotNull(message = "每页条数不能为空") - @Range(min = 1, max = 100, message = "条数范围为 [1, 100]") + @Min(value = 1, message = "页码最小值为 1") + @Max(value = 100, message = "页码最大值为 100") private Integer pageSize = PAGE_SIZE; } diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageResult.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageResult.java index 092677d0c..f77980a4b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/PageResult.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.pojo; +package cn.iocoder.yudao.common.pojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/SortingField.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/SortingField.java index 118a91b88..f89dc4868 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/common/pojo/SortingField.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.common.pojo; +package cn.iocoder.yudao.common.pojo; import java.io.Serializable; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/ArrayUtils.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/ArrayUtils.java index e40442732..23b47f360 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/ArrayUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.collection; +package cn.iocoder.yudao.util.collection; import cn.hutool.core.util.ArrayUtil; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/CollectionUtils.java similarity index 99% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/CollectionUtils.java index ccd075a96..1a9a470e4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/CollectionUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.collection; +package cn.iocoder.yudao.util.collection; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/MapUtils.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/MapUtils.java index ce5805db8..3d2a674c9 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/MapUtils.java @@ -1,8 +1,8 @@ -package cn.iocoder.dashboard.util.collection; +package cn.iocoder.yudao.util.collection; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/SetUtils.java similarity index 84% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/SetUtils.java index d6fafcff0..7907a95d2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/collection/SetUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.collection; +package cn.iocoder.yudao.util.collection; import java.util.Arrays; import java.util.HashSet; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/date/DateUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/date/DateUtils.java index 868647fa8..709b6660f 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/date/DateUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.date; +package cn.iocoder.yudao.util.date; import java.time.Duration; import java.util.Calendar; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/json/JsonUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/json/JsonUtils.java index 2291235dc..9a76622b5 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/json/JsonUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.json; +package cn.iocoder.yudao.util.json; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/object/ObjectUtils.java similarity index 93% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/object/ObjectUtils.java index 1d652488f..1c962f410 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/object/ObjectUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.object; +package cn.iocoder.yudao.util.object; import cn.hutool.core.util.ObjectUtil; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/package-info.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/package-info.java similarity index 90% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/package-info.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/package-info.java index dd564c247..b73d24792 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/package-info.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/package-info.java @@ -4,4 +4,4 @@ * * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。 */ -package cn.iocoder.dashboard.util; +package cn.iocoder.yudao.util; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/servlet/ServletUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/servlet/ServletUtils.java index 3828775c4..72bf9ad1b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/servlet/ServletUtils.java @@ -1,9 +1,9 @@ -package cn.iocoder.dashboard.util.servlet; +package cn.iocoder.yudao.util.servlet; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import org.springframework.http.MediaType; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringAopUtils.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringAopUtils.java index c55357c45..8eaec1ba3 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringAopUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.sping; +package cn.iocoder.yudao.util.sping; import cn.hutool.core.bean.BeanUtil; import org.springframework.aop.framework.AdvisedSupport; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringExpressionUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringExpressionUtils.java index 50d67f3f1..cb35f6099 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/sping/SpringExpressionUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.sping; +package cn.iocoder.yudao.util.sping; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/string/StrUtils.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/string/StrUtils.java index e0ca605a4..5122325c8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/util/string/StrUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util.string; +package cn.iocoder.yudao.util.string; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/yudao-framework/yudao-framework-all/pom.xml b/yudao-framework/yudao-framework-all/pom.xml new file mode 100644 index 000000000..d135b5320 --- /dev/null +++ b/yudao-framework/yudao-framework-all/pom.xml @@ -0,0 +1,195 @@ + + + + cn.iocoder.boot + yudao-framework + ${revision} + + 4.0.0 + yudao-framework-all + jar + + ${artifactId} + 基础框架，各种组件的拓展 + https://github.com/YunaiV/ruoyi-vue-pro + + + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-validation + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + io.swagger + swagger-annotations + + + + + mysql + mysql-connector-java + 5.1.46 + + + com.alibaba + druid-spring-boot-starter + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + org.redisson + redisson-spring-boot-starter + + + + + com.ctrip.framework.apollo + apollo-client + + + + + org.springframework.boot + spring-boot-starter-quartz + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + + + + io.github.resilience4j + resilience4j-spring-boot2 + + + + + org.apache.skywalking + apm-toolkit-trace + + + org.apache.skywalking + apm-toolkit-logback-1.x + + + org.apache.skywalking + apm-toolkit-opentracing + + + + de.codecentric + spring-boot-admin-starter-server + + + de.codecentric + spring-boot-admin-starter-client + + + + + org.springframework.boot + spring-boot-starter-test + provided + true + + + + com.h2database + h2 + true + + + + com.github.fppt + jedis-mock + provided + true + + + + uk.co.jemos.podam + podam + provided + true + + + + + cn.iocoder.boot + yudao-common + + + + com.alibaba + easyexcel + + + + org.apache.velocity + velocity-engine-core + + + + cn.smallbun.screw + screw-core + + + + + + + com.yunpian.sdk + yunpian-java-sdk + + + + com.aliyun + aliyun-java-sdk-core + + + com.aliyun + aliyun-java-sdk-dysmsapi + + + + + diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java index acf2e1f48..6cb4d0e1a 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java @@ -2,12 +2,10 @@ package cn.iocoder.dashboard.framework.apollo.internals; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.dashboard.util.object.ObjectUtils; +import cn.iocoder.yudao.util.object.ObjectUtils; import com.ctrip.framework.apollo.Apollo; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java similarity index 88% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java index bfbcee7ba..24a1941cd 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.dict.core.dto; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import lombok.Data; /** diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java index 2d54fabdb..8ec8af2d6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; import lombok.RequiredArgsConstructor; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java similarity index 65% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java index 805e0802f..4b1d19b44 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.framework.errorcode.core.loader; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; /** * 错误码加载器 * - * 注意，错误码最终加载到 {@link cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！ + * 注意，错误码最终加载到 {@link cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！ * * @author dlyan */ diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java index 2f1c9b9d8..40c4f2f7b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java +++ b/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; import cn.hutool.core.collection.CollUtil; import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; -import cn.iocoder.dashboard.util.date.DateUtils; +import cn.iocoder.yudao.util.date.DateUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java index d099d3c98..b158b3628 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.excel.core.convert; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.CellData; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java index da7a1bfff..f148848d9 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.framework.idempotent.core.aop; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent; import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import cn.iocoder.dashboard.framework.idempotent.core.redis.IdempotentRedisDAO; -import cn.iocoder.dashboard.util.collection.CollectionUtils; +import cn.iocoder.yudao.util.collection.CollectionUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java index 5a263ca58..47185ee5b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java +++ b/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; import cn.iocoder.dashboard.framework.jackson.deser.LocalDateTimeDeserializer; import cn.iocoder.dashboard.framework.jackson.ser.LocalDateTimeSerializer; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import org.springframework.context.annotation.Bean; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java similarity index 68% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java index 066cbf9fd..886b5dd31 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java @@ -1,12 +1,12 @@ package cn.iocoder.dashboard.framework.lock4j.core; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import com.baomidou.lock.LockFailureStrategy; import lombok.extern.slf4j.Slf4j; /** - * 自定义获取锁失败策略，抛出 {@link cn.iocoder.dashboard.common.exception.ServiceException} 异常 + * 自定义获取锁失败策略，抛出 {@link cn.iocoder.yudao.common.exception.ServiceException} 异常 */ @Slf4j public class DefaultLockFailureStrategy implements LockFailureStrategy { diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java index 593e03c87..bcdfd961a 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java +++ b/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; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.framework.web.config.WebProperties; import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.dashboard.util.date.DateUtils; -import cn.iocoder.dashboard.util.json.JsonUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.date.DateUtils; +import cn.iocoder.yudao.util.json.JsonUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java index 91412eb83..411c21fd4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java +++ b/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; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; -import cn.iocoder.dashboard.util.json.JsonUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.json.JsonUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,8 +35,8 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.IntStream; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; /** * 拦截使用 @OperateLog 注解，如果满足条件，则生成操作日志。 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java index b86fd762f..4384f1fa7 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.mybatis.core.mapper; -import cn.iocoder.dashboard.common.pojo.PageParam; -import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.yudao.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.PageResult; import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java index 4532cfa62..66ba7a48a 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.mybatis.core.type; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java index 47d2f5666..2ca870777 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.framework.mybatis.core.util; import cn.hutool.core.collection.CollectionUtil; -import cn.iocoder.dashboard.common.pojo.PageParam; -import cn.iocoder.dashboard.common.pojo.SortingField; +import cn.iocoder.yudao.common.pojo.PageParam; +import cn.iocoder.yudao.common.pojo.SortingField; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java index f7fad193f..48b862219 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java +++ b/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; import javax.annotation.Resource; import java.util.Date; -import static cn.iocoder.dashboard.util.date.DateUtils.diff; +import static cn.iocoder.yudao.util.date.DateUtils.diff; import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage; /** diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java index 2abf03d4d..52b11c398 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.redis.core.pubsub; import cn.hutool.core.util.TypeUtil; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import lombok.SneakyThrows; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java index 5fb01aa15..9cc90a172 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.redis.core.stream; import cn.hutool.core.util.TypeUtil; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java index 9331606af..e5603acf6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java +++ b/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; import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage; import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import org.springframework.data.redis.connection.stream.RecordId; import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.core.RedisTemplate; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java index 9ba5cf43d..2c5393a68 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.security.core; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import org.springframework.security.core.GrantedAuthority; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java index 3914583de..2e6a243e2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java @@ -1,13 +1,13 @@ package cn.iocoder.dashboard.framework.security.core.filter; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.config.SecurityProperties; import cn.iocoder.dashboard.framework.security.core.LoginUser; import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.dashboard.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java similarity index 85% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java index 2e813d659..c4bb9cdda 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java @@ -1,9 +1,9 @@ package cn.iocoder.dashboard.framework.security.core.handler; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; /** * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java similarity index 83% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java index 6545a95dc..79365f396 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java @@ -1,8 +1,8 @@ package cn.iocoder.dashboard.framework.security.core.handler; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.dashboard.common.pojo.CommonResult; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.pojo.CommonResult; +import cn.iocoder.yudao.util.servlet.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; @@ -13,7 +13,7 @@ import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; /** * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java index 262f56fe2..778490117 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.framework.security.core.handler; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.config.SecurityProperties; import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.stereotype.Component; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java index f706e7983..dfde76773 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java similarity index 87% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java index 7b6cc51f2..76a1da7d8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import java.util.function.Function; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java index 79ebed3a2..d9f984760 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java +++ b/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; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java index 068c0db7c..dfdcf6160 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsClient; import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java index 24683bcb0..07d113dd4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java +++ b/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; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.dashboard.util.collection.MapUtils; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.collection.MapUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import com.aliyuncs.AcsRequest; import com.aliyuncs.AcsResponse; import com.aliyuncs.DefaultAcsClient; @@ -34,8 +34,8 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -import static cn.iocoder.dashboard.util.date.DateUtils.TIME_ZONE_DEFAULT; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; /** * 阿里短信客户端的实现类 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java index 6319e257b..71652fa22 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java similarity index 81% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java index a2aafb7c0..f96d8ffd3 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.debug; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; import java.util.Objects; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java index 9215959b7..a0c29169d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java +++ b/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; import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.HmacAlgorithm; import cn.hutool.http.HttpUtil; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; @@ -15,8 +15,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.dashboard.util.collection.MapUtils; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.collection.MapUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import java.util.HashMap; import java.util.List; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java index cef38a548..118c5ebe0 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java +++ b/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; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import cn.iocoder.dashboard.common.core.KeyValue; +import cn.iocoder.yudao.common.core.KeyValue; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient; import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.dashboard.util.json.JsonUtils; +import cn.iocoder.yudao.util.json.JsonUtils; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; @@ -28,8 +28,8 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -import static cn.iocoder.dashboard.util.date.DateUtils.TIME_ZONE_DEFAULT; +import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT; /** * 云片短信客户端的实现类 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java index ef980023d..ee733b9d3 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java @@ -1,9 +1,9 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; import static com.yunpian.sdk.constant.Code.*; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java index 66653df56..345ea344c 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.enums; -import cn.iocoder.dashboard.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ErrorCode; /** * 短信框架的错误码枚举 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md diff --git a/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/package-info.java new file mode 100644 index 000000000..3d9e7dedb --- /dev/null +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.test.core; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java similarity index 93% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java index c845216fe..a78cfa7f8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java @@ -1,10 +1,10 @@ -package cn.iocoder.dashboard.util.test; +package cn.iocoder.dashboard.framework.test.core.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.common.exception.ErrorCode; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil; +import cn.iocoder.yudao.common.exception.ErrorCode; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.function.Executable; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java index f5712500a..6f5ed4583 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java @@ -1,8 +1,8 @@ -package cn.iocoder.dashboard.util.test; +package cn.iocoder.dashboard.framework.test.core.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.common.enums.CommonStatusEnum; import uk.co.jemos.podam.api.PodamFactory; import uk.co.jemos.podam.api.PodamFactoryImpl; diff --git a/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java new file mode 100644 index 000000000..fa0221306 --- /dev/null +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java @@ -0,0 +1,4 @@ +/** + * 测试组件，用于单元测试、集成测试等等 + */ +package cn.iocoder.dashboard.framework.test; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java index 2fd5f5113..08b1767ba 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java +++ b/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; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; -import cn.iocoder.dashboard.util.sping.SpringExpressionUtils; +import cn.iocoder.yudao.util.sping.SpringExpressionUtils; import io.opentracing.Span; import io.opentracing.Tracer; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java index 18a80117f..0f529af78 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.validator; -import cn.iocoder.dashboard.common.core.IntArrayValuable; +import cn.iocoder.yudao.common.core.IntArrayValuable; import javax.validation.Constraint; import javax.validation.Payload; @@ -32,4 +32,4 @@ public @interface InEnum { Class[] payload() default {}; -} \ No newline at end of file +} diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java index e18f4cf75..4aaa8f1af 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.validator; -import cn.iocoder.dashboard.common.core.IntArrayValuable; +import cn.iocoder.yudao.common.core.IntArrayValuable; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java index 9aad216f7..5ef746e98 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.web.core.filter; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java similarity index 85% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java index f5f008947..f414ce0db 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java @@ -1,16 +1,16 @@ package cn.iocoder.dashboard.framework.web.core.filter; import cn.hutool.core.util.StrUtil; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; /** * 演示 Filter，禁止用户发起写操作，避免影响测试数据 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java index c5256e7af..ecb82954e 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java @@ -6,8 +6,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HTMLFilter; -import cn.iocoder.dashboard.util.servlet.ServletUtils; -import org.springframework.http.MediaType; +import cn.iocoder.yudao.util.servlet.ServletUtils; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java index faa01c641..c695b01d1 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java +++ b/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; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.dashboard.common.exception.ServiceException; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.exception.ServiceException; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.dashboard.util.json.JsonUtils; -import cn.iocoder.dashboard.util.servlet.ServletUtils; +import cn.iocoder.yudao.util.json.JsonUtils; +import cn.iocoder.yudao.util.servlet.ServletUtils; import io.github.resilience4j.ratelimiter.RequestNotPermitted; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -36,7 +36,7 @@ import javax.validation.ValidationException; import java.util.Date; import java.util.Map; -import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.*; +import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.*; /** * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java index 53b8e84d3..75b9dafd2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.web.core.handler; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java index faacbdb99..e9aee19e6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java +++ b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.web.core.util; -import cn.iocoder.dashboard.common.enums.UserTypeEnum; -import cn.iocoder.dashboard.common.pojo.CommonResult; +import cn.iocoder.yudao.common.enums.UserTypeEnum; +import cn.iocoder.yudao.common.pojo.CommonResult; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md b/yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md similarity index 100% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md rename to yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java similarity index 100% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java similarity index 96% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index 3f407af62..e5c4ca32c 100644 --- a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/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; import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; -import cn.iocoder.dashboard.common.core.KeyValue; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.core.KeyValue; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.dashboard.util.collection.MapUtils; -import cn.iocoder.dashboard.util.date.DateUtils; +import cn.iocoder.yudao.util.collection.MapUtils; +import cn.iocoder.yudao.util.date.DateUtils; import com.aliyuncs.AcsRequest; import com.aliyuncs.IAcsClient; import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; @@ -29,8 +29,8 @@ import java.util.List; import java.util.function.Function; import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; -import static cn.iocoder.dashboard.util.json.JsonUtils.toJsonString; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.util.json.JsonUtils.toJsonString; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java similarity index 95% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index 42c98716b..c1cc02808 100644 --- a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,12 +1,12 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * {@link AliyunSmsCodeMapping} 的单元测试 diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java similarity index 97% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index d6b412daf..a27e906fc 100644 --- a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/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; import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; -import cn.iocoder.dashboard.common.core.KeyValue; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.core.KeyValue; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO; import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO; import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.dashboard.util.date.DateUtils; +import cn.iocoder.yudao.util.date.DateUtils; import com.google.common.collect.Lists; import com.yunpian.sdk.YunpianClient; import com.yunpian.sdk.api.SmsApi; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; -import static cn.iocoder.dashboard.util.test.RandomUtils.*; +import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*; import static com.yunpian.sdk.constant.Code.OK; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java similarity index 97% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java index aaf200d55..2c83d2db0 100644 --- a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java +++ b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; -import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; +import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java diff --git a/yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java b/yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java similarity index 100% rename from yudao-framework/yudao-common/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java rename to yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java