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。

---
 docker/copy.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/copy.sh b/docker/copy.sh
index 4bb1541..ec2915b 100644
--- a/docker/copy.sh
+++ b/docker/copy.sh
@@ -9,8 +9,8 @@
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20210908.sql ./mysql/db
-cp ../sql/ry_config_20211118.sql ./mysql/db
+cp ../sql/ry_20220814.sql ./mysql/db
+cp ../sql/ry_config_20220510.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

--
Gitblit v1.9.3