Commit 750ce01ecd29a9bf6cee1e1842515955b97c56e5
1 parent
f281aad6
项目结构调整 x 14 : 将 yudao-spring-boot-starter-mybatis 拆分
Showing
320 changed files
with
758 additions
and
688 deletions
Too many changes.
To preserve performance only 100 of 320 files are displayed.
README.md
yudao-admin-server/pom.xml
| ... | ... | @@ -23,6 +23,12 @@ |
| 23 | 23 | <version>${revision}</version> |
| 24 | 24 | </dependency> |
| 25 | 25 | |
| 26 | + <!-- DB 相关 --> | |
| 27 | + <dependency> | |
| 28 | + <groupId>cn.iocoder.boot</groupId> | |
| 29 | + <artifactId>yudao-spring-boot-starter-mybatis</artifactId> | |
| 30 | + </dependency> | |
| 31 | + | |
| 26 | 32 | <!-- Test 测试相关 --> |
| 27 | 33 | <dependency> |
| 28 | 34 | <groupId>org.springframework.boot</groupId> | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; |
| ... | ... | @@ -21,8 +21,8 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 26 | 26 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 27 | 27 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; |
| 28 | 28 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("参数配置导出 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.config.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("参数配置分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.doc; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.FileUtil; |
| 4 | 4 | import cn.hutool.core.util.IdUtil; |
| 5 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 5 | +import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | |
| 6 | 6 | import cn.smallbun.screw.core.Configuration; |
| 7 | 7 | import cn.smallbun.screw.core.engine.EngineConfig; |
| 8 | 8 | import cn.smallbun.screw.core.engine.EngineFileType; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.file; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.IoUtil; |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.service.file.InfFileService; |
| 11 | -import cn.iocoder.yudao.util.servlet.ServletUtils; | |
| 11 | +import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | |
| 12 | 12 | import io.swagger.annotations.Api; |
| 13 | 13 | import io.swagger.annotations.ApiImplicitParam; |
| 14 | 14 | import io.swagger.annotations.ApiImplicitParams; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; |
| 25 | 25 | import javax.validation.Valid; |
| 26 | 26 | import java.io.IOException; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "文件存储") |
| 31 | 31 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.file.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("文件分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| ... | ... | @@ -27,7 +27,7 @@ import java.util.Collections; |
| 27 | 27 | import java.util.Date; |
| 28 | 28 | import java.util.List; |
| 29 | 29 | |
| 30 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 30 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 31 | 31 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 32 | 32 | |
| 33 | 33 | @Api(tags = "定时任务") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| ... | ... | @@ -28,7 +28,7 @@ import java.io.IOException; |
| 28 | 28 | import java.util.Collection; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 32 | 32 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 33 | 33 | |
| 34 | 34 | @Api(tags = "定时任务日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("定时任务日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | |
| 31 | 31 | @Api(tags = "API 访问日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 31 | 31 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("API 访问日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("API 错误日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.controller.redis; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; |
| 5 | 5 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyRegistry; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO; |
| ... | ... | @@ -20,7 +20,7 @@ import javax.annotation.Resource; |
| 20 | 20 | import java.util.List; |
| 21 | 21 | import java.util.Properties; |
| 22 | 22 | |
| 23 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 23 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 24 | 24 | |
| 25 | 25 | @Api(tags = "Redis 监控") |
| 26 | 26 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 6 | 6 | import org.mapstruct.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableField; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import com.baomidou.mybatisplus.annotation.IdType; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableField; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableId; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandler; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.TableId; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | 8 | import lombok.*; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.UserTypeEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 8 | 8 | import org.apache.ibatis.annotations.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.dal.mysql.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | -import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | -import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 5 | +import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.config.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.file; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 6 | 6 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.file.impl; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.io.FileTypeUtil; |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.file.config.FileProperties; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| ... | ... | @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; |
| 12 | 12 | import javax.annotation.Resource; |
| 13 | 13 | import java.io.ByteArrayInputStream; |
| 14 | 14 | |
| 15 | -import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 15 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 16 | 16 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; |
| 17 | 17 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; |
| 18 | 18 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.service.JobLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.job.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.quartz.core.scheduler.SchedulerManager; |
| 5 | 5 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO; |
| ... | ... | @@ -21,9 +21,9 @@ import javax.annotation.Resource; |
| 21 | 21 | import java.util.Collection; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 24 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 25 | 25 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; |
| 26 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.containsAny; | |
| 26 | +import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.containsAny; | |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * 定时任务 Service 实现类 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| ... | ... | @@ -19,7 +19,7 @@ import java.util.Date; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | import java.util.concurrent.Future; |
| 21 | 21 | |
| 22 | -import static cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil.exception; | |
| 22 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 23 | 23 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; |
| 24 | 24 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; |
| 25 | 25 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; |
| ... | ... | @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; |
| 16 | 16 | import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; |
| 17 | 17 | import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService; |
| 18 | 18 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 19 | -import cn.iocoder.yudao.util.collection.SetUtils; | |
| 19 | +import cn.iocoder.yudao.framework.util.collection.SetUtils; | |
| 20 | 20 | import io.swagger.annotations.Api; |
| 21 | 21 | import io.swagger.annotations.ApiOperation; |
| 22 | 22 | import org.springframework.validation.annotation.Validated; |
| ... | ... | @@ -26,11 +26,11 @@ import javax.annotation.Resource; |
| 26 | 26 | import javax.validation.Valid; |
| 27 | 27 | import java.util.List; |
| 28 | 28 | |
| 29 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 29 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 30 | 30 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 31 | 31 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; |
| 32 | -import static cn.iocoder.yudao.util.servlet.ServletUtils.getClientIP; | |
| 33 | -import static cn.iocoder.yudao.util.servlet.ServletUtils.getUserAgent; | |
| 32 | +import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP; | |
| 33 | +import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getUserAgent; | |
| 34 | 34 | |
| 35 | 35 | @Api(tags = "认证") |
| 36 | 36 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.convert.auth.SysUserSessionConvert; |
| ... | ... | @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 14 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 14 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 15 | 15 | import io.swagger.annotations.Api; |
| 16 | 16 | import io.swagger.annotations.ApiImplicitParam; |
| 17 | 17 | import io.swagger.annotations.ApiOperation; |
| ... | ... | @@ -24,8 +24,8 @@ import java.util.ArrayList; |
| 24 | 24 | import java.util.List; |
| 25 | 25 | import java.util.Map; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | -import static cn.iocoder.yudao.util.collection.CollectionUtils.convertList; | |
| 27 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.util.collection.CollectionUtils.convertList; | |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "用户 Session") |
| 31 | 31 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.AllArgsConstructor; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.auth.vo.session; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.common; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; |
| 6 | 6 | import io.swagger.annotations.Api; |
| ... | ... | @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; |
| 11 | 11 | |
| 12 | 12 | import javax.annotation.Resource; |
| 13 | 13 | |
| 14 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 14 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 15 | 15 | |
| 16 | 16 | @Api(tags = "验证码") |
| 17 | 17 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.Valid; |
| 18 | 18 | import java.util.Comparator; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "部门") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| ... | ... | @@ -24,7 +24,7 @@ import java.util.Collections; |
| 24 | 24 | import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 28 | 28 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "岗位") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "字典数据") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "字典类型") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("字典类型分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | import javax.validation.constraints.Size; |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("字典类型分页列表 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.errorcode; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api(tags = "错误码") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("错误码分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| ... | ... | @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 16 | -import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 18 | 18 | import io.swagger.annotations.Api; |
| 19 | 19 | import io.swagger.annotations.ApiOperation; |
| 20 | 20 | import org.springframework.security.access.prepost.PreAuthorize; |
| ... | ... | @@ -32,7 +32,7 @@ import java.util.Collection; |
| 32 | 32 | import java.util.List; |
| 33 | 33 | import java.util.Map; |
| 34 | 34 | |
| 35 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 35 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 36 | 36 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 37 | 37 | |
| 38 | 38 | @Api(tags = "操作日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("登陆日志分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel("登陆日志分页列表 Request VO") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("操作日志分页列表 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 8 | 8 | |
| 9 | 9 | import java.util.Date; |
| 10 | 10 | |
| 11 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | 12 | |
| 13 | 13 | @ApiModel("操作日志分页列表 Request VO") |
| 14 | 14 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.notice; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO; |
| ... | ... | @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; |
| 18 | 18 | import javax.annotation.Resource; |
| 19 | 19 | import javax.validation.Valid; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "通知公告") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.notice.vo; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.Valid; |
| 18 | 18 | import java.util.Comparator; |
| 19 | 19 | import java.util.List; |
| 20 | 20 | |
| 21 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 21 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 22 | 22 | |
| 23 | 23 | @Api(tags = "菜单") |
| 24 | 24 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleDataScopeReqVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignRoleMenuReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.permission.SysPermissionAssignUserRoleReqVO; |
| ... | ... | @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; |
| 14 | 14 | import javax.annotation.Resource; |
| 15 | 15 | import java.util.Set; |
| 16 | 16 | |
| 17 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 17 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * 权限 Controller，提供赋予用户、角色的权限的 API 接口 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 4 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | 7 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; |
| ... | ... | @@ -24,7 +24,7 @@ import java.util.Collections; |
| 24 | 24 | import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 27 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 28 | 28 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "角色") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel("角色分页 Request VO") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel("角色分页 Request VO") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java
| ... | ... | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.URLUtil; |
| 4 | 4 | import cn.hutool.extra.servlet.ServletUtil; |
| 5 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; |
| ... | ... | @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; |
| 17 | 17 | import javax.annotation.Resource; |
| 18 | 18 | import javax.servlet.http.HttpServletRequest; |
| 19 | 19 | |
| 20 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 21 | 21 | |
| 22 | 22 | @Api(tags = "短信回调") |
| 23 | 23 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsChannelConvert; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO; |
| ... | ... | @@ -17,7 +17,7 @@ import javax.validation.Valid; |
| 17 | 17 | import java.util.Comparator; |
| 18 | 18 | import java.util.List; |
| 19 | 19 | |
| 20 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 20 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 21 | 21 | |
| 22 | 22 | @Api(tags = "短信渠道") |
| 23 | 23 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 28 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 29 | 29 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | |
| 31 | 31 | @Api(tags = "短信日志") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | 6 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; |
| ... | ... | @@ -21,7 +21,7 @@ import javax.validation.Valid; |
| 21 | 21 | import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 24 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 25 | 25 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | |
| 27 | 27 | @Api("短信模板") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.channel; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信渠道分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "短信日志 Excel 导出 Request VO", description = "参数和 SysSmsLogPageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信日志分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java
| ... | ... | @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 7 | 7 | |
| 8 | 8 | import java.util.Date; |
| 9 | 9 | |
| 10 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 11 | 11 | |
| 12 | 12 | @ApiModel(value = "短信模板 Excel 导出 Request VO", description = "参数和 SysSmsTemplatePageReqVO 是一致的") |
| 13 | 13 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.Data; |
| ... | ... | @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 10 | 10 | |
| 11 | 11 | import java.util.Date; |
| 12 | 12 | |
| 13 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | 14 | |
| 15 | 15 | @ApiModel("短信模板分页 Request VO") |
| 16 | 16 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.yudao.common.enums.CommonStatusEnum; | |
| 5 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 6 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 6 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 7 | 7 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 8 | 8 | import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; |
| ... | ... | @@ -13,8 +13,8 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 13 | 13 | import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; |
| 14 | 14 | import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService; |
| 15 | 15 | import cn.iocoder.dashboard.modules.system.service.user.SysUserService; |
| 16 | -import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 17 | -import cn.iocoder.yudao.util.collection.MapUtils; | |
| 16 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 17 | +import cn.iocoder.yudao.framework.util.collection.MapUtils; | |
| 18 | 18 | import io.swagger.annotations.Api; |
| 19 | 19 | import io.swagger.annotations.ApiImplicitParam; |
| 20 | 20 | import io.swagger.annotations.ApiImplicitParams; |
| ... | ... | @@ -30,7 +30,7 @@ import javax.validation.Valid; |
| 30 | 30 | import java.io.IOException; |
| 31 | 31 | import java.util.*; |
| 32 | 32 | |
| 33 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 33 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 34 | 34 | import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 35 | 35 | |
| 36 | 36 | @Api(tags = "用户") | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil; | |
| 5 | -import cn.iocoder.yudao.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileRespVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; |
| ... | ... | @@ -28,7 +28,7 @@ import javax.validation.Valid; |
| 28 | 28 | import java.io.IOException; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | -import static cn.iocoder.yudao.common.pojo.CommonResult.success; | |
| 31 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 32 | 32 | import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 33 | 33 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_IS_EMPTY; |
| 34 | 34 | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java
| ... | ... | @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 9 | 9 | |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | |
| 12 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 12 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 13 | 13 | |
| 14 | 14 | @ApiModel(value = "用户导出 Request VO", description = "参数和 SysUserPageReqVO 是一致的") |
| 15 | 15 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.controller.user.vo.user; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageParam; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 4 | 4 | import io.swagger.annotations.ApiModel; |
| 5 | 5 | import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 | import lombok.AllArgsConstructor; |
| ... | ... | @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; |
| 11 | 11 | |
| 12 | 12 | import java.util.Date; |
| 13 | 13 | |
| 14 | -import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 14 | +import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 15 | 15 | |
| 16 | 16 | @ApiModel("用户分页 Request VO") |
| 17 | 17 | @Data | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
| ... | ... | @@ -9,7 +9,7 @@ import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum; |
| 12 | -import cn.iocoder.yudao.util.collection.CollectionUtils; | |
| 12 | +import cn.iocoder.yudao.framework.util.collection.CollectionUtils; | |
| 13 | 13 | import org.mapstruct.Mapper; |
| 14 | 14 | import org.mapstruct.Mapping; |
| 15 | 15 | import org.mapstruct.factory.Mappers; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dept; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; |
| 6 | 6 | import org.mapstruct.Mapper; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.convert.dict; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.common.pojo.PageResult; | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | 4 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| 6 | 6 | import org.mapstruct.Mapper; | ... | ... |