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-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
index e8b6c73..1cdf623 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
@@ -48,7 +48,7 @@
}
// 配置客户端IP
- requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr(ServletUtils.getRequest()));
+ requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr());
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3