From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
index f0738df..ac712c9 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
@@ -27,7 +27,7 @@
/**
* 会话注销，根据指定Token
*
- * @param tokenValue 指定token
+ * @param token 指定token
*/
public static void logoutByToken(String token)
{
@@ -44,6 +44,9 @@
/**
* 获取当前登录用户信息
+ *
+ * @param token 指定token
+ * @return 用户信息
*/
public static LoginUser getLoginUser(String token)
{
@@ -52,6 +55,8 @@
/**
* 验证当前用户有效期
+ *
+ * @param loginUser 用户信息
*/
public static void verifyLoginUserExpire(LoginUser loginUser)
{
--
Gitblit v1.9.3