diff --git a/src/main/java/me/zhyd/oauth/constant/Keys.java b/src/main/java/me/zhyd/oauth/constant/Keys.java index f56d96dfd16c4c78ae656b1b04bca97bd6820716..ae7e5aa4f3f2ced407e3c52d563e9cf52b227540 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 d99133e06c8a4d38dfffa2ef4a25b2eb5491bb13..533f49cd0b65af5ae6b4510dc262aa8f654b5054 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 d11b9042ea417f3cfa29bc46d0bd68ebf8ca6f96..0f0cf07614fbb1b30b5c2a9cf88ed2d7b676c14a 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 06d69cd4ea98f8a2076da1e743944744250d19f5..459f16da06f3066ae150f0d341e6f13e120da21a 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 9c41ac597f18c01910946189fe59b3f7e57bffce..2f2f5039502ee57a690e29ac919d54af6d034f4b 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 01717ea9c4f93496be2242a1a0a81467fa0607bb..7a523aeb9969d20a64660e871d0edb4fdb349a2e 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 420fb3c42cf2243fec3d8589e66a38cfd336e328..454d73f479221e7f9779f1f27c0b58897f0b8e57 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 3d4c99e02fcf53a8f404203656cacf67904d5f97..813a49506a40ed49cf698e8689344f09f0b88f7f 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 48ad67a137c0e639716d739d0c11ea2379fa756a..d77df58dc441ddbef6ac21e62e9fd32f115bcedb 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")); } }