From 7f0f1e17d2c16f0799d667b4bbd5aca59d2e6e35 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 9 Apr 2020 22:58:34 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E7=AD=89=E5=BE=85simple-http?= =?UTF-8?q?=E5=8F=91=E7=89=88=EF=BC=8C=20=E8=A7=A3=E5=86=B3=E4=BD=BF?= =?UTF-8?q?=E7=94=A8apache-httpclient=E6=97=B6=E7=9A=84403bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../me/zhyd/oauth/config/AuthDefaultSource.java | 2 +- .../java/me/zhyd/oauth/request/AuthJdRequest.java | 13 +------------ .../java/me/zhyd/oauth/utils/GlobalAuthUtils.java | 2 +- src/main/java/me/zhyd/oauth/utils/UrlBuilder.java | 2 +- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 61db110..0b583b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.zhyd.oauth JustAuth - 1.15.0-alpha + 1.15.0 JustAuth https://gitee.com/yadong.zhang/JustAuth @@ -60,7 +60,7 @@ 2.20 1.6 false - 1.0 + 1.0.2 1.18.10 4.11 1.2.62 diff --git a/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java b/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java index bc20555..8ed7488 100644 --- a/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java +++ b/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java @@ -755,7 +755,7 @@ public enum AuthDefaultSource implements AuthSource { /** * 京东 * - * @since 1.15.0-alpha + * @since 1.15.0 */ JD { @Override diff --git a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java index fe6d410..0bc9a98 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java @@ -22,10 +22,9 @@ import java.util.Map; /** * 京东登录 - * link: http://open.jd.com/home/home#/doc/common?listId=717 * * @author harry.lee (harryleexyz@qq.com) - * @since + * @since 1.15.0 */ public class AuthJdRequest extends AuthDefaultRequest { @@ -59,15 +58,6 @@ public class AuthJdRequest extends AuthDefaultRequest { .build(); } - /** - * link: http://jos.jd.com/api/showTools.htm?id=3051&groupId=106 - * postUrl: https://api.jd.com/routerjson?v=2.0&method=jingdong.user.getUserInfoByOpenId - * &app_key=x&access_token=x&360buy_param_json={"openId":"x"} - * ×tamp=2019-09-11 11:12:26&sign=DB5278CD12443BEA22C5E5EA05A30D2B - * - * @param authToken token信息 - * @return AuthUser - */ @Override protected AuthUser getUserInfo(AuthToken authToken) { UrlBuilder urlBuilder = UrlBuilder.fromBaseUrl(source.userInfo()) @@ -99,7 +89,6 @@ public class AuthJdRequest extends AuthDefaultRequest { /** * 个人用户无法申请应用 * 暂时只能参考官网给出的返回结果解析 - * link: https://open.jd.com/home/home#/doc/api?apiCateId=106&apiId=3051&apiName=jingdong.user.getUserInfoByOpenId * * @param object 请求返回结果 * @return data JSONObject diff --git a/src/main/java/me/zhyd/oauth/utils/GlobalAuthUtils.java b/src/main/java/me/zhyd/oauth/utils/GlobalAuthUtils.java index c0e95f7..2e9e10c 100644 --- a/src/main/java/me/zhyd/oauth/utils/GlobalAuthUtils.java +++ b/src/main/java/me/zhyd/oauth/utils/GlobalAuthUtils.java @@ -284,7 +284,7 @@ public class GlobalAuthUtils { * @param appSecret 京东应用密钥 * @param params 签名参数 * @return 签名后的字符串 - * @since 1.15.0-alpha + * @since 1.15.0 */ public static String generateJdSignature(String appSecret, Map params) { Map treeMap = new TreeMap<>(params); diff --git a/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java index b8d8708..741f345 100644 --- a/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java +++ b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java @@ -40,7 +40,7 @@ public class UrlBuilder { * 只读的参数Map * * @return unmodifiable Map - * @since 1.15.0-alpha + * @since 1.15.0 */ public Map getReadOnlyParams() { return Collections.unmodifiableMap(params); -- GitLab