⬆️ Upgrading dependencies. 添加灰度 pigx-common-gray 依赖

🐛 Fixing a bug. gray feign request

🐛 Fixing a bug. gray feign request

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java

@@ -31,6 +31,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.method.HandlerMethod;
@@ -123,7 +124,8 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
 	 */
 	public HttpServletRequest getRequest() {
 		try {
-			return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+			RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes();
+			return ((ServletRequestAttributes) requestAttributes).getRequest();
 		} catch (IllegalStateException e) {
 			return null;
 		}

pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/GrayLoadBalancerClientConfiguration.java

@@ -22,6 +22,7 @@ import com.pig4cloud.pigx.common.gateway.rule.VersionGrayLoadBalancer;
 import com.pig4cloud.pigx.common.gateway.filter.GrayReactiveLoadBalancerClientFilter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.gateway.config.GatewayReactiveLoadBalancerClientAutoConfiguration;
@@ -40,6 +41,7 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigurationProperties(LoadBalancerProperties.class)
 @ConditionalOnProperty(value = "gray.rule.enabled", havingValue = "true")
 @AutoConfigureBefore(GatewayReactiveLoadBalancerClientAutoConfiguration.class)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 public class GrayLoadBalancerClientConfiguration {
 
 	@Bean

pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/GrayRibbonLoadBalancerConfiguration.java

@@ -20,9 +20,12 @@ package com.pig4cloud.pigx.common.gray;
 import com.pig4cloud.pigx.common.gray.feign.GrayFeignRequestInterceptor;
 import com.pig4cloud.pigx.common.gray.rule.GrayRibbonLoadBalancerRule;
 import feign.RequestInterceptor;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
 
 /**
  * @author lengleng
@@ -31,13 +34,16 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConditionalOnProperty(value = "gray.rule.enabled", havingValue = "true")
 public class GrayRibbonLoadBalancerConfiguration {
+
 	@Bean
+	@ConditionalOnMissingBean
+	@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 	public GrayRibbonLoadBalancerRule ribbonLoadBalancerRule() {
 		return new GrayRibbonLoadBalancerRule();
 	}
 
 	@Bean
-	public RequestInterceptor pigxFeignTenantInterceptor() {
+	public RequestInterceptor grayFeignRequestInterceptor() {
 		return new GrayFeignRequestInterceptor();
 	}
 }

pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRibbonLoadBalancerRule.java

@@ -41,7 +41,6 @@ import java.util.Map;
 public class GrayRibbonLoadBalancerRule extends AbstractLoadBalancerRule {
 	@Override
 	public void initWithNiwsConfig(IClientConfig iClientConfig) {
-
 	}
 
 	@Override

pigx-gateway/pom.xml

@@ -47,10 +47,6 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-gateway</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-gray</artifactId>
-		</dependency>
 		<!--注册中心客户端-->
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>

pigx-upms/pigx-upms-biz/pom.xml

@@ -82,6 +82,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-sentinel</artifactId>
 		</dependency>
+		<!--路由控制-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>

pigx-visual/pigx-codegen/pom.xml

@@ -63,6 +63,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-log</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>
 			<artifactId>velocity</artifactId>

pigx-visual/pigx-daemon-elastic-job/pom.xml

@@ -86,6 +86,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--web 模块-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-visual/pigx-daemon-quartz/pom.xml

@@ -59,6 +59,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--web 模块-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-visual/pigx-mp-platform/pom.xml

@@ -63,6 +63,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-log</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--微信依赖-->
 		<dependency>
 			<groupId>com.github.binarywang</groupId>

pigx-visual/pigx-oa-platform/pom.xml

@@ -56,6 +56,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>

pigx-visual/pigx-pay-platform/pom.xml

@@ -48,6 +48,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-sequence</artifactId>
 		</dependency>
+		<!--灰度支持-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-gray</artifactId>
+		</dependency>
 		<!--feign 接口-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>