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/deploy.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/deploy.sh b/docker/deploy.sh
index 916d8e7..0248909 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -11,6 +11,8 @@
firewall-cmd --add-port=80/tcp --permanent
firewall-cmd --add-port=8080/tcp --permanent
firewall-cmd --add-port=8848/tcp --permanent
+ firewall-cmd --add-port=9848/tcp --permanent
+ firewall-cmd --add-port=9849/tcp --permanent
firewall-cmd --add-port=6379/tcp --permanent
firewall-cmd --add-port=3306/tcp --permanent
firewall-cmd --add-port=9100/tcp --permanent
@@ -24,12 +26,12 @@
# 启动基础环境（必须）
base(){
- docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos ruoyi-nginx
+ docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos
}
# 启动程序模块（必须）
modules(){
- docker-compose up -d ruoyi-gateway ruoyi-auth ruoyi-modules-system
+ docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system
}
# 关闭所有环境/模块
--
Gitblit v1.9.3