From d972a4466a9e8a1a6e6375e4171a4790c2ba156e Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 27 Jan 2024 00:16:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=8E=B7=E5=8F=96=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=99=E6=8A=9B=E5=87=BA=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 Qodana 扫描问题 --- .../config/mybatis/DataPermissionFilterImpl.java | 10 +++------- .../admin/common/util/helper/LoginHelper.java | 14 +++++++------- .../admin/system/model/entity/MessageUserDO.java | 9 +++++---- .../admin/system/model/query/MessageQuery.java | 2 ++ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java index fddb47d9..01e5206f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java @@ -16,16 +16,15 @@ package top.charles7c.continew.admin.common.config.mybatis; -import java.util.stream.Collectors; - import cn.hutool.core.convert.Convert; - import top.charles7c.continew.admin.common.model.dto.LoginUser; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser; import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataScope; +import java.util.stream.Collectors; + /** * 数据权限过滤器实现类 * @@ -37,15 +36,12 @@ public class DataPermissionFilterImpl implements DataPermissionFilter { @Override public boolean isFilter() { LoginUser loginUser = LoginHelper.getLoginUser(); - return null != loginUser && !loginUser.isAdmin(); + return !loginUser.isAdmin(); } @Override public DataPermissionCurrentUser getCurrentUser() { LoginUser loginUser = LoginHelper.getLoginUser(); - if (null == loginUser) { - throw new IllegalArgumentException("Current user is not allowed to be empty."); - } DataPermissionCurrentUser currentUser = new DataPermissionCurrentUser(); currentUser.setUserId(Convert.toStr(loginUser.getId())); currentUser.setDeptId(Convert.toStr(loginUser.getDeptId())); diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java index 11094b76..b1547660 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java @@ -17,6 +17,7 @@ package top.charles7c.continew.admin.common.util.helper; import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.StrUtil; @@ -67,17 +68,16 @@ public class LoginHelper { /** * 获取登录用户信息 * - * @return 登录用户信息（获取 TokenSession 时如未登录，会抛出异常） + * @return 登录用户信息 + * @throws NotLoginException 未登录异常 */ - public static LoginUser getLoginUser() { + public static LoginUser getLoginUser() throws NotLoginException { + StpUtil.checkLogin(); LoginUser loginUser = (LoginUser)SaHolder.getStorage().get(CacheConstants.LOGIN_USER_KEY); if (null != loginUser) { return loginUser; } SaSession tokenSession = StpUtil.getTokenSession(); - if (null == tokenSession) { - return null; - } loginUser = (LoginUser)tokenSession.get(CacheConstants.LOGIN_USER_KEY); SaHolder.getStorage().set(CacheConstants.LOGIN_USER_KEY, loginUser); return loginUser; @@ -103,7 +103,7 @@ public class LoginHelper { * @return 登录用户 ID */ public static Long getUserId() { - return ExceptionUtils.exToNull(() -> getLoginUser().getId()); + return getLoginUser().getId(); } /** @@ -112,7 +112,7 @@ public class LoginHelper { * @return 登录用户名 */ public static String getUsername() { - return ExceptionUtils.exToNull(() -> getLoginUser().getUsername()); + return getLoginUser().getUsername(); } /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java index 58b1ece5..91a5e3e6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/MessageUserDO.java @@ -16,12 +16,12 @@ package top.charles7c.continew.admin.system.model.entity; -import java.io.Serializable; -import java.time.LocalDateTime; - +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; /** * 消息和用户关联实体 @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_message_user") public class MessageUserDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java index d112c7d2..4ca62c35 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java @@ -22,6 +22,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.query.Query; import top.charles7c.continew.starter.data.mybatis.plus.query.QueryIgnore; import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType; +import java.io.Serial; import java.io.Serializable; /** @@ -34,6 +35,7 @@ import java.io.Serializable; @Schema(description = "消息查询条件") public class MessageQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /**