From 435eae5ad01219c69cc4a5d5b0e34ac2d9e1f21d Mon Sep 17 00:00:00 2001
From: wjie <wangiegie@gmail.com>
Date: Wed, 11 Aug 2021 13:35:19 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20#I44W82=20tok?=
 =?UTF-8?q?en=E5=A4=B1=E6=95=88=E5=90=8E=20=E5=A4=84=E7=90=86=E5=90=8Epig-?=
 =?UTF-8?q?auth=20=E9=A1=B9=E7=9B=AE=E6=9C=AA=E6=8D=95=E8=8E=B7=E5=88=B0?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=94=99=E8=AF=AFjson=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E5=89=8D=E5=8F=B0=E8=BF=94=E5=9B=9E=E7=9A=84=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?500=E9=94=99=E8=AF=AF=20=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=88=B0=E5=A4=B1=E6=95=88=E6=8F=90=E7=A4=BAjson=20=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E7=99=BB=E5=BD=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/component/PigAuth2ExceptionSerializer.java  | 2 ++
 .../component/PigResourceServerAutoConfiguration.java    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java
index 469f7193..d4483d3c 100644
--- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java
+++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java
@@ -42,6 +42,8 @@ public class PigAuth2ExceptionSerializer extends StdSerializer<PigAuth2Exception
 		gen.writeObjectField("code", CommonConstants.FAIL);
 		gen.writeStringField("msg", value.getMessage());
 		gen.writeStringField("data", value.getErrorCode());
+		// 资源服务器会读取这个字段
+		gen.writeStringField("error", value.getMessage());
 		gen.writeEndObject();
 	}
 
diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java
index 42f06e67..b3b6af55 100644
--- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java
+++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java
@@ -75,9 +75,14 @@ public class PigResourceServerAutoConfiguration {
 			@Override
 			@SneakyThrows
 			public void handleError(ClientHttpResponse response) {
-				if (response.getRawStatusCode() != HttpStatus.BAD_REQUEST.value()) {
-					super.handleError(response);
+				// 当认证中心返回 400 或者 424 错误码不抛异常，交给资源服务自行处理
+				if (response.getRawStatusCode() == HttpStatus.FAILED_DEPENDENCY.value()
+						|| response.getRawStatusCode() == HttpStatus.BAD_REQUEST.value()) {
+					return;
 				}
+
+				// 原有异常处理逻辑
+				super.handleError(response);
 			}
 		});
 		return restTemplate;