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。

---
 bin/run-modules-system.bat |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat
index d43e08c..0d232fe 100644
--- a/bin/run-modules-system.bat
+++ b/bin/run-modules-system.bat
@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [��Ϣ] ����modules-system���̡�
+echo [��Ϣ] ʹ��Jar��������Modules-System���̡�
 echo.
 
 cd %~dp0
@@ -8,7 +8,7 @@
 
 set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-modules-system.jar
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
 
 cd bin
 pause
\ No newline at end of file

--
Gitblit v1.9.3