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-modules/ruoyi-gen/pom.xml | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index c22e9cc..2745d7c 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules</artifactId>
- <version>2.5.0</version>
+ <version>3.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -51,13 +51,7 @@
<!-- Apache Velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <!-- Commons Collections -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<!-- Mysql Connector -->
--
Gitblit v1.9.3