Commit 20066bc864b32d1a21c492d0f05abd644e13e9eb
1 parent
750ce01e
项目结构调整 x 15 : 将 web、security、operatelog 等组件拆分出去
Showing
149 changed files
with
569 additions
and
307 deletions
Too many changes.
To preserve performance only 100 of 149 files are displayed.
yudao-admin-server/pom.xml
| @@ -23,6 +23,17 @@ | @@ -23,6 +23,17 @@ | ||
| 23 | <version>${revision}</version> | 23 | <version>${revision}</version> |
| 24 | </dependency> | 24 | </dependency> |
| 25 | 25 | ||
| 26 | + <!-- Web 相关 --> | ||
| 27 | + <dependency> | ||
| 28 | + <groupId>cn.iocoder.boot</groupId> | ||
| 29 | + <artifactId>yudao-spring-boot-starter-web</artifactId> | ||
| 30 | + </dependency> | ||
| 31 | + | ||
| 32 | + <dependency> | ||
| 33 | + <groupId>cn.iocoder.boot</groupId> | ||
| 34 | + <artifactId>yudao-spring-boot-starter-security</artifactId> | ||
| 35 | + </dependency> | ||
| 36 | + | ||
| 26 | <!-- DB 相关 --> | 37 | <!-- DB 相关 --> |
| 27 | <dependency> | 38 | <dependency> |
| 28 | <groupId>cn.iocoder.boot</groupId> | 39 | <groupId>cn.iocoder.boot</groupId> |
| @@ -53,6 +64,13 @@ | @@ -53,6 +64,13 @@ | ||
| 53 | <artifactId>podam</artifactId> | 64 | <artifactId>podam</artifactId> |
| 54 | <scope>test</scope> | 65 | <scope>test</scope> |
| 55 | </dependency> | 66 | </dependency> |
| 67 | + | ||
| 68 | + <!-- 工具类相关 --> | ||
| 69 | + <dependency> | ||
| 70 | + <groupId>cn.iocoder.boot</groupId> | ||
| 71 | + <artifactId>yudao-spring-boot-starter-operatelog</artifactId> | ||
| 72 | + </dependency> | ||
| 73 | + | ||
| 56 | </dependencies> | 74 | </dependencies> |
| 57 | 75 | ||
| 58 | <build> | 76 | <build> |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; |
| 8 | import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert; | 8 | import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert; |
| 9 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; | 9 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; |
| @@ -23,7 +23,7 @@ import java.util.List; | @@ -23,7 +23,7 @@ import java.util.List; | ||
| 23 | 23 | ||
| 24 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 24 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 25 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 25 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 26 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 26 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 27 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; | 27 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; |
| 28 | 28 | ||
| 29 | @Api(tags = "参数配置") | 29 | @Api(tags = "参数配置") |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; | 7 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*; | 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*; |
| 9 | import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert; | 9 | import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert; |
| @@ -28,7 +28,7 @@ import java.util.Date; | @@ -28,7 +28,7 @@ import java.util.Date; | ||
| 28 | import java.util.List; | 28 | import java.util.List; |
| 29 | 29 | ||
| 30 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 30 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 31 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 31 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 32 | 32 | ||
| 33 | @Api(tags = "定时任务") | 33 | @Api(tags = "定时任务") |
| 34 | @RestController | 34 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| @@ -29,7 +29,7 @@ import java.util.Collection; | @@ -29,7 +29,7 @@ import java.util.Collection; | ||
| 29 | import java.util.List; | 29 | import java.util.List; |
| 30 | 30 | ||
| 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 32 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 32 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 33 | 33 | ||
| 34 | @Api(tags = "定时任务日志") | 34 | @Api(tags = "定时任务日志") |
| 35 | @RestController | 35 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| @@ -26,7 +26,7 @@ import java.io.IOException; | @@ -26,7 +26,7 @@ import java.io.IOException; | ||
| 26 | import java.util.List; | 26 | import java.util.List; |
| 27 | 27 | ||
| 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 29 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | ||
| 31 | @Api(tags = "API 访问日志") | 31 | @Api(tags = "API 访问日志") |
| 32 | @RestController | 32 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.controller.logger; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| @@ -26,8 +26,8 @@ import java.io.IOException; | @@ -26,8 +26,8 @@ import java.io.IOException; | ||
| 26 | import java.util.List; | 26 | import java.util.List; |
| 27 | 27 | ||
| 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 29 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | ||
| 30 | -import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | ||
| 31 | 31 | ||
| 32 | @Api(tags = "API 错误日志") | 32 | @Api(tags = "API 错误日志") |
| 33 | @RestController | 33 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java
| 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java
| 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/framework/file/config/FileConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.file.config; | 1 | +package cn.iocoder.dashboard.modules.infra.framework.file.config; |
| 2 | 2 | ||
| 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 4 | import org.springframework.context.annotation.Configuration; | 4 | import org.springframework.context.annotation.Configuration; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/framework/file/config/FileProperties.java
| 1 | -package cn.iocoder.dashboard.framework.file.config; | 1 | +package cn.iocoder.dashboard.modules.infra.framework.file.config; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/framework/file/package-info.java
| @@ -13,4 +13,4 @@ | @@ -13,4 +13,4 @@ | ||
| 13 | * 综合考虑,暂时使用方案 3 的方式,比较适合这样一个 all in one 的项目。 | 13 | * 综合考虑,暂时使用方案 3 的方式,比较适合这样一个 all in one 的项目。 |
| 14 | * 随着文件的量级大了之后,还是推荐采用云服务。 | 14 | * 随着文件的量级大了之后,还是推荐采用云服务。 |
| 15 | */ | 15 | */ |
| 16 | -package cn.iocoder.dashboard.framework.file; | 16 | +package cn.iocoder.dashboard.modules.infra.framework.file; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/framework/package-info.java
0 → 100644
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.service.file.impl; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.service.file.impl; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.io.FileTypeUtil; | 3 | import cn.hutool.core.io.FileTypeUtil; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.dashboard.framework.file.config.FileProperties; | 5 | +import cn.iocoder.dashboard.modules.infra.framework.file.config.FileProperties; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 8 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; | 8 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java
| 1 | package cn.iocoder.dashboard.modules.infra.service.logger; | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java
| 1 | package cn.iocoder.dashboard.modules.infra.service.logger; | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java
| 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiAccessLogConvert; | 7 | import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiAccessLogConvert; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java
| 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; | 4 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiErrorLogConvert; | 7 | import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiErrorLogConvert; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.auth; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.auth; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 5 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; |
| @@ -27,8 +27,8 @@ import javax.validation.Valid; | @@ -27,8 +27,8 @@ import javax.validation.Valid; | ||
| 27 | import java.util.List; | 27 | import java.util.List; |
| 28 | 28 | ||
| 29 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 29 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 30 | -import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | ||
| 31 | -import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; | 30 | +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 31 | +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; | ||
| 32 | import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP; | 32 | import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP; |
| 33 | import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getUserAgent; | 33 | import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getUserAgent; |
| 34 | 34 |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
| @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 7 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| 9 | import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert; | 9 | import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert; |
| 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; |
| @@ -25,7 +25,7 @@ import java.util.Comparator; | @@ -25,7 +25,7 @@ import java.util.Comparator; | ||
| 25 | import java.util.List; | 25 | import java.util.List; |
| 26 | 26 | ||
| 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 28 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 28 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | ||
| 30 | @Api(tags = "岗位") | 30 | @Api(tags = "岗位") |
| 31 | @RestController | 31 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert; | 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; |
| @@ -22,7 +22,7 @@ import java.io.IOException; | @@ -22,7 +22,7 @@ import java.io.IOException; | ||
| 22 | import java.util.List; | 22 | import java.util.List; |
| 23 | 23 | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | @Api(tags = "字典数据") | 27 | @Api(tags = "字典数据") |
| 28 | @RestController | 28 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.dict; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert; | 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| @@ -22,7 +22,7 @@ import java.io.IOException; | @@ -22,7 +22,7 @@ import java.io.IOException; | ||
| 22 | import java.util.List; | 22 | import java.util.List; |
| 23 | 23 | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | @Api(tags = "字典类型") | 27 | @Api(tags = "字典类型") |
| 28 | @RestController | 28 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.*; | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.*; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO; | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO; |
| @@ -22,7 +22,7 @@ import java.io.IOException; | @@ -22,7 +22,7 @@ import java.io.IOException; | ||
| 22 | import java.util.List; | 22 | import java.util.List; |
| 23 | 23 | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | @Api(tags = "错误码") | 27 | @Api(tags = "错误码") |
| 28 | @RestController | 28 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; |
| @@ -25,7 +25,7 @@ import javax.validation.Valid; | @@ -25,7 +25,7 @@ import javax.validation.Valid; | ||
| 25 | import java.io.IOException; | 25 | import java.io.IOException; |
| 26 | import java.util.List; | 26 | import java.util.List; |
| 27 | 27 | ||
| 28 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 28 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | ||
| 30 | @Api(tags = "登陆日志") | 30 | @Api(tags = "登陆日志") |
| 31 | @RestController | 31 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| @@ -33,7 +33,7 @@ import java.util.List; | @@ -33,7 +33,7 @@ import java.util.List; | ||
| 33 | import java.util.Map; | 33 | import java.util.Map; |
| 34 | 34 | ||
| 35 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 35 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 36 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 36 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 37 | 37 | ||
| 38 | @Api(tags = "操作日志") | 38 | @Api(tags = "操作日志") |
| 39 | @RestController | 39 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
| @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 7 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; |
| 9 | import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert; | 9 | import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert; |
| 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; |
| @@ -25,7 +25,7 @@ import java.util.Comparator; | @@ -25,7 +25,7 @@ import java.util.Comparator; | ||
| 25 | import java.util.List; | 25 | import java.util.List; |
| 26 | 26 | ||
| 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 28 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 28 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | ||
| 30 | @Api(tags = "角色") | 30 | @Api(tags = "角色") |
| 31 | @RestController | 31 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | ||
| 3 | import cn.hutool.core.util.URLUtil; | 3 | import cn.hutool.core.util.URLUtil; |
| 4 | import cn.hutool.extra.servlet.ServletUtil; | 4 | import cn.hutool.extra.servlet.ServletUtil; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; | 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 8 | import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; | 8 | import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; |
| 9 | import io.swagger.annotations.Api; | 9 | import io.swagger.annotations.Api; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| @@ -26,7 +26,7 @@ import java.io.IOException; | @@ -26,7 +26,7 @@ import java.io.IOException; | ||
| 26 | import java.util.List; | 26 | import java.util.List; |
| 27 | 27 | ||
| 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 29 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | ||
| 31 | @Api(tags = "短信日志") | 31 | @Api(tags = "短信日志") |
| 32 | @RestController | 32 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms; | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; |
| 8 | import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsTemplateConvert; | 8 | import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsTemplateConvert; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; |
| @@ -22,7 +22,7 @@ import java.io.IOException; | @@ -22,7 +22,7 @@ import java.io.IOException; | ||
| 22 | import java.util.List; | 22 | import java.util.List; |
| 23 | 23 | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | @Api("短信模板") | 27 | @Api("短信模板") |
| 28 | @RestController | 28 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
| @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 7 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 8 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 8 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; | 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; |
| 10 | import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert; | 10 | import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert; |
| 11 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; | 11 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| @@ -31,7 +31,7 @@ import java.io.IOException; | @@ -31,7 +31,7 @@ import java.io.IOException; | ||
| 31 | import java.util.*; | 31 | import java.util.*; |
| 32 | 32 | ||
| 33 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 33 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 34 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 34 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 35 | 35 | ||
| 36 | @Api(tags = "用户") | 36 | @Api(tags = "用户") |
| 37 | @RestController | 37 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java
| @@ -29,7 +29,7 @@ import java.io.IOException; | @@ -29,7 +29,7 @@ import java.io.IOException; | ||
| 29 | import java.util.List; | 29 | import java.util.List; |
| 30 | 30 | ||
| 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 31 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 32 | -import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 32 | +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 33 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_IS_EMPTY; | 33 | import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_IS_EMPTY; |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
| 1 | package cn.iocoder.dashboard.modules.system.convert.auth; | 1 | package cn.iocoder.dashboard.modules.system.convert.auth; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 3 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 4 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; | 4 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java
| 1 | package cn.iocoder.dashboard.modules.system.convert.errorcode; | 1 | package cn.iocoder.dashboard.modules.system.convert.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 5 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; | 4 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 5 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExcelVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExcelVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeRespVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeRespVO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java
| 1 | package cn.iocoder.dashboard.modules.system.convert.logger; | 1 | package cn.iocoder.dashboard.modules.system.convert.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; | 4 | +import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; |
| 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java
| 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.auth; | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 4 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 6 | import com.baomidou.mybatisplus.annotation.IdType; | 6 | import com.baomidou.mybatisplus.annotation.IdType; |
| 7 | import com.baomidou.mybatisplus.annotation.TableId; | 7 | import com.baomidou.mybatisplus.annotation.TableId; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java
| 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; | 4 | +import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; |
| 5 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 5 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 7 | import com.baomidou.mybatisplus.annotation.TableField; | 7 | import com.baomidou.mybatisplus.annotation.TableField; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.dal.dataobject.permission; | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 4 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 5 | import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; | 5 | import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; |
| 6 | -import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; | 6 | +import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum; |
| 7 | import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum; | 7 | import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum; |
| 8 | import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; | 8 | import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; |
| 9 | import com.baomidou.mybatisplus.annotation.TableField; | 9 | import com.baomidou.mybatisplus.annotation.TableField; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java
| 1 | package cn.iocoder.dashboard.modules.system.dal.redis; | 1 | package cn.iocoder.dashboard.modules.system.dal.redis; |
| 2 | 2 | ||
| 3 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; | 3 | import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine; |
| 4 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | ||
| 5 | - | ||
| 6 | -import java.time.Duration; | 4 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 7 | 5 | ||
| 8 | import static cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; | 6 | import static cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; |
| 9 | 7 |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java
| 1 | package cn.iocoder.dashboard.modules.system.dal.redis.auth; | 1 | package cn.iocoder.dashboard.modules.system.dal.redis.auth; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 3 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 4 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; | 4 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; |
| 5 | import cn.iocoder.yudao.framework.util.json.JsonUtils; | 5 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 6 | import org.springframework.data.redis.core.StringRedisTemplate; | 6 | import org.springframework.data.redis.core.StringRedisTemplate; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/captcha/config/CaptchaConfig.java
| 1 | -package cn.iocoder.dashboard.framework.captcha.config; | 1 | +package cn.iocoder.dashboard.modules.system.framework.captcha.config; |
| 2 | 2 | ||
| 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 4 | import org.springframework.context.annotation.Configuration; | 4 | import org.springframework.context.annotation.Configuration; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/captcha/config/CaptchaProperties.java
| 1 | -package cn.iocoder.dashboard.framework.captcha.config; | 1 | +package cn.iocoder.dashboard.modules.system.framework.captcha.config; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/captcha/package-info.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/codegen/config/CodegenConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.codegen.config; | 1 | +package cn.iocoder.dashboard.modules.system.framework.codegen.config; |
| 2 | 2 | ||
| 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 3 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 4 | import org.springframework.context.annotation.Configuration; | 4 | import org.springframework.context.annotation.Configuration; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/codegen/config/CodegenProperties.java
| 1 | -package cn.iocoder.dashboard.framework.codegen.config; | 1 | +package cn.iocoder.dashboard.modules.system.framework.codegen.config; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/codegen/package-info.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/framework/package-info.java
0 → 100644
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java
| 1 | package cn.iocoder.dashboard.modules.system.service.auth; | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; | 3 | +import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; |
| 4 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; | 4 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java
| 1 | package cn.iocoder.dashboard.modules.system.service.auth; | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 4 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; |
| 7 | 7 |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
| @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl; | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.auth.impl; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | 4 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; |
| 5 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | ||
| 6 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | 5 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 6 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | ||
| 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert; | 9 | import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java
| @@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil; | @@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil; | ||
| 4 | import cn.hutool.core.util.IdUtil; | 4 | import cn.hutool.core.util.IdUtil; |
| 5 | import cn.hutool.core.util.StrUtil; | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | -import cn.iocoder.dashboard.framework.security.config.SecurityProperties; | ||
| 8 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | ||
| 9 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | 7 | +import cn.iocoder.yudao.framework.security.config.SecurityProperties; |
| 8 | +import cn.iocoder.yudao.framework.security.core.LoginUser; | ||
| 9 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | ||
| 10 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; | 10 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; | 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 12 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; | 12 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.common.impl; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.common.impl; | ||
| 3 | import cn.hutool.captcha.CaptchaUtil; | 3 | import cn.hutool.captcha.CaptchaUtil; |
| 4 | import cn.hutool.captcha.CircleCaptcha; | 4 | import cn.hutool.captcha.CircleCaptcha; |
| 5 | import cn.hutool.core.util.IdUtil; | 5 | import cn.hutool.core.util.IdUtil; |
| 6 | -import cn.iocoder.dashboard.framework.captcha.config.CaptchaProperties; | 6 | +import cn.iocoder.dashboard.modules.system.framework.captcha.config.CaptchaProperties; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 8 | import cn.iocoder.dashboard.modules.system.convert.common.SysCaptchaConvert; | 8 | import cn.iocoder.dashboard.modules.system.convert.common.SysCaptchaConvert; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.redis.common.SysCaptchaRedisDAO; | 9 | import cn.iocoder.dashboard.modules.system.dal.redis.common.SysCaptchaRedisDAO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java
| 1 | package cn.iocoder.dashboard.modules.system.service.errorcode; | 1 | package cn.iocoder.dashboard.modules.system.service.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; | 4 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodePageReqVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodePageReqVO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java
| @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.errorcode.impl; | @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.errorcode.impl; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 6 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; | 5 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 6 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java
| 1 | package cn.iocoder.dashboard.modules.system.service.logger; | 1 | package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; | 4 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger.impl; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger.impl; | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; | 6 | +import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert; | 9 | import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
| 1 | package cn.iocoder.dashboard.modules.system.service.permission; | 1 | package cn.iocoder.dashboard.modules.system.service.permission; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.security.core.service.SecurityPermissionFrameworkService; | 3 | +import cn.iocoder.yudao.framework.security.core.service.SecurityPermissionFrameworkService; |
| 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 5 | import org.springframework.lang.Nullable; | 5 | import org.springframework.lang.Nullable; |
| 6 | 6 |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl; | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.collection.CollectionUtil; | 4 | import cn.hutool.core.collection.CollectionUtil; |
| 5 | import cn.hutool.core.util.ArrayUtil; | 5 | import cn.hutool.core.util.ArrayUtil; |
| 6 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | 6 | +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 7 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMenuMapper; | 7 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMenuMapper; |
| 8 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysUserRoleMapper; | 8 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysUserRoleMapper; |
| 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
| @@ -4,7 +4,7 @@ import cn.hutool.core.thread.ThreadUtil; | @@ -4,7 +4,7 @@ import cn.hutool.core.thread.ThreadUtil; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 7 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 7 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; | 8 | import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; |
| 9 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.*; | 9 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.*; |
| 10 | import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert; | 10 | import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert; |
| @@ -26,7 +26,7 @@ import java.util.List; | @@ -26,7 +26,7 @@ import java.util.List; | ||
| 26 | import java.util.concurrent.TimeUnit; | 26 | import java.util.concurrent.TimeUnit; |
| 27 | 27 | ||
| 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 29 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | 29 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 30 | 30 | ||
| 31 | @Api(tags = "测试示例") | 31 | @Api(tags = "测试示例") |
| 32 | @RestController | 32 | @RestController |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java
| @@ -38,7 +38,7 @@ public class ToolTestDemoDO extends BaseDO { | @@ -38,7 +38,7 @@ public class ToolTestDemoDO extends BaseDO { | ||
| 38 | /** | 38 | /** |
| 39 | * 类型 | 39 | * 类型 |
| 40 | * | 40 | * |
| 41 | - * 枚举 {@link cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum} | 41 | + * 枚举 {@link cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum} |
| 42 | */ | 42 | */ |
| 43 | private Integer type; | 43 | private Integer type; |
| 44 | /** | 44 | /** |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/config/ErrorCodeConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.config; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.config; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.errorcode.core.generator.ErrorCodeAutoGenerator; | ||
| 4 | -import cn.iocoder.dashboard.framework.errorcode.core.loader.ErrorCodeLoader; | ||
| 5 | -import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 6 | -import cn.iocoder.dashboard.framework.errorcode.core.loader.ErrorCodeLoaderImpl; | ||
| 7 | -import cn.iocoder.dashboard.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; | 3 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGenerator; |
| 4 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader.ErrorCodeLoader; | ||
| 5 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 6 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader.ErrorCodeLoaderImpl; | ||
| 7 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; | ||
| 8 | import org.springframework.beans.factory.annotation.Value; | 8 | import org.springframework.beans.factory.annotation.Value; |
| 9 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 9 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 10 | import org.springframework.context.annotation.Bean; | 10 | import org.springframework.context.annotation.Bean; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/config/ErrorCodeProperties.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.config; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.config; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/dto/ErrorCodeRespDTO.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.core.generator; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.generator; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.util.ClassUtil; | 4 | import cn.hutool.core.util.ClassUtil; |
| 5 | import cn.hutool.core.util.ReflectUtil; | 5 | import cn.hutool.core.util.ReflectUtil; |
| 6 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; | 6 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; |
| 7 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 8 | -import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; | 7 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 8 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 9 | import lombok.RequiredArgsConstructor; | 9 | import lombok.RequiredArgsConstructor; |
| 10 | import lombok.extern.slf4j.Slf4j; | 10 | import lombok.extern.slf4j.Slf4j; |
| 11 | import org.springframework.boot.context.event.ApplicationReadyEvent; | 11 | import org.springframework.boot.context.event.ApplicationReadyEvent; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/loader/ErrorCodeLoader.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.core.loader; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; |
| 4 | 4 |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.core.loader; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.loader; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 5 | -import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService; | 4 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO; |
| 5 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 6 | import cn.iocoder.yudao.framework.util.date.DateUtils; | 6 | import cn.iocoder.yudao.framework.util.date.DateUtils; |
| 7 | import lombok.RequiredArgsConstructor; | 7 | import lombok.RequiredArgsConstructor; |
| 8 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/core/service/ErrorCodeFrameworkService.java
| 1 | -package cn.iocoder.dashboard.framework.errorcode.core.service; | 1 | +package cn.iocoder.dashboard.modules.tool.framework.errorcode.core.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 4 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO; | 3 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 4 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 5 | 5 | ||
| 6 | import javax.validation.Valid; | 6 | import javax.validation.Valid; |
| 7 | import java.util.Date; | 7 | import java.util.Date; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java renamed to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/errorcode/package-info.java
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/framework/package-info.java
0 → 100644
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
| @@ -9,12 +9,12 @@ import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | @@ -9,12 +9,12 @@ import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | ||
| 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 10 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 10 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 11 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 11 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 12 | -import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; | 12 | +import cn.iocoder.dashboard.modules.system.framework.codegen.config.CodegenProperties; |
| 13 | import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; | 13 | import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; |
| 14 | import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; | 14 | import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; |
| 15 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; | 15 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 16 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | ||
| 17 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; | 16 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 17 | +import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; | ||
| 18 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 18 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 19 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | 19 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| 20 | import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; | 20 | import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.tool.service.codegen.impl; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.tool.service.codegen.impl; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.dashboard.framework.codegen.config.CodegenProperties; | 5 | +import cn.iocoder.dashboard.modules.system.framework.codegen.config.CodegenProperties; |
| 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; |
| 7 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; | 7 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; |
| 8 | import cn.iocoder.dashboard.modules.tool.convert.codegen.ToolCodegenConvert; | 8 | import cn.iocoder.dashboard.modules.tool.convert.codegen.ToolCodegenConvert; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.service.file; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.infra.service.file; | ||
| 3 | import cn.hutool.core.io.resource.ResourceUtil; | 3 | import cn.hutool.core.io.resource.ResourceUtil; |
| 4 | import cn.iocoder.dashboard.BaseDbUnitTest; | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | -import cn.iocoder.dashboard.framework.file.config.FileProperties; | 6 | +import cn.iocoder.dashboard.modules.infra.framework.file.config.FileProperties; |
| 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; | 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 9 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; | 9 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java
| @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.BaseDbUnitTest; | @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.BaseDbUnitTest; | ||
| 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; | 8 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; |
| 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 10 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; | 10 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 11 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | 11 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java
| @@ -4,7 +4,7 @@ import cn.hutool.core.util.RandomUtil; | @@ -4,7 +4,7 @@ import cn.hutool.core.util.RandomUtil; | ||
| 4 | import cn.iocoder.dashboard.BaseDbUnitTest; | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; | 7 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; |
| 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 10 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; | 10 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.auth; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.auth; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.dashboard.BaseDbUnitTest; | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 5 | +import cn.iocoder.yudao.framework.security.core.LoginUser; |
| 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 8 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; | 8 | import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java
| @@ -29,8 +29,8 @@ import cn.hutool.core.date.DateUtil; | @@ -29,8 +29,8 @@ import cn.hutool.core.date.DateUtil; | ||
| 29 | import cn.iocoder.dashboard.BaseDbAndRedisUnitTest; | 29 | import cn.iocoder.dashboard.BaseDbAndRedisUnitTest; |
| 30 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 30 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 31 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 31 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 32 | -import cn.iocoder.dashboard.framework.security.config.SecurityProperties; | ||
| 33 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | 32 | +import cn.iocoder.yudao.framework.security.config.SecurityProperties; |
| 33 | +import cn.iocoder.yudao.framework.security.core.LoginUser; | ||
| 34 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; | 34 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 35 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; | 35 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; |
| 36 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; | 36 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java
| 1 | package cn.iocoder.dashboard.modules.system.service.common; | 1 | package cn.iocoder.dashboard.modules.system.service.common; |
| 2 | 2 | ||
| 3 | import cn.iocoder.dashboard.BaseRedisUnitTest; | 3 | import cn.iocoder.dashboard.BaseRedisUnitTest; |
| 4 | -import cn.iocoder.dashboard.framework.captcha.config.CaptchaProperties; | 4 | +import cn.iocoder.dashboard.modules.system.framework.captcha.config.CaptchaProperties; |
| 5 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; | 5 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 6 | import cn.iocoder.dashboard.modules.system.dal.redis.common.SysCaptchaRedisDAO; | 6 | import cn.iocoder.dashboard.modules.system.dal.redis.common.SysCaptchaRedisDAO; |
| 7 | import cn.iocoder.dashboard.modules.system.service.common.impl.SysCaptchaServiceImpl; | 7 | import cn.iocoder.dashboard.modules.system.service.common.impl.SysCaptchaServiceImpl; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.errorcode; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.service.errorcode; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.dashboard.BaseDbUnitTest; | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | 5 | +import cn.iocoder.dashboard.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; |
| 6 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; | 6 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java
| @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger; | @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger; | ||
| 3 | import cn.hutool.core.util.RandomUtil; | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | import cn.iocoder.dashboard.BaseDbUnitTest; | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | 6 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; |
| 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java
| @@ -5,9 +5,9 @@ import cn.iocoder.dashboard.BaseDbUnitTest; | @@ -5,9 +5,9 @@ import cn.iocoder.dashboard.BaseDbUnitTest; | ||
| 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; | ||
| 9 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | ||
| 10 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; | 8 | +import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; |
| 9 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | ||
| 10 | +import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 12 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | 12 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 13 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; | 13 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; |
yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java
| @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; | @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; | ||
| 4 | import cn.iocoder.dashboard.BaseDbUnitTest; | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | -import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; | 7 | +import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum; |
| 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; |
| 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; | 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; |
| 10 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; | 10 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; |
yudao-dependencies/pom.xml
| @@ -80,6 +80,18 @@ | @@ -80,6 +80,18 @@ | ||
| 80 | 80 | ||
| 81 | <!-- Web 相关 --> | 81 | <!-- Web 相关 --> |
| 82 | <dependency> | 82 | <dependency> |
| 83 | + <groupId>cn.iocoder.boot</groupId> | ||
| 84 | + <artifactId>yudao-spring-boot-starter-web</artifactId> | ||
| 85 | + <version>${revision}</version> | ||
| 86 | + </dependency> | ||
| 87 | + | ||
| 88 | + <dependency> | ||
| 89 | + <groupId>cn.iocoder.boot</groupId> | ||
| 90 | + <artifactId>yudao-spring-boot-starter-security</artifactId> | ||
| 91 | + <version>${revision}</version> | ||
| 92 | + </dependency> | ||
| 93 | + | ||
| 94 | + <dependency> | ||
| 83 | <groupId>com.github.xiaoymin</groupId> | 95 | <groupId>com.github.xiaoymin</groupId> |
| 84 | <artifactId>knife4j-spring-boot-starter</artifactId> | 96 | <artifactId>knife4j-spring-boot-starter</artifactId> |
| 85 | <version>${knife4j.version}</version> | 97 | <version>${knife4j.version}</version> |
| @@ -108,7 +120,7 @@ | @@ -108,7 +120,7 @@ | ||
| 108 | <dependency> | 120 | <dependency> |
| 109 | <groupId>cn.iocoder.boot</groupId> | 121 | <groupId>cn.iocoder.boot</groupId> |
| 110 | <artifactId>yudao-spring-boot-starter-mybatis</artifactId> | 122 | <artifactId>yudao-spring-boot-starter-mybatis</artifactId> |
| 111 | - <version>1.0.0</version> | 123 | + <version>${revision}</version> |
| 112 | </dependency> | 124 | </dependency> |
| 113 | 125 | ||
| 114 | <dependency> | 126 | <dependency> |
| @@ -149,6 +161,12 @@ | @@ -149,6 +161,12 @@ | ||
| 149 | 161 | ||
| 150 | <!-- 服务保障相关 --> | 162 | <!-- 服务保障相关 --> |
| 151 | <dependency> | 163 | <dependency> |
| 164 | + <groupId>cn.iocoder.boot</groupId> | ||
| 165 | + <artifactId>yudao-spring-boot-starter-protection</artifactId> | ||
| 166 | + <version>${revision}</version> | ||
| 167 | + </dependency> | ||
| 168 | + | ||
| 169 | + <dependency> | ||
| 152 | <groupId>com.baomidou</groupId> | 170 | <groupId>com.baomidou</groupId> |
| 153 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | 171 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> |
| 154 | <version>${lock4j.version}</version> | 172 | <version>${lock4j.version}</version> |
| @@ -162,12 +180,23 @@ | @@ -162,12 +180,23 @@ | ||
| 162 | 180 | ||
| 163 | <dependency> | 181 | <dependency> |
| 164 | <groupId>io.github.resilience4j</groupId> | 182 | <groupId>io.github.resilience4j</groupId> |
| 183 | + <artifactId>resilience4j-ratelimiter</artifactId> | ||
| 184 | + <version>${resilience4j.version}</version> | ||
| 185 | + </dependency> | ||
| 186 | + <dependency> | ||
| 187 | + <groupId>io.github.resilience4j</groupId> | ||
| 165 | <artifactId>resilience4j-spring-boot2</artifactId> | 188 | <artifactId>resilience4j-spring-boot2</artifactId> |
| 166 | <version>${resilience4j.version}</version> | 189 | <version>${resilience4j.version}</version> |
| 167 | </dependency> | 190 | </dependency> |
| 168 | 191 | ||
| 169 | <!-- 监控相关 --> | 192 | <!-- 监控相关 --> |
| 170 | <dependency> | 193 | <dependency> |
| 194 | + <groupId>cn.iocoder.boot</groupId> | ||
| 195 | + <artifactId>yudao-spring-boot-starter-monitor</artifactId> | ||
| 196 | + <version>${revision}</version> | ||
| 197 | + </dependency> | ||
| 198 | + | ||
| 199 | + <dependency> | ||
| 171 | <groupId>org.apache.skywalking</groupId> | 200 | <groupId>org.apache.skywalking</groupId> |
| 172 | <artifactId>apm-toolkit-trace</artifactId> | 201 | <artifactId>apm-toolkit-trace</artifactId> |
| 173 | <version>${skywalking.version}</version> | 202 | <version>${skywalking.version}</version> |
| @@ -227,6 +256,12 @@ | @@ -227,6 +256,12 @@ | ||
| 227 | </dependency> | 256 | </dependency> |
| 228 | 257 | ||
| 229 | <dependency> | 258 | <dependency> |
| 259 | + <groupId>cn.iocoder.boot</groupId> | ||
| 260 | + <artifactId>yudao-spring-boot-starter-operatelog</artifactId> | ||
| 261 | + <version>${revision}</version> | ||
| 262 | + </dependency> | ||
| 263 | + | ||
| 264 | + <dependency> | ||
| 230 | <groupId>org.projectlombok</groupId> | 265 | <groupId>org.projectlombok</groupId> |
| 231 | <artifactId>lombok</artifactId> | 266 | <artifactId>lombok</artifactId> |
| 232 | <version>${lombok.version}</version> | 267 | <version>${lombok.version}</version> |
yudao-framework/pom.xml
| @@ -13,6 +13,11 @@ | @@ -13,6 +13,11 @@ | ||
| 13 | <module>yudao-common</module> | 13 | <module>yudao-common</module> |
| 14 | <module>yudao-framework-all</module> | 14 | <module>yudao-framework-all</module> |
| 15 | <module>yudao-spring-boot-starter-mybatis</module> | 15 | <module>yudao-spring-boot-starter-mybatis</module> |
| 16 | + <module>yudao-spring-boot-starter-web</module> | ||
| 17 | + <module>yudao-spring-boot-starter-security</module> | ||
| 18 | + <module>yudao-spring-boot-starter-monitor</module> | ||
| 19 | + <module>yudao-spring-boot-starter-protection</module> | ||
| 20 | + <module>yudao-spring-boot-starter-operatelog</module> | ||
| 16 | </modules> | 21 | </modules> |
| 17 | 22 | ||
| 18 | <artifactId>yudao-framework</artifactId> | 23 | <artifactId>yudao-framework</artifactId> |
yudao-framework/yudao-common/pom.xml
| @@ -57,6 +57,12 @@ | @@ -57,6 +57,12 @@ | ||
| 57 | <scope>provided</scope> <!-- 设置为 provided,主要是 PageParam 使用到 --> | 57 | <scope>provided</scope> <!-- 设置为 provided,主要是 PageParam 使用到 --> |
| 58 | </dependency> | 58 | </dependency> |
| 59 | 59 | ||
| 60 | + <!-- 监控相关 --> | ||
| 61 | + <dependency> | ||
| 62 | + <groupId>org.apache.skywalking</groupId> | ||
| 63 | + <artifactId>apm-toolkit-trace</artifactId> | ||
| 64 | + </dependency> | ||
| 65 | + | ||
| 60 | <!-- 工具类相关 --> | 66 | <!-- 工具类相关 --> |
| 61 | <dependency> | 67 | <dependency> |
| 62 | <groupId>org.projectlombok</groupId> | 68 | <groupId>org.projectlombok</groupId> |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.enums; | 1 | +package cn.iocoder.yudao.framework.common.enums; |
| 2 | 2 | ||
| 3 | /** | 3 | /** |
| 4 | - * 过滤器顺序的枚举类,保证过滤器按照符合我们的预期 | 4 | + * Web 过滤器顺序的枚举类,保证过滤器按照符合我们的预期 |
| 5 | + * | ||
| 6 | + * 考虑到每个 starter 都需要用到该工具类,所以放到 common 模块下的 util 包下 | ||
| 5 | * | 7 | * |
| 6 | * @author 芋道源码 | 8 | * @author 芋道源码 |
| 7 | */ | 9 | */ |
| 8 | -public interface FilterOrderEnum { | 10 | +public interface WebFilterOrderEnum { |
| 9 | 11 | ||
| 10 | int CORS_FILTER = Integer.MIN_VALUE; | 12 | int CORS_FILTER = Integer.MIN_VALUE; |
| 11 | 13 |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/monitor/TracerUtils.java
| 1 | -package cn.iocoder.dashboard.framework.tracer.core.util; | 1 | +package cn.iocoder.yudao.framework.util.monitor; |
| 2 | 2 | ||
| 3 | import org.apache.skywalking.apm.toolkit.trace.TraceContext; | 3 | import org.apache.skywalking.apm.toolkit.trace.TraceContext; |
| 4 | 4 | ||
| 5 | /** | 5 | /** |
| 6 | * 链路追踪工具类 | 6 | * 链路追踪工具类 |
| 7 | * | 7 | * |
| 8 | + * 考虑到每个 starter 都需要用到该工具类,所以放到 common 模块下的 util 包下 | ||
| 9 | + * | ||
| 8 | * @author 芋道源码 | 10 | * @author 芋道源码 |
| 9 | */ | 11 | */ |
| 10 | public class TracerUtils { | 12 | public class TracerUtils { |
yudao-framework/yudao-framework-all/pom.xml
| @@ -24,35 +24,7 @@ | @@ -24,35 +24,7 @@ | ||
| 24 | <optional>true</optional> | 24 | <optional>true</optional> |
| 25 | </dependency> | 25 | </dependency> |
| 26 | 26 | ||
| 27 | - <dependency> | ||
| 28 | - <groupId>org.springframework.boot</groupId> | ||
| 29 | - <artifactId>spring-boot-starter-aop</artifactId> | ||
| 30 | - </dependency> | ||
| 31 | - | ||
| 32 | <!-- Web 相关 --> | 27 | <!-- Web 相关 --> |
| 33 | - <dependency> | ||
| 34 | - <groupId>org.springframework.boot</groupId> | ||
| 35 | - <artifactId>spring-boot-starter-web</artifactId> | ||
| 36 | - </dependency> | ||
| 37 | - | ||
| 38 | - <dependency> | ||
| 39 | - <groupId>org.springframework.boot</groupId> | ||
| 40 | - <artifactId>spring-boot-starter-security</artifactId> | ||
| 41 | - </dependency> | ||
| 42 | - | ||
| 43 | - <dependency> | ||
| 44 | - <groupId>org.springframework.boot</groupId> | ||
| 45 | - <artifactId>spring-boot-starter-validation</artifactId> | ||
| 46 | - </dependency> | ||
| 47 | - | ||
| 48 | - <dependency> | ||
| 49 | - <groupId>com.github.xiaoymin</groupId> | ||
| 50 | - <artifactId>knife4j-spring-boot-starter</artifactId> | ||
| 51 | - </dependency> | ||
| 52 | - <dependency> | ||
| 53 | - <groupId>io.swagger</groupId> | ||
| 54 | - <artifactId>swagger-annotations</artifactId> | ||
| 55 | - </dependency> | ||
| 56 | 28 | ||
| 57 | <!-- DB 相关 --> | 29 | <!-- DB 相关 --> |
| 58 | <dependency> | 30 | <dependency> |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java deleted
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java deleted
| 1 | -/** | ||
| 2 | - * 日志组件,包括: | ||
| 3 | - * | ||
| 4 | - * 1. 用户操作日志:记录用户的操作,用于对用户的操作的审计与追溯,永久保存。 | ||
| 5 | - * 2. API 日志:包含两类 | ||
| 6 | - * 2.1 API 访问日志:记录用户访问 API 的访问日志,定期归档历史日志。 | ||
| 7 | - * 2.2 API 异常日志:记录用户访问 API 的系统异常,方便日常排查问题与告警。 | ||
| 8 | - * 3. 通用 Logger 日志:将 {@link org.slf4j.Logger} 打印的日志,只满足大于等于配置的 {@link org.slf4j.event.Level} 进行持久化,可以理解成简易的“日志中心”。 | ||
| 9 | - */ | ||
| 10 | -package cn.iocoder.dashboard.framework.logger; |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java
| @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.tracer.config; | @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.tracer.config; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.dashboard.framework.tracer.core.aop.BizTraceAspect; | 3 | import cn.iocoder.dashboard.framework.tracer.core.aop.BizTraceAspect; |
| 4 | import cn.iocoder.dashboard.framework.tracer.core.filter.TraceFilter; | 4 | import cn.iocoder.dashboard.framework.tracer.core.filter.TraceFilter; |
| 5 | -import cn.iocoder.dashboard.framework.web.core.enums.FilterOrderEnum; | 5 | +import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; |
| 6 | import io.opentracing.Tracer; | 6 | import io.opentracing.Tracer; |
| 7 | import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer; | 7 | import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer; |
| 8 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; | 8 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; |
| @@ -49,7 +49,7 @@ public class TracerAutoConfiguration { | @@ -49,7 +49,7 @@ public class TracerAutoConfiguration { | ||
| 49 | public FilterRegistrationBean<TraceFilter> traceFilter() { | 49 | public FilterRegistrationBean<TraceFilter> traceFilter() { |
| 50 | FilterRegistrationBean<TraceFilter> registrationBean = new FilterRegistrationBean<>(); | 50 | FilterRegistrationBean<TraceFilter> registrationBean = new FilterRegistrationBean<>(); |
| 51 | registrationBean.setFilter(new TraceFilter()); | 51 | registrationBean.setFilter(new TraceFilter()); |
| 52 | - registrationBean.setOrder(FilterOrderEnum.TRACE_FILTER); | 52 | + registrationBean.setOrder(WebFilterOrderEnum.TRACE_FILTER); |
| 53 | return registrationBean; | 53 | return registrationBean; |
| 54 | } | 54 | } |
| 55 | 55 |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java
| 1 | package cn.iocoder.dashboard.framework.tracer.core.filter; | 1 | package cn.iocoder.dashboard.framework.tracer.core.filter; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | 3 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; |
| 4 | import org.springframework.web.filter.OncePerRequestFilter; | 4 | import org.springframework.web.filter.OncePerRequestFilter; |
| 5 | 5 | ||
| 6 | import javax.servlet.FilterChain; | 6 | import javax.servlet.FilterChain; |
yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| 3 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 4 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| 5 | + <parent> | ||
| 6 | + <groupId>cn.iocoder.boot</groupId> | ||
| 7 | + <artifactId>yudao-framework</artifactId> | ||
| 8 | + <version>${revision}</version> | ||
| 9 | + </parent> | ||
| 10 | + <modelVersion>4.0.0</modelVersion> | ||
| 11 | + <artifactId>yudao-spring-boot-starter-monitor</artifactId> | ||
| 12 | + <packaging>jar</packaging> | ||
| 13 | + | ||
| 14 | + <name>${artifactId}</name> | ||
| 15 | + <description>服务监控,提供链路追踪、日志服务、指标收集等等功能</description> | ||
| 16 | + <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | ||
| 17 | + | ||
| 18 | +</project> |
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
| @@ -28,16 +28,16 @@ | @@ -28,16 +28,16 @@ | ||
| 28 | 28 | ||
| 29 | <!-- Web 相关 --> | 29 | <!-- Web 相关 --> |
| 30 | <dependency> | 30 | <dependency> |
| 31 | - <groupId>org.springframework</groupId> | ||
| 32 | - <artifactId>spring-web</artifactId> | 31 | + <groupId>cn.iocoder.boot</groupId> |
| 32 | + <artifactId>yudao-spring-boot-starter-web</artifactId> | ||
| 33 | <scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 --> | 33 | <scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 --> |
| 34 | </dependency> | 34 | </dependency> |
| 35 | 35 | ||
| 36 | - <dependency> | ||
| 37 | - <groupId>jakarta.servlet</groupId> | ||
| 38 | - <artifactId>jakarta.servlet-api</artifactId> | ||
| 39 | - <scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 --> | ||
| 40 | - </dependency> | 36 | +<!-- <dependency>--> |
| 37 | +<!-- <groupId>jakarta.servlet</groupId>--> | ||
| 38 | +<!-- <artifactId>jakarta.servlet-api</artifactId>--> | ||
| 39 | +<!-- <scope>provided</scope> <!– 设置为 provided,只有 OncePerRequestFilter 使用到 –>--> | ||
| 40 | +<!-- </dependency>--> | ||
| 41 | 41 | ||
| 42 | <!-- DB 相关 --> | 42 | <!-- DB 相关 --> |
| 43 | <dependency> | 43 | <dependency> |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java
| 1 | package cn.iocoder.yudao.framework.mybatis.core.handler; | 1 | package cn.iocoder.yudao.framework.mybatis.core.handler; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | ||
| 5 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | 4 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; |
| 6 | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; | 5 | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; |
| 7 | import org.apache.ibatis.reflection.MetaObject; | 6 | import org.apache.ibatis.reflection.MetaObject; |
| 8 | 7 | ||
| @@ -21,10 +20,9 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { | @@ -21,10 +20,9 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { | ||
| 21 | @Override | 20 | @Override |
| 22 | public void insertFill(MetaObject metaObject) { | 21 | public void insertFill(MetaObject metaObject) { |
| 23 | if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) { | 22 | if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) { |
| 24 | - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); | ||
| 25 | BaseDO baseDO = (BaseDO) metaObject.getOriginalObject(); | 23 | BaseDO baseDO = (BaseDO) metaObject.getOriginalObject(); |
| 26 | - Date current = new Date(); | ||
| 27 | 24 | ||
| 25 | + Date current = new Date(); | ||
| 28 | // 创建时间为空,则以当前时间为插入时间 | 26 | // 创建时间为空,则以当前时间为插入时间 |
| 29 | if (Objects.isNull(baseDO.getCreateTime())) { | 27 | if (Objects.isNull(baseDO.getCreateTime())) { |
| 30 | baseDO.setCreateTime(current); | 28 | baseDO.setCreateTime(current); |
| @@ -33,31 +31,32 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { | @@ -33,31 +31,32 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { | ||
| 33 | if (Objects.isNull(baseDO.getUpdateTime())) { | 31 | if (Objects.isNull(baseDO.getUpdateTime())) { |
| 34 | baseDO.setUpdateTime(current); | 32 | baseDO.setUpdateTime(current); |
| 35 | } | 33 | } |
| 34 | + | ||
| 35 | + Long userId = WebFrameworkUtils.getLoginUserId(); | ||
| 36 | // 当前登录用户不为空,创建人为空,则当前登录用户为创建人 | 36 | // 当前登录用户不为空,创建人为空,则当前登录用户为创建人 |
| 37 | - if (Objects.nonNull(loginUser) && Objects.isNull(baseDO.getCreator())) { | ||
| 38 | - baseDO.setCreator(loginUser.getId().toString()); | 37 | + if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreator())) { |
| 38 | + baseDO.setCreator(userId.toString()); | ||
| 39 | } | 39 | } |
| 40 | // 当前登录用户不为空,更新人为空,则当前登录用户为更新人 | 40 | // 当前登录用户不为空,更新人为空,则当前登录用户为更新人 |
| 41 | - if (Objects.nonNull(loginUser) && Objects.isNull(baseDO.getUpdater())) { | ||
| 42 | - baseDO.setUpdater(loginUser.getId().toString()); | 41 | + if (Objects.nonNull(userId) && Objects.isNull(baseDO.getUpdater())) { |
| 42 | + baseDO.setUpdater(userId.toString()); | ||
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | @Override | 47 | @Override |
| 48 | public void updateFill(MetaObject metaObject) { | 48 | public void updateFill(MetaObject metaObject) { |
| 49 | - Object modifyTime = getFieldValByName("updateTime", metaObject); | ||
| 50 | - Object modifier = getFieldValByName("updater", metaObject); | ||
| 51 | - // 获取登录用户信息 | ||
| 52 | - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); | ||
| 53 | - | ||
| 54 | // 更新时间为空,则以当前时间为更新时间 | 49 | // 更新时间为空,则以当前时间为更新时间 |
| 50 | + Object modifyTime = getFieldValByName("updateTime", metaObject); | ||
| 55 | if (Objects.isNull(modifyTime)) { | 51 | if (Objects.isNull(modifyTime)) { |
| 56 | setFieldValByName("updateTime", new Date(), metaObject); | 52 | setFieldValByName("updateTime", new Date(), metaObject); |
| 57 | } | 53 | } |
| 54 | + | ||
| 58 | // 当前登录用户不为空,更新人为空,则当前登录用户为更新人 | 55 | // 当前登录用户不为空,更新人为空,则当前登录用户为更新人 |
| 59 | - if (Objects.nonNull(loginUser) && Objects.isNull(modifier)) { | ||
| 60 | - setFieldValByName("updater", loginUser.getId().toString(), metaObject); | 56 | + Object modifier = getFieldValByName("updater", metaObject); |
| 57 | + Long userId = WebFrameworkUtils.getLoginUserId(); | ||
| 58 | + if (Objects.nonNull(userId) && Objects.isNull(modifier)) { | ||
| 59 | + setFieldValByName("updater", userId.toString(), metaObject); | ||
| 61 | } | 60 | } |
| 62 | } | 61 | } |
| 63 | } | 62 | } |
yudao-framework/yudao-spring-boot-starter-operatelog/pom.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| 3 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 4 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| 5 | + <parent> | ||
| 6 | + <groupId>cn.iocoder.boot</groupId> | ||
| 7 | + <artifactId>yudao-framework</artifactId> | ||
| 8 | + <version>${revision}</version> | ||
| 9 | + </parent> | ||
| 10 | + <modelVersion>4.0.0</modelVersion> | ||
| 11 | + <artifactId>yudao-spring-boot-starter-operatelog</artifactId> | ||
| 12 | + <packaging>jar</packaging> | ||
| 13 | + | ||
| 14 | + <name>${artifactId}</name> | ||
| 15 | + <description>操作日志</description> | ||
| 16 | + <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | ||
| 17 | + | ||
| 18 | + <dependencies> | ||
| 19 | + <dependency> | ||
| 20 | + <groupId>cn.iocoder.boot</groupId> | ||
| 21 | + <artifactId>yudao-common</artifactId> | ||
| 22 | + </dependency> | ||
| 23 | + | ||
| 24 | + <!-- Spring 核心 --> | ||
| 25 | + <dependency> | ||
| 26 | + <groupId>org.springframework.boot</groupId> | ||
| 27 | + <artifactId>spring-boot-starter-aop</artifactId> | ||
| 28 | + </dependency> | ||
| 29 | + | ||
| 30 | + <!-- Web 相关 --> | ||
| 31 | + <dependency> | ||
| 32 | + <groupId>cn.iocoder.boot</groupId> | ||
| 33 | + <artifactId>yudao-spring-boot-starter-web</artifactId> | ||
| 34 | + <scope>provided</scope> | ||
| 35 | + </dependency> | ||
| 36 | + | ||
| 37 | + <!-- 工具类相关 --> | ||
| 38 | + <dependency> | ||
| 39 | + <groupId>com.google.guava</groupId> | ||
| 40 | + <artifactId>guava</artifactId> | ||
| 41 | + </dependency> | ||
| 42 | + </dependencies> | ||
| 43 | + | ||
| 44 | +</project> |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.config; | 1 | +package cn.iocoder.yudao.framework.operatelog.config; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.aop.OperateLogAspect; | 3 | +import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; |
| 4 | import org.springframework.context.annotation.Bean; | 4 | import org.springframework.context.annotation.Bean; |
| 5 | import org.springframework.context.annotation.Configuration; | 5 | import org.springframework.context.annotation.Configuration; |
| 6 | 6 | ||
| 7 | @Configuration | 7 | @Configuration |
| 8 | -public class OperateLogConfiguration { | 8 | +public class YudaoOperateLogAutoConfiguration { |
| 9 | 9 | ||
| 10 | @Bean | 10 | @Bean |
| 11 | public OperateLogAspect operateLogAspect() { | 11 | public OperateLogAspect operateLogAspect() { |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core.annotations; | 1 | +package cn.iocoder.yudao.framework.operatelog.core.annotations; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; | 3 | +import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; |
| 4 | import io.swagger.annotations.Api; | 4 | import io.swagger.annotations.Api; |
| 5 | import io.swagger.annotations.ApiOperation; | 5 | import io.swagger.annotations.ApiOperation; |
| 6 | 6 |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core.aop; | 1 | +package cn.iocoder.yudao.framework.operatelog.core.aop; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.exceptions.ExceptionUtil; | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | import cn.hutool.core.util.ArrayUtil; | 4 | import cn.hutool.core.util.ArrayUtil; |
| 5 | import cn.hutool.core.util.StrUtil; | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | import cn.hutool.extra.servlet.ServletUtil; | 6 | import cn.hutool.extra.servlet.ServletUtil; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 8 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | ||
| 9 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 10 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; | ||
| 11 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; | ||
| 12 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | ||
| 13 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | 8 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 9 | +import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 10 | +import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; | ||
| 11 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; | ||
| 12 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | ||
| 14 | import cn.iocoder.yudao.framework.util.json.JsonUtils; | 13 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 15 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | 14 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 15 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | ||
| 16 | import com.google.common.collect.Maps; | 16 | import com.google.common.collect.Maps; |
| 17 | import io.swagger.annotations.Api; | 17 | import io.swagger.annotations.Api; |
| 18 | import io.swagger.annotations.ApiOperation; | 18 | import io.swagger.annotations.ApiOperation; |
| @@ -148,7 +148,7 @@ public class OperateLogAspect { | @@ -148,7 +148,7 @@ public class OperateLogAspect { | ||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | private static void fillUserFields(OperateLogCreateReqDTO operateLogDTO) { | 150 | private static void fillUserFields(OperateLogCreateReqDTO operateLogDTO) { |
| 151 | - operateLogDTO.setUserId(SecurityFrameworkUtils.getLoginUserId()); | 151 | + operateLogDTO.setUserId(WebFrameworkUtils.getLoginUserId()); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | private static void fillModuleFields(OperateLogCreateReqDTO operateLogDTO, | 154 | private static void fillModuleFields(OperateLogCreateReqDTO operateLogDTO, |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/dto/OperateLogCreateReqDTO.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core.enums; | 1 | +package cn.iocoder.yudao.framework.operatelog.core.enums; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; | 3 | +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 4 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 5 | import lombok.Getter; | 5 | import lombok.Getter; |
| 6 | 6 |