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-auth/pom.xml | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 451d20d..f34f85e 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -44,12 +44,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-
- <!-- Mysql Connector -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- RuoYi Common Security-->
--
Gitblit v1.9.3