From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
index df09516..8b432ad 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.config;
import feign.*;
-import feign.hystrix.HystrixFeign;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -18,8 +17,10 @@
* openfeign閰嶇疆绫�
*
* @author Lion Li
+ * @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎
*/
-@EnableFeignClients("com.ruoyi.**.feign")
+@Deprecated
+@EnableFeignClients("${feign.package}")
@Configuration
@ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class)
@@ -33,11 +34,6 @@
.writeTimeout(120, TimeUnit.SECONDS)
.connectionPool(new ConnectionPool())
.build();
- }
-
- @Bean
- public Feign.Builder feignBuilder() {
- return HystrixFeign.builder();
}
@Bean
@@ -60,4 +56,40 @@
return new Retryer.Default();
}
-}
\ No newline at end of file
+// /**
+// * 鑷畾涔夊紓甯歌В鐮佸櫒
+// * 鐢ㄤ簬鑷畾涔夎繑鍥炰綋寮傚父鐔旀柇
+// */
+// @Bean
+// public ErrorDecoder errorDecoder() {
+// return new CustomErrorDecoder();
+// }
+//
+//
+// /**
+// * 鑷畾涔夎繑鍥炰綋瑙ｇ爜鍣�
+// */
+// @Slf4j
+// public static class CustomErrorDecoder implements ErrorDecoder {
+//
+// @Override
+// public Exception decode(String methodKey, Response response) {
+// Exception exception = null;
+// try {
+// // 鑾峰彇鍘熷鐨勮繑鍥炲唴瀹�
+// String json = JsonUtils.toJsonString(response.body().asReader(StandardCharsets.UTF_8));
+// exception = new RuntimeException(json);
+// // 灏嗚繑鍥炲唴瀹瑰弽搴忓垪鍖栦负Result锛岃繖閲屽簲鏍规嵁鑷韩椤圭洰浣滀慨鏀�
+// AjaxResult result = JsonUtils.parseObject(json, AjaxResult.class);
+// // 涓氬姟寮傚父鎶涘嚭绠�鍗曠殑 RuntimeException锛屼繚鐣欏師鏉ラ敊璇俊鎭�
+// if (result.getCode() != 200) {
+// exception = new RuntimeException(result.getMsg());
+// }
+// } catch (IOException e) {
+// log.error(e.getMessage(), e);
+// }
+// return exception;
+// }
+// }
+
+}
--
Gitblit v1.9.3