Commit 20066bc864b32d1a21c492d0f05abd644e13e9eb
1 parent
750ce01e
项目结构调整 x 15 : 将 web、security、operatelog 等组件拆分出去
Showing
149 changed files
with
569 additions
and
307 deletions
yudao-admin-server/pom.xml
| ... | ... | @@ -23,6 +23,17 @@ |
| 23 | 23 | <version>${revision}</version> |
| 24 | 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 | 37 | <!-- DB 相关 --> |
| 27 | 38 | <dependency> |
| 28 | 39 | <groupId>cn.iocoder.boot</groupId> |
| ... | ... | @@ -53,6 +64,13 @@ |
| 53 | 64 | <artifactId>podam</artifactId> |
| 54 | 65 | <scope>test</scope> |
| 55 | 66 | </dependency> |
| 67 | + | |
| 68 | + <!-- 工具类相关 --> | |
| 69 | + <dependency> | |
| 70 | + <groupId>cn.iocoder.boot</groupId> | |
| 71 | + <artifactId>yudao-spring-boot-starter-operatelog</artifactId> | |
| 72 | + </dependency> | |
| 73 | + | |
| 56 | 74 | </dependencies> |
| 57 | 75 | |
| 58 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.infra.controller.config.vo.*; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; |
| ... | ... | @@ -23,7 +23,7 @@ import java.util.List; |
| 23 | 23 | |
| 24 | 24 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 25 | 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 | 27 | import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE; |
| 28 | 28 | |
| 29 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert; |
| ... | ... | @@ -28,7 +28,7 @@ import java.util.Date; |
| 28 | 28 | import java.util.List; |
| 29 | 29 | |
| 30 | 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 | 33 | @Api(tags = "定时任务") |
| 34 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO; |
| ... | ... | @@ -29,7 +29,7 @@ import java.util.Collection; |
| 29 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | 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 | 34 | @Api(tags = "定时任务日志") |
| 35 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| ... | ... | @@ -26,7 +26,7 @@ import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | 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 | 31 | @Api(tags = "API 访问日志") |
| 32 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| ... | ... | @@ -26,8 +26,8 @@ import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | 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 | 32 | @Api(tags = "API 错误日志") |
| 33 | 33 | @RestController | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java
| 1 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO; |
| 7 | 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 | 1 | package cn.iocoder.dashboard.modules.infra.convert.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO; |
| 7 | 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
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
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
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 | 2 | |
| 3 | 3 | import cn.hutool.core.io.FileTypeUtil; |
| 4 | 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 | 6 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 8 | 8 | import 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 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 7 | 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 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 7 | 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 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 7 | 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 | 1 | package cn.iocoder.dashboard.modules.infra.service.logger.impl; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 7 | 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 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | 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 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginRespVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; |
| ... | ... | @@ -27,8 +27,8 @@ import javax.validation.Valid; |
| 27 | 27 | import java.util.List; |
| 28 | 28 | |
| 29 | 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 | 32 | import static cn.iocoder.yudao.framework.util.servlet.ServletUtils.getClientIP; |
| 33 | 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 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 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 | 8 | import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO; |
| ... | ... | @@ -25,7 +25,7 @@ import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | 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 | 30 | @Api(tags = "岗位") |
| 31 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; |
| ... | ... | @@ -22,7 +22,7 @@ import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | 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 | 27 | @Api(tags = "字典数据") |
| 28 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; |
| ... | ... | @@ -22,7 +22,7 @@ import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | 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 | 27 | @Api(tags = "字典类型") |
| 28 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.*; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO; |
| ... | ... | @@ -22,7 +22,7 @@ import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | 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 | 27 | @Api(tags = "错误码") |
| 28 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; |
| ... | ... | @@ -25,7 +25,7 @@ import javax.validation.Valid; |
| 25 | 25 | import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | -import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT; | |
| 28 | +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | |
| 29 | 29 | |
| 30 | 30 | @Api(tags = "登陆日志") |
| 31 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| ... | ... | @@ -33,7 +33,7 @@ import java.util.List; |
| 33 | 33 | import java.util.Map; |
| 34 | 34 | |
| 35 | 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 | 38 | @Api(tags = "操作日志") |
| 39 | 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 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 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 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; |
| ... | ... | @@ -25,7 +25,7 @@ import java.util.Comparator; |
| 25 | 25 | import java.util.List; |
| 26 | 26 | |
| 27 | 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 | 30 | @Api(tags = "角色") |
| 31 | 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 | 3 | import cn.hutool.core.util.URLUtil; |
| 4 | 4 | import cn.hutool.extra.servlet.ServletUtil; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.framework.sms.core.enums.SmsChannelEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.service.sms.SysSmsService; |
| 9 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExcelVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.log.SysSmsLogPageReqVO; |
| ... | ... | @@ -26,7 +26,7 @@ import java.io.IOException; |
| 26 | 26 | import java.util.List; |
| 27 | 27 | |
| 28 | 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 | 31 | @Api(tags = "短信日志") |
| 32 | 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 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.sms.vo.template.*; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsTemplateConvert; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsTemplateDO; |
| ... | ... | @@ -22,7 +22,7 @@ import java.io.IOException; |
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | 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 | 27 | @Api("短信模板") |
| 28 | 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 | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | 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 | 9 | import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO; |
| ... | ... | @@ -31,7 +31,7 @@ import java.io.IOException; |
| 31 | 31 | import java.util.*; |
| 32 | 32 | |
| 33 | 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 | 36 | @Api(tags = "用户") |
| 37 | 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 | 29 | import java.util.List; |
| 30 | 30 | |
| 31 | 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 | 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 | 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 | 4 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; |
| 5 | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO; |
| 6 | 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 | 1 | package cn.iocoder.dashboard.modules.system.convert.errorcode; |
| 2 | 2 | |
| 3 | 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 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExcelVO; |
| 8 | 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 | 1 | package cn.iocoder.dashboard.modules.system.convert.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.auth; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 6 | 6 | import com.baomidou.mybatisplus.annotation.IdType; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableId; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.dataobject.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableField; | ... | ... |
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 | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | 4 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; |
| 9 | 9 | import com.baomidou.mybatisplus.annotation.TableField; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java
| 1 | 1 | package cn.iocoder.dashboard.modules.system.dal.redis; |
| 2 | 2 | |
| 3 | 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 | 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 | 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 | 4 | import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService; |
| 5 | 5 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 6 | 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
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
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
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
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 | 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 | 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 | 1 | package cn.iocoder.dashboard.modules.system.service.auth; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 6 | 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 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 9 | 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 | 4 | import cn.hutool.core.util.IdUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | 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 | 10 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 12 | 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 | 3 | import cn.hutool.captcha.CaptchaUtil; |
| 4 | 4 | import cn.hutool.captcha.CircleCaptcha; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.convert.common.SysCaptchaConvert; |
| 9 | 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 | 1 | package cn.iocoder.dashboard.modules.system.service.errorcode; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
| 7 | 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 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 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 | 7 | import cn.iocoder.dashboard.modules.system.convert.errorcode.SysErrorCodeConvert; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 9 | 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 | 1 | package cn.iocoder.dashboard.modules.system.service.logger; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 7 | 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 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert; | ... | ... |
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
| 1 | 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 | 4 | import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; |
| 5 | 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 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.collection.CollectionUtil; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMenuMapper; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysUserRoleMapper; |
| 9 | 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 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 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 | 8 | import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace; |
| 9 | 9 | import cn.iocoder.dashboard.modules.tool.controller.test.vo.*; |
| 10 | 10 | import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert; |
| ... | ... | @@ -26,7 +26,7 @@ import java.util.List; |
| 26 | 26 | import java.util.concurrent.TimeUnit; |
| 27 | 27 | |
| 28 | 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 | 31 | @Api(tags = "测试示例") |
| 32 | 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 | 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 | 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 | 8 | import org.springframework.beans.factory.annotation.Value; |
| 9 | 9 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 10 | 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
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 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 4 | import cn.hutool.core.util.ClassUtil; |
| 5 | 5 | import cn.hutool.core.util.ReflectUtil; |
| 6 | 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 | 9 | import lombok.RequiredArgsConstructor; |
| 10 | 10 | import lombok.extern.slf4j.Slf4j; |
| 11 | 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
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 | 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 | 6 | import cn.iocoder.yudao.framework.util.date.DateUtils; |
| 7 | 7 | import lombok.RequiredArgsConstructor; |
| 8 | 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 | 6 | import javax.validation.Valid; |
| 7 | 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 | 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 10 | 10 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 11 | 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 | 13 | import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; |
| 14 | 14 | import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; |
| 15 | 15 | import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils; |
| 16 | -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 | 18 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 19 | 19 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| 20 | 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 | 2 | |
| 3 | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | 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 | 6 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO; |
| 8 | 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 | 3 | import cn.hutool.core.io.resource.ResourceUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.dal.mysql.file.InfFileMapper; | ... | ... |
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 | 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 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 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO; |
| 11 | 11 | import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; | ... | ... |
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 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | 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 | 8 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO; |
| 10 | 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 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | 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 | 6 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; |
| 8 | 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 | 29 | import cn.iocoder.dashboard.BaseDbAndRedisUnitTest; |
| 30 | 30 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 31 | 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 | 34 | import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; |
| 35 | 35 | import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO; |
| 36 | 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 | 1 | package cn.iocoder.dashboard.modules.system.service.common; |
| 2 | 2 | |
| 3 | 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 | 5 | import cn.iocoder.dashboard.modules.system.controller.common.vo.SysCaptchaImageRespVO; |
| 6 | 6 | import cn.iocoder.dashboard.modules.system.dal.redis.common.SysCaptchaRedisDAO; |
| 7 | 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 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | 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 | 6 | import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; |
| 7 | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 8 | 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 | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | 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 | 7 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; |
| 8 | 8 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; |
| 9 | 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 | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 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 | 11 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; |
| 12 | 12 | import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; |
| 13 | 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 | 4 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 6 | 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 | 8 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; |
| 9 | 9 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; |
| 10 | 10 | import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -80,6 +80,18 @@ |
| 80 | 80 | |
| 81 | 81 | <!-- Web 相关 --> |
| 82 | 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 | 95 | <groupId>com.github.xiaoymin</groupId> |
| 84 | 96 | <artifactId>knife4j-spring-boot-starter</artifactId> |
| 85 | 97 | <version>${knife4j.version}</version> |
| ... | ... | @@ -108,7 +120,7 @@ |
| 108 | 120 | <dependency> |
| 109 | 121 | <groupId>cn.iocoder.boot</groupId> |
| 110 | 122 | <artifactId>yudao-spring-boot-starter-mybatis</artifactId> |
| 111 | - <version>1.0.0</version> | |
| 123 | + <version>${revision}</version> | |
| 112 | 124 | </dependency> |
| 113 | 125 | |
| 114 | 126 | <dependency> |
| ... | ... | @@ -149,6 +161,12 @@ |
| 149 | 161 | |
| 150 | 162 | <!-- 服务保障相关 --> |
| 151 | 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 | 170 | <groupId>com.baomidou</groupId> |
| 153 | 171 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> |
| 154 | 172 | <version>${lock4j.version}</version> |
| ... | ... | @@ -162,12 +180,23 @@ |
| 162 | 180 | |
| 163 | 181 | <dependency> |
| 164 | 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 | 188 | <artifactId>resilience4j-spring-boot2</artifactId> |
| 166 | 189 | <version>${resilience4j.version}</version> |
| 167 | 190 | </dependency> |
| 168 | 191 | |
| 169 | 192 | <!-- 监控相关 --> |
| 170 | 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 | 200 | <groupId>org.apache.skywalking</groupId> |
| 172 | 201 | <artifactId>apm-toolkit-trace</artifactId> |
| 173 | 202 | <version>${skywalking.version}</version> |
| ... | ... | @@ -227,6 +256,12 @@ |
| 227 | 256 | </dependency> |
| 228 | 257 | |
| 229 | 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 | 265 | <groupId>org.projectlombok</groupId> |
| 231 | 266 | <artifactId>lombok</artifactId> |
| 232 | 267 | <version>${lombok.version}</version> | ... | ... |
yudao-framework/pom.xml
| ... | ... | @@ -13,6 +13,11 @@ |
| 13 | 13 | <module>yudao-common</module> |
| 14 | 14 | <module>yudao-framework-all</module> |
| 15 | 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 | 21 | </modules> |
| 17 | 22 | |
| 18 | 23 | <artifactId>yudao-framework</artifactId> | ... | ... |
yudao-framework/yudao-common/pom.xml
| ... | ... | @@ -57,6 +57,12 @@ |
| 57 | 57 | <scope>provided</scope> <!-- 设置为 provided,主要是 PageParam 使用到 --> |
| 58 | 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 | 67 | <dependency> |
| 62 | 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 | 8 | * @author 芋道源码 |
| 7 | 9 | */ |
| 8 | -public interface FilterOrderEnum { | |
| 10 | +public interface WebFilterOrderEnum { | |
| 9 | 11 | |
| 10 | 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 | 3 | import org.apache.skywalking.apm.toolkit.trace.TraceContext; |
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * 链路追踪工具类 |
| 7 | 7 | * |
| 8 | + * 考虑到每个 starter 都需要用到该工具类,所以放到 common 模块下的 util 包下 | |
| 9 | + * | |
| 8 | 10 | * @author 芋道源码 |
| 9 | 11 | */ |
| 10 | 12 | public class TracerUtils { | ... | ... |
yudao-framework/yudao-framework-all/pom.xml
| ... | ... | @@ -24,35 +24,7 @@ |
| 24 | 24 | <optional>true</optional> |
| 25 | 25 | </dependency> |
| 26 | 26 | |
| 27 | - <dependency> | |
| 28 | - <groupId>org.springframework.boot</groupId> | |
| 29 | - <artifactId>spring-boot-starter-aop</artifactId> | |
| 30 | - </dependency> | |
| 31 | - | |
| 32 | 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 | 29 | <!-- DB 相关 --> |
| 58 | 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 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.framework.tracer.core.aop.BizTraceAspect; |
| 4 | 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 | 6 | import io.opentracing.Tracer; |
| 7 | 7 | import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer; |
| 8 | 8 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; |
| ... | ... | @@ -49,7 +49,7 @@ public class TracerAutoConfiguration { |
| 49 | 49 | public FilterRegistrationBean<TraceFilter> traceFilter() { |
| 50 | 50 | FilterRegistrationBean<TraceFilter> registrationBean = new FilterRegistrationBean<>(); |
| 51 | 51 | registrationBean.setFilter(new TraceFilter()); |
| 52 | - registrationBean.setOrder(FilterOrderEnum.TRACE_FILTER); | |
| 52 | + registrationBean.setOrder(WebFilterOrderEnum.TRACE_FILTER); | |
| 53 | 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 | 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 | 4 | import org.springframework.web.filter.OncePerRequestFilter; |
| 5 | 5 | |
| 6 | 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 | 28 | |
| 29 | 29 | <!-- Web 相关 --> |
| 30 | 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 | 33 | <scope>provided</scope> <!-- 设置为 provided,只有 OncePerRequestFilter 使用到 --> |
| 34 | 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 | 42 | <!-- DB 相关 --> |
| 43 | 43 | <dependency> | ... | ... |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java
| 1 | 1 | package cn.iocoder.yudao.framework.mybatis.core.handler; |
| 2 | 2 | |
| 3 | 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 | 5 | import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; |
| 7 | 6 | import org.apache.ibatis.reflection.MetaObject; |
| 8 | 7 | |
| ... | ... | @@ -21,10 +20,9 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { |
| 21 | 20 | @Override |
| 22 | 21 | public void insertFill(MetaObject metaObject) { |
| 23 | 22 | if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) { |
| 24 | - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); | |
| 25 | 23 | BaseDO baseDO = (BaseDO) metaObject.getOriginalObject(); |
| 26 | - Date current = new Date(); | |
| 27 | 24 | |
| 25 | + Date current = new Date(); | |
| 28 | 26 | // 创建时间为空,则以当前时间为插入时间 |
| 29 | 27 | if (Objects.isNull(baseDO.getCreateTime())) { |
| 30 | 28 | baseDO.setCreateTime(current); |
| ... | ... | @@ -33,31 +31,32 @@ public class DefaultDBFieldHandler implements MetaObjectHandler { |
| 33 | 31 | if (Objects.isNull(baseDO.getUpdateTime())) { |
| 34 | 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 | 47 | @Override |
| 48 | 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 | 51 | if (Objects.isNull(modifyTime)) { |
| 56 | 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 | 4 | import org.springframework.context.annotation.Bean; |
| 5 | 5 | import org.springframework.context.annotation.Configuration; |
| 6 | 6 | |
| 7 | 7 | @Configuration |
| 8 | -public class OperateLogConfiguration { | |
| 8 | +public class YudaoOperateLogAutoConfiguration { | |
| 9 | 9 | |
| 10 | 10 | @Bean |
| 11 | 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 | 4 | import io.swagger.annotations.Api; |
| 5 | 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 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.util.ArrayUtil; |
| 5 | 5 | import cn.hutool.core.util.StrUtil; |
| 6 | 6 | import cn.hutool.extra.servlet.ServletUtil; |
| 7 | 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 | 13 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 15 | 14 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 15 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 16 | 16 | import com.google.common.collect.Maps; |
| 17 | 17 | import io.swagger.annotations.Api; |
| 18 | 18 | import io.swagger.annotations.ApiOperation; |
| ... | ... | @@ -148,7 +148,7 @@ public class OperateLogAspect { |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | private static void fillUserFields(OperateLogCreateReqDTO operateLogDTO) { |
| 151 | - operateLogDTO.setUserId(SecurityFrameworkUtils.getLoginUserId()); | |
| 151 | + operateLogDTO.setUserId(WebFrameworkUtils.getLoginUserId()); | |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 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 | 4 | import lombok.AllArgsConstructor; |
| 5 | 5 | import lombok.Getter; |
| 6 | 6 | ... | ... |
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.operatelog.core; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core.service; | |
| 1 | +package cn.iocoder.yudao.framework.operatelog.core.service; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; | |
| 3 | +import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | |
| 4 | 4 | |
| 5 | 5 | import java.util.concurrent.Future; |
| 6 | 6 | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java renamed to yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java
| 1 | -package cn.iocoder.dashboard.framework.logger.operatelog.core.util; | |
| 1 | +package cn.iocoder.yudao.framework.operatelog.core.util; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.logger.operatelog.core.aop.OperateLogAspect; | |
| 3 | +import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; | |
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * 操作日志工具类 | ... | ... |
yudao-framework/yudao-spring-boot-starter-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java
0 → 100644
yudao-framework/yudao-spring-boot-starter-protection/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-protection</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-security/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-security</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 | + <version>${revision}</version> | |
| 23 | + </dependency> | |
| 24 | + | |
| 25 | + <!-- Web 相关 --> | |
| 26 | + <dependency> | |
| 27 | + <groupId>cn.iocoder.boot</groupId> | |
| 28 | + <artifactId>yudao-spring-boot-starter-web</artifactId> | |
| 29 | + </dependency> | |
| 30 | + | |
| 31 | + <dependency> | |
| 32 | + <groupId>org.springframework.boot</groupId> | |
| 33 | + <artifactId>spring-boot-starter-security</artifactId> | |
| 34 | + </dependency> | |
| 35 | + | |
| 36 | + </dependencies> | |
| 37 | + | |
| 38 | +</project> | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.security.config; | |
| 1 | +package cn.iocoder.yudao.framework.security.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.security.core.filter.JwtAuthenticationTokenFilter; | |
| 4 | -import cn.iocoder.dashboard.framework.security.core.handler.LogoutSuccessHandlerImpl; | |
| 5 | -import cn.iocoder.dashboard.framework.web.config.WebProperties; | |
| 6 | -import de.codecentric.boot.admin.server.config.AdminServerProperties; | |
| 3 | +import cn.iocoder.yudao.framework.security.core.filter.JwtAuthenticationTokenFilter; | |
| 4 | +import cn.iocoder.yudao.framework.security.core.handler.LogoutSuccessHandlerImpl; | |
| 5 | +import cn.iocoder.yudao.framework.web.config.WebProperties; | |
| 6 | +import org.springframework.beans.factory.annotation.Value; | |
| 7 | 7 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; |
| 8 | 8 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 9 | 9 | import org.springframework.context.annotation.Bean; |
| ... | ... | @@ -30,7 +30,7 @@ import javax.annotation.Resource; |
| 30 | 30 | */ |
| 31 | 31 | @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) |
| 32 | 32 | @EnableConfigurationProperties(SecurityProperties.class) |
| 33 | -public class SecurityConfiguration extends WebSecurityConfigurerAdapter { | |
| 33 | +public class YudaoSecurityConfiguration extends WebSecurityConfigurerAdapter { | |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * 自定义用户认证逻辑 |
| ... | ... | @@ -62,8 +62,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { |
| 62 | 62 | |
| 63 | 63 | @Resource |
| 64 | 64 | private WebProperties webProperties; |
| 65 | - @Resource | |
| 66 | - private AdminServerProperties adminServerProperties; | |
| 65 | + | |
| 66 | + @Value("${spring.boot.admin.context-path:''}") | |
| 67 | + private String adminSeverContextPath; | |
| 67 | 68 | |
| 68 | 69 | /** |
| 69 | 70 | * 由于 Spring Security 创建 AuthenticationManager 对象时,没声明 @Bean 注解,导致无法被注入 |
| ... | ... | @@ -129,7 +130,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { |
| 129 | 130 | .authorizeRequests() |
| 130 | 131 | // 登陆的接口,可匿名访问 |
| 131 | 132 | .antMatchers(api("/login")).anonymous() |
| 132 | - // 通用的接口,可匿名访问 | |
| 133 | + // 通用的接口,可匿名访问 TODO 芋艿:需要抽象出去 | |
| 133 | 134 | .antMatchers(api("/system/captcha/**")).anonymous() |
| 134 | 135 | // 静态资源,可匿名访问 |
| 135 | 136 | .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll() |
| ... | ... | @@ -140,15 +141,15 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { |
| 140 | 141 | .antMatchers("/swagger-resources/**").anonymous() |
| 141 | 142 | .antMatchers("/webjars/**").anonymous() |
| 142 | 143 | .antMatchers("/*/api-docs").anonymous() |
| 143 | - // Spring Boot Admin Server 的安全配置 | |
| 144 | - .antMatchers(adminServerProperties.getContextPath()).anonymous() | |
| 145 | - .antMatchers(adminServerProperties.getContextPath() + "/**").anonymous() | |
| 144 | + // Spring Boot Admin Server 的安全配置 TODO 芋艿:需要抽象出去 | |
| 145 | + .antMatchers(adminSeverContextPath).anonymous() | |
| 146 | + .antMatchers(adminSeverContextPath + "/**").anonymous() | |
| 146 | 147 | // Spring Boot Actuator 的安全配置 |
| 147 | 148 | .antMatchers("/actuator").anonymous() |
| 148 | 149 | .antMatchers("/actuator/**").anonymous() |
| 149 | - // Druid 监控 | |
| 150 | + // Druid 监控 TODO 芋艿:需要抽象出去 | |
| 150 | 151 | .antMatchers("/druid/**").anonymous() |
| 151 | - // 短信回调 API | |
| 152 | + // 短信回调 API TODO 芋艿:需要抽象出去 | |
| 152 | 153 | .antMatchers(api("/system/sms/callback/**")).anonymous() |
| 153 | 154 | // 除上面外的所有请求全部需要鉴权认证 |
| 154 | 155 | .anyRequest().authenticated() | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/enums/DataScopeEnum.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/JwtAuthenticationTokenFilter.java
| 1 | -package cn.iocoder.dashboard.framework.security.core.filter; | |
| 1 | +package cn.iocoder.yudao.framework.security.core.filter; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | -import cn.iocoder.dashboard.framework.security.config.SecurityProperties; | |
| 6 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | |
| 7 | -import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; | |
| 8 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | |
| 9 | -import cn.iocoder.dashboard.framework.web.core.handler.GlobalExceptionHandler; | |
| 5 | +import cn.iocoder.yudao.framework.security.config.SecurityProperties; | |
| 6 | +import cn.iocoder.yudao.framework.security.core.LoginUser; | |
| 7 | +import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; | |
| 8 | +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | |
| 9 | +import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; | |
| 10 | 10 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 11 | 11 | import org.springframework.stereotype.Component; |
| 12 | 12 | import org.springframework.web.filter.OncePerRequestFilter; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java
| 1 | -package cn.iocoder.dashboard.framework.security.core.handler; | |
| 1 | +package cn.iocoder.yudao.framework.security.core.handler; | |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | |
| 5 | +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | |
| 6 | 6 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; |
| 8 | 8 | import org.springframework.security.access.AccessDeniedException; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/LogoutSuccessHandlerImpl.java
| 1 | -package cn.iocoder.dashboard.framework.security.core.handler; | |
| 1 | +package cn.iocoder.yudao.framework.security.core.handler; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | -import cn.iocoder.dashboard.framework.security.config.SecurityProperties; | |
| 6 | -import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; | |
| 7 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | |
| 5 | +import cn.iocoder.yudao.framework.security.config.SecurityProperties; | |
| 6 | +import cn.iocoder.yudao.framework.security.core.service.SecurityAuthFrameworkService; | |
| 7 | +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | |
| 8 | 8 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 9 | 9 | import org.springframework.security.core.Authentication; |
| 10 | 10 | import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; |
| ... | ... | @@ -39,4 +39,5 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler { |
| 39 | 39 | // 返回成功 |
| 40 | 40 | ServletUtils.writeJSON(response, CommonResult.success(null)); |
| 41 | 41 | } |
| 42 | + | |
| 42 | 43 | } | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityAuthFrameworkService.java
| 1 | -package cn.iocoder.dashboard.framework.security.core.service; | |
| 1 | +package cn.iocoder.yudao.framework.security.core.service; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | |
| 3 | +import cn.iocoder.yudao.framework.security.core.LoginUser; | |
| 4 | 4 | import org.springframework.security.core.userdetails.UserDetailsService; |
| 5 | 5 | |
| 6 | 6 | /** | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityPermissionFrameworkService.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java
| 1 | -package cn.iocoder.dashboard.framework.security.core.util; | |
| 1 | +package cn.iocoder.yudao.framework.security.core.util; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.security.core.LoginUser; | |
| 4 | -import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; | |
| 3 | +import cn.iocoder.yudao.framework.security.core.LoginUser; | |
| 4 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 5 | 5 | import org.springframework.lang.Nullable; |
| 6 | 6 | import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; |
| 7 | 7 | import org.springframework.security.core.Authentication; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/package-info.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md
yudao-framework/yudao-spring-boot-starter-web/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-web</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 | + <!-- Web 相关 --> | |
| 25 | + <dependency> | |
| 26 | + <groupId>org.springframework.boot</groupId> | |
| 27 | + <artifactId>spring-boot-starter-web</artifactId> | |
| 28 | + </dependency> | |
| 29 | + | |
| 30 | + <dependency> | |
| 31 | + <groupId>com.github.xiaoymin</groupId> | |
| 32 | + <artifactId>knife4j-spring-boot-starter</artifactId> | |
| 33 | + </dependency> | |
| 34 | + <dependency> | |
| 35 | + <groupId>io.swagger</groupId> | |
| 36 | + <artifactId>swagger-annotations</artifactId> | |
| 37 | + </dependency> | |
| 38 | + | |
| 39 | + <dependency> | |
| 40 | + <groupId>org.springframework.boot</groupId> | |
| 41 | + <artifactId>spring-boot-starter-validation</artifactId> | |
| 42 | + </dependency> | |
| 43 | + | |
| 44 | + <dependency> | |
| 45 | + <groupId>org.springframework.security</groupId> | |
| 46 | + <artifactId>spring-security-core</artifactId> | |
| 47 | + <scope>provided</scope> <!-- 设置为 provided,主要是 GlobalExceptionHandler 使用 --> | |
| 48 | + </dependency> | |
| 49 | + | |
| 50 | + <!-- 服务保障相关 --> | |
| 51 | + <dependency> | |
| 52 | + <groupId>io.github.resilience4j</groupId> | |
| 53 | + <artifactId>resilience4j-ratelimiter</artifactId> | |
| 54 | + <scope>provided</scope> <!-- 设置为 provided,主要是 GlobalExceptionHandler 使用 --> | |
| 55 | + </dependency> | |
| 56 | + | |
| 57 | + </dependencies> | |
| 58 | + | |
| 59 | +</project> | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.logger.apilog.config; | |
| 1 | +package cn.iocoder.yudao.framework.apilog.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.logger.apilog.core.filter.ApiAccessLogFilter; | |
| 4 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; | |
| 5 | -import cn.iocoder.dashboard.framework.web.config.WebProperties; | |
| 6 | -import cn.iocoder.dashboard.framework.web.core.enums.FilterOrderEnum; | |
| 3 | +import cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter; | |
| 4 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; | |
| 5 | +import cn.iocoder.yudao.framework.web.config.WebProperties; | |
| 6 | +import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration; | |
| 7 | +import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; | |
| 7 | 8 | import org.springframework.beans.factory.annotation.Value; |
| 9 | +import org.springframework.boot.autoconfigure.AutoConfigureAfter; | |
| 8 | 10 | import org.springframework.boot.web.servlet.FilterRegistrationBean; |
| 9 | 11 | import org.springframework.context.annotation.Bean; |
| 10 | 12 | import org.springframework.context.annotation.Configuration; |
| ... | ... | @@ -12,7 +14,8 @@ import org.springframework.context.annotation.Configuration; |
| 12 | 14 | import javax.servlet.Filter; |
| 13 | 15 | |
| 14 | 16 | @Configuration |
| 15 | -public class ApiLogConfiguration { | |
| 17 | +@AutoConfigureAfter(YudaoWebAutoConfiguration.class) | |
| 18 | +public class YudaoApiLogAutoConfiguration { | |
| 16 | 19 | |
| 17 | 20 | /** |
| 18 | 21 | * 创建 ApiAccessLogFilter Bean,记录 API 请求日志 |
| ... | ... | @@ -22,7 +25,7 @@ public class ApiLogConfiguration { |
| 22 | 25 | @Value("${spring.application.name}") String applicationName, |
| 23 | 26 | ApiAccessLogFrameworkService apiAccessLogFrameworkService) { |
| 24 | 27 | ApiAccessLogFilter filter = new ApiAccessLogFilter(webProperties, applicationName, apiAccessLogFrameworkService); |
| 25 | - return createFilterBean(filter, FilterOrderEnum.API_ACCESS_LOG_FILTER); | |
| 28 | + return createFilterBean(filter, WebFilterOrderEnum.API_ACCESS_LOG_FILTER); | |
| 26 | 29 | } |
| 27 | 30 | |
| 28 | 31 | private static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) { | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
| 1 | -package cn.iocoder.dashboard.framework.logger.apilog.core.filter; | |
| 1 | +package cn.iocoder.yudao.framework.apilog.core.filter; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 8 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService; | |
| 9 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; | |
| 10 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | |
| 11 | -import cn.iocoder.dashboard.framework.web.config.WebProperties; | |
| 12 | -import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; | |
| 8 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; | |
| 9 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; | |
| 10 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | |
| 11 | +import cn.iocoder.yudao.framework.web.config.WebProperties; | |
| 12 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 13 | 13 | import cn.iocoder.yudao.framework.util.date.DateUtils; |
| 14 | 14 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 15 | 15 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkService.java
| 1 | -package cn.iocoder.dashboard.framework.logger.apilog.core.service; | |
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO; | |
| 3 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO; | |
| 4 | 4 | |
| 5 | 5 | import javax.validation.Valid; |
| 6 | 6 | import java.util.concurrent.Future; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkService.java
| 1 | -package cn.iocoder.dashboard.framework.logger.apilog.core.service; | |
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; | |
| 3 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; | |
| 4 | 4 | |
| 5 | 5 | import javax.validation.Valid; |
| 6 | 6 | import java.util.concurrent.Future; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/dto/ApiAccessLogCreateDTO.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/dto/ApiErrorLogCreateDTO.java
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/package-info.java
0 → 100644
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.jackson.config; | |
| 1 | +package cn.iocoder.yudao.framework.jackson.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.jackson.deser.LocalDateTimeDeserializer; | |
| 4 | -import cn.iocoder.dashboard.framework.jackson.ser.LocalDateTimeSerializer; | |
| 3 | +import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer; | |
| 4 | +import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer; | |
| 5 | 5 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 6 | 6 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 7 | 7 | import com.fasterxml.jackson.databind.module.SimpleModule; |
| ... | ... | @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; |
| 11 | 11 | import java.time.LocalDateTime; |
| 12 | 12 | |
| 13 | 13 | @Configuration |
| 14 | -public class JacksonConfig { | |
| 14 | +public class YudaoJacksonAutoConfiguration { | |
| 15 | 15 | |
| 16 | 16 | @Bean |
| 17 | 17 | @SuppressWarnings("InstantiationOfUtilityClass") | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeDeserializer.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeSerializer.java
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/package-info.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.jackson.core; | ... | ... |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.swagger.config; | |
| 1 | +package cn.iocoder.yudao.framework.swagger.config; | |
| 2 | 2 | |
| 3 | 3 | import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; |
| 4 | 4 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; |
| ... | ... | @@ -38,7 +38,7 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka |
| 38 | 38 | @ConditionalOnProperty(prefix = "yudao.swagger", value = "enable", matchIfMissing = true) |
| 39 | 39 | // 允许使用 swagger.enable=false 禁用 Swagger |
| 40 | 40 | @EnableConfigurationProperties(SwaggerProperties.class) |
| 41 | -public class SwaggerAutoConfiguration { | |
| 41 | +public class YudaoSwaggerAutoConfiguration { | |
| 42 | 42 | |
| 43 | 43 | @Bean |
| 44 | 44 | @ConditionalOnMissingBean | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java
| 1 | -package cn.iocoder.dashboard.framework.web.config; | |
| 1 | +package cn.iocoder.yudao.framework.web.config; | |
| 2 | 2 | |
| 3 | 3 | import lombok.Data; |
| 4 | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
| ... | ... | @@ -19,7 +19,7 @@ public class WebProperties { |
| 19 | 19 | * 意义:通过该前缀,避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部,带来安全性问题 |
| 20 | 20 | * 这样,Nginx 只需要配置转发到 /api/* 的所有接口即可。 |
| 21 | 21 | * |
| 22 | - * @see WebConfiguration#configurePathMatch(PathMatchConfigurer) | |
| 22 | + * @see YudaoWebAutoConfiguration#configurePathMatch(PathMatchConfigurer) | |
| 23 | 23 | */ |
| 24 | 24 | @NotNull(message = "API 前缀不能为空") |
| 25 | 25 | private String apiPrefix; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
| 1 | -package cn.iocoder.dashboard.framework.web.config; | |
| 1 | +package cn.iocoder.yudao.framework.web.config; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.web.core.enums.FilterOrderEnum; | |
| 4 | -import cn.iocoder.dashboard.framework.web.core.filter.CacheRequestBodyFilter; | |
| 5 | -import cn.iocoder.dashboard.framework.web.core.filter.DemoFilter; | |
| 6 | -import cn.iocoder.dashboard.framework.web.core.filter.XssFilter; | |
| 3 | +import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; | |
| 4 | +import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter; | |
| 5 | +import cn.iocoder.yudao.framework.web.core.filter.DemoFilter; | |
| 6 | +import cn.iocoder.yudao.framework.web.core.filter.XssFilter; | |
| 7 | 7 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; |
| 8 | 8 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 9 | 9 | import org.springframework.boot.web.servlet.FilterRegistrationBean; |
| ... | ... | @@ -22,7 +22,7 @@ import javax.servlet.Filter; |
| 22 | 22 | |
| 23 | 23 | @Configuration |
| 24 | 24 | @EnableConfigurationProperties({WebProperties.class, XssProperties.class}) |
| 25 | -public class WebConfiguration implements WebMvcConfigurer { | |
| 25 | +public class YudaoWebAutoConfiguration implements WebMvcConfigurer { | |
| 26 | 26 | |
| 27 | 27 | @Resource |
| 28 | 28 | private WebProperties webProperties; |
| ... | ... | @@ -51,7 +51,7 @@ public class WebConfiguration implements WebMvcConfigurer { |
| 51 | 51 | // 创建 UrlBasedCorsConfigurationSource 对象 |
| 52 | 52 | UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); |
| 53 | 53 | source.registerCorsConfiguration("/**", config); // 对接口配置跨域设置 |
| 54 | - return createFilterBean(new CorsFilter(source), FilterOrderEnum.CORS_FILTER); | |
| 54 | + return createFilterBean(new CorsFilter(source), WebFilterOrderEnum.CORS_FILTER); | |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
| ... | ... | @@ -59,7 +59,7 @@ public class WebConfiguration implements WebMvcConfigurer { |
| 59 | 59 | */ |
| 60 | 60 | @Bean |
| 61 | 61 | public FilterRegistrationBean<CacheRequestBodyFilter> requestBodyCacheFilter() { |
| 62 | - return createFilterBean(new CacheRequestBodyFilter(), FilterOrderEnum.REQUEST_BODY_CACHE_FILTER); | |
| 62 | + return createFilterBean(new CacheRequestBodyFilter(), WebFilterOrderEnum.REQUEST_BODY_CACHE_FILTER); | |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| ... | ... | @@ -67,7 +67,7 @@ public class WebConfiguration implements WebMvcConfigurer { |
| 67 | 67 | */ |
| 68 | 68 | @Bean |
| 69 | 69 | public FilterRegistrationBean<XssFilter> xssFilter(XssProperties properties, PathMatcher pathMatcher) { |
| 70 | - return createFilterBean(new XssFilter(properties, pathMatcher), FilterOrderEnum.XSS_FILTER); | |
| 70 | + return createFilterBean(new XssFilter(properties, pathMatcher), WebFilterOrderEnum.XSS_FILTER); | |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
| ... | ... | @@ -76,7 +76,7 @@ public class WebConfiguration implements WebMvcConfigurer { |
| 76 | 76 | @Bean |
| 77 | 77 | @ConditionalOnProperty(value = "yudao.demo", havingValue = "true") |
| 78 | 78 | public FilterRegistrationBean<DemoFilter> demoFilter() { |
| 79 | - return createFilterBean(new DemoFilter(), FilterOrderEnum.DEMO_FILTER); | |
| 79 | + return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER); | |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | private static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) { | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyFilter.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.filter; | |
| 1 | +package cn.iocoder.yudao.framework.web.core.filter; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | |
| 6 | 5 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 6 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 7 | 7 | import org.springframework.web.filter.OncePerRequestFilter; |
| 8 | 8 | |
| 9 | 9 | import javax.servlet.FilterChain; |
| ... | ... | @@ -23,7 +23,7 @@ public class DemoFilter extends OncePerRequestFilter { |
| 23 | 23 | protected boolean shouldNotFilter(HttpServletRequest request) { |
| 24 | 24 | String method = request.getMethod(); |
| 25 | 25 | return !StrUtil.equalsAnyIgnoreCase(method, "POST", "PUT", "DELETE") // 写操作时,不进行过滤率 |
| 26 | - || SecurityFrameworkUtils.getLoginUser() == null; // 非登陆用户时,不进行过滤 | |
| 26 | + || WebFrameworkUtils.getLoginUserId(request) == null; // 非登陆用户时,不进行过滤 | |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | @Override | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.filter; | |
| 1 | +package cn.iocoder.yudao.framework.web.core.filter; | |
| 2 | 2 | |
| 3 | -import cn.iocoder.dashboard.framework.web.config.XssProperties; | |
| 3 | +import cn.iocoder.yudao.framework.web.config.XssProperties; | |
| 4 | 4 | import lombok.AllArgsConstructor; |
| 5 | 5 | import org.springframework.util.PathMatcher; |
| 6 | 6 | import org.springframework.web.filter.OncePerRequestFilter; | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.handler; | |
| 1 | +package cn.iocoder.yudao.framework.web.core.handler; | |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.exception.ServiceException; |
| 7 | 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 8 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService; | |
| 9 | -import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO; | |
| 10 | -import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; | |
| 11 | -import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; | |
| 12 | -import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; | |
| 8 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; | |
| 9 | +import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO; | |
| 10 | +import cn.iocoder.yudao.framework.util.monitor.TracerUtils; | |
| 11 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 13 | 12 | import cn.iocoder.yudao.framework.util.json.JsonUtils; |
| 14 | 13 | import cn.iocoder.yudao.framework.util.servlet.ServletUtils; |
| 15 | 14 | import io.github.resilience4j.ratelimiter.RequestNotPermitted; |
| ... | ... | @@ -202,7 +201,7 @@ public class GlobalExceptionHandler { |
| 202 | 201 | */ |
| 203 | 202 | @ExceptionHandler(value = AccessDeniedException.class) |
| 204 | 203 | public CommonResult<?> accessDeniedExceptionHandler(HttpServletRequest req, AccessDeniedException ex) { |
| 205 | - log.warn("[accessDeniedExceptionHandler][userId({}) 无法访问 url({})]", SecurityFrameworkUtils.getLoginUserId(), | |
| 204 | + log.warn("[accessDeniedExceptionHandler][userId({}) 无法访问 url({})]", WebFrameworkUtils.getLoginUserId(req), | |
| 206 | 205 | req.getRequestURL(), ex); |
| 207 | 206 | return CommonResult.error(FORBIDDEN); |
| 208 | 207 | } | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalResponseBodyHandler.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.handler; | |
| 1 | +package cn.iocoder.yudao.framework.web.core.handler; | |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | -import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | |
| 5 | 5 | import org.springframework.core.MethodParameter; |
| 6 | 6 | import org.springframework.http.MediaType; |
| 7 | 7 | import org.springframework.http.server.ServerHttpRequest; |
| ... | ... | @@ -18,7 +18,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; |
| 18 | 18 | * 原因是,GlobalResponseBodyHandler 本质上是 AOP,它不应该改变 Controller 返回的数据结构 |
| 19 | 19 | * |
| 20 | 20 | * 目前,GlobalResponseBodyHandler 的主要作用是,记录 Controller 的返回结果, |
| 21 | - * 方便 {@link cn.iocoder.dashboard.framework.logger.apilog.core.filter.ApiAccessLogFilter} 记录访问日志 | |
| 21 | + * 方便 {@link cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter} 记录访问日志 | |
| 22 | 22 | */ |
| 23 | 23 | @ControllerAdvice |
| 24 | 24 | public class GlobalResponseBodyHandler implements ResponseBodyAdvice { | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java
| 1 | -package cn.iocoder.dashboard.framework.web.core.util; | |
| 1 | +package cn.iocoder.yudao.framework.web.core.util; | |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | +import org.springframework.web.context.request.RequestAttributes; | |
| 6 | +import org.springframework.web.context.request.RequestContextHolder; | |
| 7 | +import org.springframework.web.context.request.ServletRequestAttributes; | |
| 5 | 8 | |
| 6 | 9 | import javax.servlet.ServletRequest; |
| 7 | 10 | import javax.servlet.http.HttpServletRequest; |
| ... | ... | @@ -28,9 +31,17 @@ public class WebFrameworkUtils { |
| 28 | 31 | * @return 用户编号 |
| 29 | 32 | */ |
| 30 | 33 | public static Long getLoginUserId(HttpServletRequest request) { |
| 34 | + if (request == null) { | |
| 35 | + return null; | |
| 36 | + } | |
| 31 | 37 | return (Long) request.getAttribute(REQUEST_ATTRIBUTE_LOGIN_USER_ID); |
| 32 | 38 | } |
| 33 | 39 | |
| 40 | + public static Long getLoginUserId() { | |
| 41 | + HttpServletRequest request = getRequest(); | |
| 42 | + return getLoginUserId(request); | |
| 43 | + } | |
| 44 | + | |
| 34 | 45 | public static Integer getUserType(HttpServletRequest request) { |
| 35 | 46 | return UserTypeEnum.ADMIN.getValue(); // TODO 芋艿:等后续优化 |
| 36 | 47 | } |
| ... | ... | @@ -43,4 +54,13 @@ public class WebFrameworkUtils { |
| 43 | 54 | return (CommonResult<?>) request.getAttribute(REQUEST_ATTRIBUTE_COMMON_RESULT); |
| 44 | 55 | } |
| 45 | 56 | |
| 57 | + private static HttpServletRequest getRequest() { | |
| 58 | + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); | |
| 59 | + if (!(requestAttributes instanceof ServletRequestAttributes)) { | |
| 60 | + return null; | |
| 61 | + } | |
| 62 | + ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes; | |
| 63 | + return servletRequestAttributes.getRequest(); | |
| 64 | + } | |
| 65 | + | |
| 46 | 66 | } | ... | ... |
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/package-info.java
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md
yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md renamed to yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md