✨ 新特性。 sentinel -> hytrix | add pigx-common-sentinel

pigx-auth/pom.xml

@@ -63,6 +63,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
 		</dependency>
+		<!--sentinel 依赖-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-sentinel</artifactId>
+		</dependency>
 		<!--JDBC相关-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-common/pigx-common-bom/pom.xml

@@ -66,6 +66,11 @@
 				<artifactId>pigx-common-security</artifactId>
 				<version>${pigx.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-sentinel</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.pig4cloud</groupId>
 				<artifactId>pigx-common-sequence</artifactId>

pigx-common/pigx-common-core/pom.xml

@@ -45,15 +45,6 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-		<!--feign 依赖-->
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-okhttp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
 		<!--hibernate-validator-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/sensitive/SensitiveSerialize.java

@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.google.common.base.Preconditions;
 import com.pig4cloud.pigx.common.core.util.DesensitizedUtils;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -49,7 +48,6 @@ public class SensitiveSerialize extends JsonSerializer<String> implements Contex
 	@Override
 	public void serialize(final String origin, final JsonGenerator jsonGenerator,
 						  final SerializerProvider serializerProvider) throws IOException {
-		Preconditions.checkNotNull(type, "Sensitive type enum should not be null.");
 		switch (type) {
 			case CHINESE_NAME:
 				jsonGenerator.writeString(DesensitizedUtils.chineseName(origin));

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

@@ -18,7 +18,7 @@
 package com.pig4cloud.pigx.common.core.util;
 
 
-import org.apache.commons.lang.StringUtils;
+import cn.hutool.core.util.StrUtil;
 
 /**
  * 脱敏工具类
@@ -120,7 +120,7 @@ public class DesensitizedUtils {
 		if (email == null) {
 			return null;
 		}
-		int index = StringUtils.indexOf(email, "@");
+		int index = StrUtil.indexOf(email, '@');
 		if (index <= 1) {
 			return email;
 		}

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

@@ -20,12 +20,12 @@
 package com.pig4cloud.pigx.common.core.util;
 
 import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.pig4cloud.pigx.common.core.exception.CheckedException;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -179,25 +179,25 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
 	public String getIP(HttpServletRequest request) {
 		Assert.notNull(request, "HttpServletRequest is null");
 		String ip = request.getHeader("X-Requested-For");
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getHeader("X-Forwarded-For");
 		}
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getHeader("Proxy-Client-IP");
 		}
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getHeader("WL-Proxy-Client-IP");
 		}
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getHeader("HTTP_CLIENT_IP");
 		}
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getHeader("HTTP_X_FORWARDED_FOR");
 		}
-		if (StringUtils.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
+		if (StrUtil.isBlank(ip) || UNKNOWN.equalsIgnoreCase(ip)) {
 			ip = request.getRemoteAddr();
 		}
-		return StringUtils.isBlank(ip) ? null : ip.split(",")[0];
+		return StrUtil.isBlank(ip) ? null : ip.split(",")[0];
 	}
 
 	/**

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFallbackFactory.java

@@ -1,45 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.Target;
-import feign.hystrix.FallbackFactory;
-import lombok.AllArgsConstructor;
-import org.springframework.cglib.proxy.Enhancer;
-
-/**
- * @author 冷冷
- * <p>
- * 默认 Fallback，避免写过多fallback类
- */
-@AllArgsConstructor
-public class PigxFallbackFactory<T> implements FallbackFactory<T> {
-	private final Target<T> target;
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public T create(Throwable cause) {
-		final Class<T> targetType = target.type();
-		final String targetName = target.name();
-		Enhancer enhancer = new Enhancer();
-		enhancer.setSuperclass(targetType);
-		enhancer.setUseCache(true);
-		enhancer.setCallback(new PigxFeignFallback<>(targetType, targetName, cause));
-		return (T) enhancer.create();
-	}
-}

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java

@@ -1,83 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package org.springframework.cloud.openfeign;
-
-import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
-import feign.FeignException;
-import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cglib.proxy.MethodInterceptor;
-import org.springframework.cglib.proxy.MethodProxy;
-import org.springframework.lang.Nullable;
-
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
-
-/**
- * @author lengleng
- * <p>
- * fallback 代理处理
- */
-@Slf4j
-@AllArgsConstructor
-public class PigxFeignFallback<T> implements MethodInterceptor {
-	private final Class<T> targetType;
-	private final String targetName;
-	private final Throwable cause;
-
-	@Nullable
-	@Override
-	@SneakyThrows
-	public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) {
-		Class<?> returnType = method.getReturnType();
-		if (R.class != returnType) {
-			return null;
-		}
-		FeignException exception = (FeignException) cause;
-
-		byte[] content = exception.content();
-
-		String str = StrUtil.str(content, StandardCharsets.UTF_8);
-
-		log.error("PigxFeignFallback:[{}.{}] serviceId:[{}] message:[{}]", targetType.getName(), method.getName(), targetName, str);
-		ObjectMapper objectMapper = SpringContextHolder.getBean(ObjectMapper.class);
-		return objectMapper.readValue(str, R.class);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		PigxFeignFallback<?> that = (PigxFeignFallback<?>) o;
-		return targetType.equals(that.targetType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(targetType);
-	}
-}

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxHystrixTargeter.java

@@ -1,96 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.Feign;
-import feign.Target;
-import feign.hystrix.FallbackFactory;
-import feign.hystrix.HystrixFeign;
-import feign.hystrix.SetterFactory;
-import org.springframework.lang.Nullable;
-
-/**
- * @author lengleng
- * <p>
- * 注入默认的 fallbackFactory
- */
-@SuppressWarnings("unchecked")
-class PigxHystrixTargeter implements Targeter {
-
-	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-						Target.HardCodedTarget<T> target) {
-		if (!(feign instanceof HystrixFeign.Builder)) {
-			return feign.target(target);
-		}
-		HystrixFeign.Builder builder = (HystrixFeign.Builder) feign;
-		SetterFactory setterFactory = getOptional(factory.getName(), context, SetterFactory.class);
-		if (setterFactory != null) {
-			builder.setterFactory(setterFactory);
-		}
-		Class<?> fallback = factory.getFallback();
-		if (fallback != void.class) {
-			return targetWithFallback(factory.getName(), context, target, builder, fallback);
-		}
-		Class<?> fallbackFactory = factory.getFallbackFactory();
-		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(factory.getName(), context, target, builder, fallbackFactory);
-		}
-
-		PigxFallbackFactory pigxFallbackFactory = new PigxFallbackFactory(target);
-		return (T) builder.target(target, pigxFallbackFactory);
-	}
-
-	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
-											Target.HardCodedTarget<T> target,
-											HystrixFeign.Builder builder,
-											Class<?> fallbackFactoryClass) {
-		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>)
-				getFromContext("fallbackFactory", feignClientName, context, fallbackFactoryClass, FallbackFactory.class);
-		return builder.target(target, fallbackFactory);
-	}
-
-
-	private <T> T targetWithFallback(String feignClientName, FeignContext context,
-									 Target.HardCodedTarget<T> target,
-									 HystrixFeign.Builder builder, Class<?> fallback) {
-		T fallbackInstance = getFromContext("fallback", feignClientName, context, fallback, target.type());
-		return builder.target(target, fallbackInstance);
-	}
-
-	private <T> T getFromContext(String fallbackMechanism, String feignClientName, FeignContext context, Class<?> beanType,
-								 Class<T> targetType) {
-		Object fallbackInstance = context.getInstance(feignClientName, beanType);
-		if (fallbackInstance == null) {
-			throw new IllegalStateException(String.format("No " + fallbackMechanism +
-					" instance of type %s found for feign client %s", beanType, feignClientName));
-		}
-
-		if (!targetType.isAssignableFrom(beanType)) {
-			throw new IllegalStateException(String.format(
-					"Incompatible " + fallbackMechanism + " instance. Fallback/fallbackFactory of " +
-							"type %s is not assignable to %s for feign client %s", beanType, targetType, feignClientName));
-		}
-		return (T) fallbackInstance;
-	}
-
-	@Nullable
-	private <T> T getOptional(String feignClientName, FeignContext context, Class<T> beanType) {
-		return context.getInstance(feignClientName, beanType);
-	}
-}

pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springframework.cloud.openfeign.PigxHystrixFeignTargeterConfiguration,\
   com.pig4cloud.pigx.common.security.component.GlobalExceptionHandlerResolver,\
   com.pig4cloud.pigx.common.security.component.PigxTokenEnhancer,\
   com.pig4cloud.pigx.common.security.service.PigxUserDetailsServiceImpl

pigx-common/pigx-common-sentinel/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.pig4cloud</groupId>
+		<artifactId>pigx-common</artifactId>
+		<version>3.4.0</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+	<artifactId>pigx-common-sentinel</artifactId>
+	<description>sentinel服务降级熔断、限流组件</description>
+	<dependencies>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+		</dependency>
+		<!--feign 依赖-->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+	</dependencies>
+</project>

pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/SentinelAutoConfigure.java

@@ -15,28 +15,27 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package org.springframework.cloud.openfeign;
+package com.pig4cloud.pigx.common.sentinel;
 
-import feign.hystrix.HystrixFeign;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager;
+import com.pig4cloud.pigx.common.sentinel.handle.PigxUrlBlockHandler;
+import com.pig4cloud.pigx.common.sentinel.parser.PigxHeaderRequestOriginParser;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @author lengleng
  * <p>
- * HystrixFeignTargeter 配置
+ * sentinel 配置
  */
 @Configuration
