From 4a1483d268b2fd2d77b5f8671202a55ff8bf0024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Thu, 11 Sep 2025 17:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=83=A8=E5=88=86=E9=AD=94?= =?UTF-8?q?=E6=B3=95=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhyd/oauth/constant/Keys.java | 2 ++ .../me/zhyd/oauth/request/AbstractAuthDingtalkRequest.java | 4 ++-- .../oauth/request/AbstractAuthWeChatEnterpriseRequest.java | 4 ++-- .../java/me/zhyd/oauth/request/AuthQQMiniProgramRequest.java | 4 ++-- .../oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java | 4 ++-- src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java | 4 ++-- .../java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java | 4 ++-- .../me/zhyd/oauth/request/AuthWechatMiniProgramRequest.java | 4 ++-- src/main/java/me/zhyd/oauth/request/AuthXmlyRequest.java | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/constant/Keys.java b/src/main/java/me/zhyd/oauth/constant/Keys.java index f56d96d..ae7e5aa 100644 --- a/src/main/java/me/zhyd/oauth/constant/Keys.java +++ b/src/main/java/me/zhyd/oauth/constant/Keys.java @@ -59,4 +59,6 @@ public interface Keys { String VARIANT__OPEN_ID = "open_id"; String VARIANT__UNION_ID = "union_id"; String VARIANT__USER_ID = "user_id"; + String VARIANT__ERRCODE = "errcode"; + String VARIANT__ERRMSG = "errmsg"; } diff --git a/src/main/java/me/zhyd/oauth/request/AbstractAuthDingtalkRequest.java b/src/main/java/me/zhyd/oauth/request/AbstractAuthDingtalkRequest.java index d99133e..533f49c 100644 --- a/src/main/java/me/zhyd/oauth/request/AbstractAuthDingtalkRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AbstractAuthDingtalkRequest.java @@ -46,8 +46,8 @@ public abstract class AbstractAuthDingtalkRequest extends AuthDefaultRequest { param.put("tmp_auth_code", code); String response = new HttpUtils(config.getHttpConfig()).post(userInfoUrl(authToken), param.toJSONString()).getBody(); JSONObject object = JSON.parseObject(response); - if (object.getIntValue("errcode") != 0) { - throw new AuthException(object.getString("errmsg")); + if (object.getIntValue(Keys.VARIANT__ERRCODE) != 0) { + throw new AuthException(object.getString(Keys.VARIANT__ERRMSG)); } object = object.getJSONObject("user_info"); AuthToken token = AuthToken.builder() diff --git a/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java b/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java index d11b904..0f0cf07 100644 --- a/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java @@ -83,8 +83,8 @@ public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultReq private JSONObject checkResponse(String response) { JSONObject object = JSONObject.parseObject(response); - if (object.containsKey("errcode") && object.getIntValue("errcode") != 0) { - throw new AuthException(object.getString("errmsg"), source); + if (object.containsKey(Keys.VARIANT__ERRCODE) && object.getIntValue(Keys.VARIANT__ERRCODE) != 0) { + throw new AuthException(object.getString(Keys.VARIANT__ERRMSG), source); } return object; diff --git a/src/main/java/me/zhyd/oauth/request/AuthQQMiniProgramRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQQMiniProgramRequest.java index 06d69cd..459f16d 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQQMiniProgramRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQQMiniProgramRequest.java @@ -86,9 +86,9 @@ public class AuthQQMiniProgramRequest extends AuthDefaultRequest { @SuppressWarnings("SpellCheckingInspection") private static class JSCode2SessionResponse { - @JSONField(name = "errcode") + @JSONField(name = Keys.VARIANT__ERRCODE) private int errorCode; - @JSONField(name = "errmsg") + @JSONField(name = Keys.VARIANT__ERRMSG) private String errorMsg; @JSONField(name = "session_key") private String sessionKey; diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java index 9c41ac5..2f2f503 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java @@ -116,8 +116,8 @@ public class AuthWeChatEnterpriseThirdQrcodeRequest extends AbstractAuthWeChatEn private JSONObject checkResponse(String response) { JSONObject object = JSONObject.parseObject(response); - if (object.containsKey("errcode") && object.getIntValue("errcode") != 0) { - throw new AuthException(object.getString("errmsg"), source); + if (object.containsKey(Keys.VARIANT__ERRCODE) && object.getIntValue(Keys.VARIANT__ERRCODE) != 0) { + throw new AuthException(object.getString(Keys.VARIANT__ERRMSG), source); } return object; } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java index 01717ea..7a523ae 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java @@ -93,8 +93,8 @@ public class AuthWeChatMpRequest extends AuthDefaultRequest { * @param object 请求响应内容 */ private void checkResponse(JSONObject object) { - if (object.containsKey("errcode")) { - throw new AuthException(object.getIntValue("errcode"), object.getString("errmsg")); + if (object.containsKey(Keys.VARIANT__ERRCODE)) { + throw new AuthException(object.getIntValue(Keys.VARIANT__ERRCODE), object.getString(Keys.VARIANT__ERRMSG)); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java index 420fb3c..454d73f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java @@ -83,8 +83,8 @@ public class AuthWeChatOpenRequest extends AuthDefaultRequest { * @param object 请求响应内容 */ private void checkResponse(JSONObject object) { - if (object.containsKey("errcode")) { - throw new AuthException(object.getIntValue("errcode"), object.getString("errmsg")); + if (object.containsKey(Keys.VARIANT__ERRCODE)) { + throw new AuthException(object.getIntValue(Keys.VARIANT__ERRCODE), object.getString(Keys.VARIANT__ERRMSG)); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWechatMiniProgramRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWechatMiniProgramRequest.java index 3d4c99e..813a495 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWechatMiniProgramRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWechatMiniProgramRequest.java @@ -86,9 +86,9 @@ public class AuthWechatMiniProgramRequest extends AuthDefaultRequest { @SuppressWarnings("SpellCheckingInspection") private static class JSCode2SessionResponse { - @JSONField(name = "errcode") + @JSONField(name = Keys.VARIANT__ERRCODE) private int errorCode; - @JSONField(name = "errmsg") + @JSONField(name = Keys.VARIANT__ERRMSG) private String errorMsg; @JSONField(name = "session_key") private String sessionKey; diff --git a/src/main/java/me/zhyd/oauth/request/AuthXmlyRequest.java b/src/main/java/me/zhyd/oauth/request/AuthXmlyRequest.java index 48ad67a..d77df58 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthXmlyRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthXmlyRequest.java @@ -118,7 +118,7 @@ public class AuthXmlyRequest extends AuthDefaultRequest { * @param object 接口返回的结果 */ private void checkResponse(JSONObject object) { - if (object.containsKey("errcode")) { + if (object.containsKey(Keys.VARIANT__ERRCODE)) { throw new AuthException(object.getIntValue("error_no"), object.getString("error_desc")); } } -- Gitee