diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java index 45e48213..c9c38a6b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/Query.java @@ -21,6 +21,7 @@ import java.lang.annotation.*; /** * 查询注解 * + * @author Zheng Jie(ELADMIN) * @author Charles7c * @since 2023/1/15 18:01 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java index 82a2cec4..a6e31aad 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java @@ -59,8 +59,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { LocalStorageProperties.LocalStoragePath path = localStorageProperties.getPath(); - String avatarUtl = "file:" + path.getAvatar().replace("\\", "/"); - String fileUrl = "file:" + path.getFile().replace("\\", "/"); + String avatarUtl = "file:" + path.getAvatar().replace(StringConsts.BACKSLASH, StringConsts.SLASH); + String fileUrl = "file:" + path.getFile().replace(StringConsts.BACKSLASH, StringConsts.SLASH); registry.addResourceHandler(localStorageProperties.getFilePattern()).addResourceLocations(fileUrl) .setCachePeriod(0); registry.addResourceHandler(localStorageProperties.getAvatarPattern()).addResourceLocations(avatarUtl) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java index 6be2ae49..c2c6880e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java @@ -25,6 +25,7 @@ import cn.hutool.extra.spring.SpringUtil; /** * RSA 配置属性 * + * @author Zheng Jie(ELADMIN) * @author Charles7c * @since 2022/12/21 20:21 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/AsyncConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/AsyncConfiguration.java index f1cfb10c..cbb7ccc5 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/AsyncConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/AsyncConfiguration.java @@ -35,6 +35,7 @@ import top.charles7c.cnadmin.common.exception.ServiceException; /** * 异步任务执行配置 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/23 22:33 */ @@ -47,7 +48,7 @@ public class AsyncConfiguration implements AsyncConfigurer { private final ScheduledExecutorService scheduledExecutorService; /** - * 异步任务执行时,使用 Java 内置线程池 + * 异步任务 @Async 执行时,使用 Java 内置线程池 */ @Override public Executor getAsyncExecutor() { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolConfiguration.java index d55e11a4..a73d4bd7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolConfiguration.java @@ -34,6 +34,7 @@ import top.charles7c.cnadmin.common.util.ExceptionUtils; /** * 线程池配置 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/23 23:13 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolProperties.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolProperties.java index 8e64a615..f9d522be 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/threadpool/ThreadPoolProperties.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Component; /** * 线程池配置属性 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/23 23:06 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java index b13f6259..feb419f1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java @@ -52,6 +52,7 @@ import top.charles7c.cnadmin.common.util.holder.LogContextHolder; * 全局异常处理器 * * @author Charles7c + * @author Lion Li(RuoYi-Vue-Plus) * @since 2022/12/21 21:01 */ @Slf4j @@ -183,7 +184,6 @@ public class GlobalExceptionHandler { @ExceptionHandler(NotLoginException.class) public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { log.error("请求地址 [{}],认证失败,无法访问系统资源。", request.getRequestURI(), e); - String errorMsg; switch (e.getType()) { case NotLoginException.KICK_OUT: @@ -196,7 +196,6 @@ public class GlobalExceptionHandler { errorMsg = "登录状态已过期,请重新登录"; break; } - LogContextHolder.setErrorMsg(errorMsg); return R.fail(HttpStatus.UNAUTHORIZED.value(), errorMsg); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java index aa2299f8..b706b3b6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java @@ -34,6 +34,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts; /** * 文件工具类 * + * @author Zheng Jie(ELADMIN) * @author Charles7c * @since 2023/1/2 21:34 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java index 2da3e04f..a8e2c9b0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/RedisUtils.java @@ -33,6 +33,7 @@ import cn.hutool.extra.spring.SpringUtil; /** * Redis 工具类 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/11 12:00 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java index 90af9113..7ef76e67 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java @@ -31,6 +31,7 @@ import top.charles7c.cnadmin.common.constant.StringConsts; /** * Stream 工具类 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/22 19:51 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java index 73b75151..bda8914e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java @@ -38,6 +38,7 @@ import top.charles7c.cnadmin.common.util.holder.LogContextHolder; /** * 登录助手 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/24 12:58 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index e6e157c2..5c5371d1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -36,6 +36,7 @@ import top.charles7c.cnadmin.common.util.ReflectUtils; /** * 查询助手 * + * @author Zheng Jie(ELADMIN) * @author Charles7c * @since 2023/1/15 18:17 */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java index 37e496bb..f5819579 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenConfiguration.java @@ -34,6 +34,7 @@ import cn.dev33.satoken.stp.StpUtil; /** * Sa-Token 配置 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/19 22:13 */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java index f159a57e..8163196b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenPermissionImpl.java @@ -27,17 +27,24 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper; /** * Sa-Token 权限认证适配 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2023/3/1 22:28 */ public class SaTokenPermissionImpl implements StpInterface { + /** + * 获取菜单权限列表 + */ @Override public List getPermissionList(Object loginId, String loginType) { LoginUser loginUser = LoginHelper.getLoginUser(); return new ArrayList<>(loginUser.getPermissions()); } + /** + * 获取角色权限列表 + */ @Override public List getRoleList(Object loginId, String loginType) { LoginUser loginUser = LoginHelper.getLoginUser(); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java index 1ce608a2..06755990 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SaTokenRedisDaoImpl.java @@ -29,6 +29,7 @@ import top.charles7c.cnadmin.common.util.RedisUtils; /** * Sa-Token 持久层本地 Redis 适配(参考:Sa-Token/sa-token-plugin/sa-token-dao-redisx/SaTokenDaoOfRedis.java) * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/28 22:55 */ diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java index 5f163118..9446445b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/config/satoken/SecurityProperties.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Component; /** * Sa-Token 安全配置属性 * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2022/12/19 22:14 */ diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index 9c0fc517..1a2d8d04 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -39,6 +39,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.common.constant.CacheConsts; +import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.vo.PageDataVO; @@ -50,6 +51,7 @@ import top.charles7c.cnadmin.monitor.model.vo.*; /** * 在线用户 API * + * @author Lion Li(RuoYi-Vue-Plus) * @author Charles7c * @since 2023/1/20 21:51 */ @@ -64,9 +66,9 @@ public class OnlineUserController { @GetMapping public R> page(@Validated OnlineUserQuery query, @Validated PageQuery pageQuery) { List loginUserList = new ArrayList<>(); - List tokenKeyList = StpUtil.searchTokenValue("", 0, -1, false); + List tokenKeyList = StpUtil.searchTokenValue(StringConsts.EMPTY, 0, -1, false); for (String tokenKey : tokenKeyList) { - String token = StrUtil.subAfter(tokenKey, ":", true); + String token = StrUtil.subAfter(tokenKey, StringConsts.COLON, true); // 忽略已过期或失效 Token if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < SaTokenDao.NEVER_EXPIRE) { continue;