-@ConditionalOnClass(HystrixFeign.class)
-@ConditionalOnProperty("feign.hystrix.enabled")
-public class PigxHystrixFeignTargeterConfiguration {
+public class SentinelAutoConfigure {
 
-	@Bean
-	@Primary
-	public Targeter pigxFeignTargeter() {
-		return new PigxHystrixTargeter();
+	@PostConstruct
+	public void initWebCallbackManager() {
+		WebCallbackManager.setUrlBlockHandler(new PigxUrlBlockHandler());
+		WebCallbackManager.setRequestOriginParser(new PigxHeaderRequestOriginParser());
 	}
+
 }

pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/handle/PigxUrlBlockHandler.java

@@ -0,0 +1,50 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.sentinel.handle;
+
+import cn.hutool.http.ContentType;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
+import com.pig4cloud.pigx.common.core.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author lengleng
+ * @date 2019-10-11
+ * <p>
+ * 降级 限流策略
+ */
+@Slf4j
+public class PigxUrlBlockHandler implements UrlBlockHandler {
+	@Override
+	public void blocked(HttpServletRequest request, HttpServletResponse response, BlockException e) throws IOException {
+
+		log.error("sentinel 降级 资源名称{}", e.getRule().getResource(), e);
+
+		response.setContentType(ContentType.JSON.toString());
+		response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
+		response.getWriter().print(
+				JSONUtil.toJsonStr(R.failed(e.getMessage())));
+	}
+}

pigx-common/pigx-common-sentinel/src/main/java/com/pig4cloud/pigx/common/sentinel/parser/PigxHeaderRequestOriginParser.java

@@ -15,16 +15,32 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-/**
- * Hystrix 默认 fallback
- * <p>
- * DefaultProperties: https://github.com/Netflix/Hystrix/issues/1446
- *
- * @author L.cm
- */
-@NonNullApi
-@NonNullFields
-package com.pig4cloud.pigx.common.security.util;
+package com.pig4cloud.pigx.common.sentinel.parser;
 
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
+import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author lengleng
+ * @date 2019-10-11
+ * <p>
+ * sentinel 请求头解析判断
+ */
+public class PigxHeaderRequestOriginParser implements RequestOriginParser {
+	/**
+	 * 请求头获取allow
+	 */
+	private static final String ALLOW = "Allow";
+
+	/**
+	 * Parse the origin from given HTTP request.
+	 *
+	 * @param request HTTP request
+	 * @return parsed origin
+	 */
+	@Override
+	public String parseOrigin(HttpServletRequest request) {
+		return request.getHeader(ALLOW);
+	}
+}

pigx-common/pigx-common-sentinel/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+    com.pig4cloud.pigx.common.sentinel.SentinelAutoConfigure

pigx-common/pom.xml

@@ -42,6 +42,7 @@
 		<module>pigx-common-log</module>
 		<module>pigx-common-minio</module>
 		<module>pigx-common-security</module>
+		<module>pigx-common-sentinel</module>
 		<module>pigx-common-sequence</module>
 		<module>pigx-common-swagger</module>
 		<module>pigx-common-transaction</module>

pigx-gateway/pom.xml

@@ -73,6 +73,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
+		<!--sentinel 依赖-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-sentinel</artifactId>
+		</dependency>
 		<!--接口文档-->
 		<dependency>
 			<groupId>io.springfox</groupId>

pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/RouterFunctionConfiguration.java

@@ -17,7 +17,10 @@
 
 package com.pig4cloud.pigx.gateway.config;
 
-import com.pig4cloud.pigx.gateway.handler.*;
+import com.pig4cloud.pigx.gateway.handler.ImageCodeHandler;
+import com.pig4cloud.pigx.gateway.handler.SwaggerResourceHandler;
+import com.pig4cloud.pigx.gateway.handler.SwaggerSecurityHandler;
+import com.pig4cloud.pigx.gateway.handler.SwaggerUiHandler;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
@@ -36,7 +39,6 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
 @Configuration
 @AllArgsConstructor
 public class RouterFunctionConfiguration {
-	private final HystrixFallbackHandler hystrixFallbackHandler;
 	private final SwaggerResourceHandler swaggerResourceHandler;
 	private final SwaggerSecurityHandler swaggerSecurityHandler;
 	private final SwaggerUiHandler swaggerUiHandler;
@@ -45,16 +47,14 @@ public class RouterFunctionConfiguration {
 	@Bean
 	public RouterFunction routerFunction() {
 		return RouterFunctions.route(
-			RequestPredicates.path("/fallback")
-				.and(RequestPredicates.accept(MediaType.APPLICATION_JSON_UTF8)), hystrixFallbackHandler)
-			.andRoute(RequestPredicates.GET("/code")
-				.and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), imageCodeHandler)
-			.andRoute(RequestPredicates.GET("/swagger-resources")
-				.and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler)
-			.andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui")
-				.and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler)
-			.andRoute(RequestPredicates.GET("/swagger-resources/configuration/security")
-				.and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler);
+				RequestPredicates.path("/code")
+						.and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), imageCodeHandler)
+				.andRoute(RequestPredicates.GET("/swagger-resources")
+						.and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler)
+				.andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui")
+						.and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler)
+				.andRoute(RequestPredicates.GET("/swagger-resources/configuration/security")
+						.and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler);
 
 	}
 

pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/HystrixFallbackHandler.java

@@ -1,53 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.gateway.handler;
-
-import com.pig4cloud.pigx.common.core.util.R;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.server.HandlerFunction;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.Optional;
-
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR;
-
-/**
- * @author lengleng
- * @date 2018/7/5
- * Hystrix 降级处理
- */
-@Slf4j
-@Component
-public class HystrixFallbackHandler implements HandlerFunction<ServerResponse> {
-	@Override
-	public Mono<ServerResponse> handle(ServerRequest serverRequest) {
-		Optional<Object> originalUris = serverRequest.attribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
-
-		originalUris.ifPresent(originalUri -> log.error("网关执行请求:{}失败,hystrix服务降级处理", originalUri));
-
-		return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR.value())
-				.contentType(MediaType.APPLICATION_JSON_UTF8)
-				.body(BodyInserters.fromObject(R.failed("服务异常")));
-	}
-}

pigx-register/pom.xml

@@ -59,6 +59,10 @@
 			<version>0.10.5</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

pigx-upms/pigx-upms-api/pom.xml

@@ -44,5 +44,10 @@
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-extension</artifactId>
 		</dependency>
+		<!--feign-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-sentinel</artifactId>
+		</dependency>
 	</dependencies>
 </project>

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

@@ -77,6 +77,11 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-gateway</artifactId>
 		</dependency>
+		<!--sentinel 依赖-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-sentinel</artifactId>
+		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>

pom.xml

@@ -94,11 +94,6 @@
 			<artifactId>spring-boot-admin-starter-client</artifactId>
 			<version>${spring-boot-admin.version}</version>
 		</dependency>
-		<!--断路器依赖-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-		</dependency>
 		<!--Lombok-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>