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。
---
pom.xml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0dff9dd..9007000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,11 @@
<tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
- <druid.version>1.2.15</druid.version>
+ <druid.version>1.2.16</druid.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version>
- <commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>2.0.22</fastjson.version>
+ <fastjson.version>2.0.23</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
@@ -114,13 +113,6 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
- </dependency>
-
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
</dependency>
<!-- 代码生成使用模板 -->
--
Gitblit v1.9.3