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-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index d31d1b8..c7e1f34 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -18,6 +18,11 @@
public static final String GBK = "GBK";
/**
+ * www主域
+ */
+ public static final String WWW = "www.";
+
+ /**
* RMI 远程方法调用
*/
public static final String LOOKUP_RMI = "rmi:";
@@ -55,12 +60,12 @@
/**
* 登录成功状态
*/
- public static final String LOGIN_SUCCESS_STATUS = "1";
+ public static final String LOGIN_SUCCESS_STATUS = "0";
/**
* 登录失败状态
*/
- public static final String LOGIN_FAIL_STATUS = "0";
+ public static final String LOGIN_FAIL_STATUS = "1";
/**
* 登录成功
@@ -103,25 +108,9 @@
public static final String IS_ASC = "isAsc";
/**
- * 验证码 redis key
- */
- public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
- /**
* 验证码有效期（分钟）
*/
public static final long CAPTCHA_EXPIRATION = 2;
-
-
- /**
- * 参数管理 cache key
- */
- public static final String SYS_CONFIG_KEY = "sys_config:";
-
- /**
- * 字典管理 cache key
- */
- public static final String SYS_DICT_KEY = "sys_dict:";
/**
* 资源映射路径 前缀
--
Gitblit v1.9.3