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。

---
 ruoyi-gateway/src/main/resources/bootstrap.yml |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 51502b5..b6dc98a 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -10,9 +10,6 @@
   profiles:
     # 环境配置
     active: dev
-  main:
-    allow-circular-references: true
-    allow-bean-definition-overriding: true
   cloud:
     nacos:
       discovery:
@@ -40,4 +37,4 @@
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json
-            rule-type: flow
+            rule-type: gw-flow

--
Gitblit v1.9.3