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/docker-compose.yml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index babe485..5fb8da1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version : '3'
+version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
@@ -12,6 +12,8 @@
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
     ports:
       - "8848:8848"
+      - "9848:9848"
+      - "9849:9849"
     depends_on:
       - ruoyi-mysql
   ruoyi-mysql:

--
Gitblit v1.9.3