✨ 合并https://gitee.com/yadong.zhang/JustAuth/pulls/10，增加京东登录

README.en-US.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven Central-1.14.0-blue.svg" ></img>
+		<img src="https://img.shields.io/badge/Maven Central-1.15.0-alpha-blue.svg" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api Docs-1.14.0-orange.svg" ></img>
+		<img src="https://img.shields.io/badge/Api Docs-1.15.0-alpha-orange.svg" ></img>
 	</a>
 	<a target="_blank" href="https://docs.justauth.whnb.wang" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -97,7 +97,7 @@ These artifacts are available from Maven Central:
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.14.0</version>
+    <version>1.15.0-alpha</version>
 </dependency>
 ```
 - Using JustAuth

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven Central-1.14.0-blue.svg" ></img>
+		<img src="https://img.shields.io/badge/Maven Central-1.15.0-alpha-blue.svg" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api Docs-1.14.0-orange.svg" ></img>
+		<img src="https://img.shields.io/badge/Api Docs-1.15.0-alpha-orange.svg" ></img>
 	</a>
 	<a target="_blank" href="https://docs.justauth.whnb.wang" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>
@@ -97,7 +97,7 @@ JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.14.0</version>
+    <version>1.15.0-alpha</version>
 </dependency>
 ```
 - 调用api

bin/version.txt

-1.14.0
+1.15.0-alpha

docs/README.md

@@ -9,7 +9,7 @@
 </p>
 <p align="center">
 	<a target="_blank" href="https://search.maven.org/search?q=JustAuth">
-		<img src="https://img.shields.io/badge/Maven Central-1.14.0-blue.svg" ></img>
+		<img src="https://img.shields.io/badge/Maven Central-1.15.0-alpha-blue.svg" ></img>
 	</a>
 	<a target="_blank" href="https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE">
 		<img src="https://img.shields.io/apm/l/vim-mode.svg?color=yellow" ></img>
@@ -18,7 +18,7 @@
 		<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" ></img>
 	</a>
 	<a target="_blank" href="https://apidoc.gitee.com/yadong.zhang/JustAuth/" title="API文档">
-		<img src="https://img.shields.io/badge/Api Docs-1.14.0-orange.svg" ></img>
+		<img src="https://img.shields.io/badge/Api Docs-1.15.0-alpha-orange.svg" ></img>
 	</a>
 	<a target="_blank" href="https://docs.justauth.whnb.wang" title="参考文档">
 		<img src="https://img.shields.io/badge/Docs-latest-blueviolet.svg" ></img>

docs/_coverpage.md

 
 ![](_media/justauth@0,25x.png)
-# JustAuth <small>1.14.0</small>
+# JustAuth <small>1.15.0-alpha</small>
 
 <strong>史上最全的整合第三方登录的开源库</strong>
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>me.zhyd.oauth</groupId>
   <artifactId>JustAuth</artifactId>
-  <version>1.14.0</version>
+  <version>1.15.0-alpha</version>
 
   <name>JustAuth</name>
   <url>https://gitee.com/yadong.zhang/JustAuth</url>

src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java

@@ -731,7 +731,7 @@ public enum AuthDefaultSource implements AuthSource {
      *
      * @since 1.14.0
      */
-    FEISHU{
+    FEISHU {
         @Override
         public String authorize() {
             return "https://open.feishu.cn/connect/qrconnect/page/sso/";
@@ -751,5 +751,31 @@ public enum AuthDefaultSource implements AuthSource {
         public String refresh() {
             return "https://open.feishu.cn/connect/qrconnect/oauth2/access_token/";
         }
+    },
+    /**
+     * 京东
+     *
+     * @since 1.15.0-alpha
+     */
+    JD {
+        @Override
+        public String authorize() {
+            return "https://open-oauth.jd.com/oauth2/to_login";
+        }
+
+        @Override
+        public String accessToken() {
+                return "https://open-oauth.jd.com/oauth2/access_token";
+        }
+
+        @Override
+        public String userInfo() {
+            return "https://api.jd.com/routerjson";
+        }
+
+        @Override
+        public String refresh() {
+            return "https://open-oauth.jd.com/oauth2/refresh_token";
+        }
     }
 }

src/main/java/me/zhyd/oauth/request/AuthJdRequest.java

+package me.zhyd.oauth.request;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xkcoding.http.HttpUtil;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.config.AuthDefaultSource;
+import me.zhyd.oauth.enums.AuthResponseStatus;
+import me.zhyd.oauth.enums.AuthUserGender;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.utils.GlobalAuthUtils;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 京东登录
+ * link: http://open.jd.com/home/home#/doc/common?listId=717
+ *
+ * @author harry.lee (harryleexyz@qq.com)
+ * @since
+ */
+public class AuthJdRequest extends AuthDefaultRequest {
+
+    public AuthJdRequest(AuthConfig config) {
+        super(config, AuthDefaultSource.JD);
+    }
+
+    public AuthJdRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthDefaultSource.JD, authStateCache);
+    }
+
+    @Override
+    protected AuthToken getAccessToken(AuthCallback authCallback) {
+
+        Map<String, String> params = new HashMap<>(5);
+        params.put("app_key", config.getClientId());
+        params.put("app_secret", config.getClientSecret());
+        params.put("grant_type", "authorization_code");
+        params.put("code", authCallback.getCode());
+        String response = HttpUtil.post(source.accessToken(), params, false);
+        JSONObject object = JSONObject.parseObject(response);
+
+        this.checkResponse(object);
+
+        return AuthToken.builder()
+            .accessToken(object.getString("access_token"))
+            .expireIn(object.getIntValue("expires_in"))
+            .refreshToken(object.getString("refresh_token"))
+            .scope(object.getString("scope"))
+            .openId(object.getString("open_id"))
+            .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"}
+     * &timestamp=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())
+            .queryParam("access_token", authToken.getAccessToken())
+            .queryParam("app_key", config.getClientId())
+            .queryParam("method", "jingdong.user.getUserInfoByOpenId")
+            .queryParam("360buy_param_json", "{\"openId\":\"" + authToken.getOpenId() + "\"}")
+            .queryParam("timestamp", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+            .queryParam("v", "2.0");
+        urlBuilder.queryParam("sign", GlobalAuthUtils.generateJdSignature(config.getClientSecret(), urlBuilder.getReadOnlyParams()));
+        String response = HttpUtil.post(urlBuilder.build(true));
+        JSONObject object = JSONObject.parseObject(response);
+
+        this.checkResponse(object);
+
+        JSONObject data = this.getUserDataJsonObject(object);
+
+        return AuthUser.builder()
+            .uuid(authToken.getOpenId())
+            .username(data.getString("nickName"))
+            .nickname(data.getString("nickName"))
+            .avatar(data.getString("imageUrl"))
+            .gender(AuthUserGender.getRealGender(data.getString("gendar")))
+            .token(authToken)
+            .source(source.toString())
+            .build();
+    }
+
+    /**
+     * 个人用户无法申请应用
+     * 暂时只能参考官网给出的返回结果解析
+     * link: https://open.jd.com/home/home#/doc/api?apiCateId=106&apiId=3051&apiName=jingdong.user.getUserInfoByOpenId
+     *
+     * @param object 请求返回结果
+     * @return data JSONObject
+     */
+    private JSONObject getUserDataJsonObject(JSONObject object) {
+        return object.getJSONObject("jingdong_user_getUserInfoByOpenId_response")
+            .getJSONObject("getuserinfobyappidandopenid_result")
+            .getJSONObject("data");
+    }
+
+    @Override
+    public AuthResponse refresh(AuthToken oldToken) {
+        Map<String, String> params = new HashMap<>(5);
+        params.put("app_key", config.getClientId());
+        params.put("app_secret", config.getClientSecret());
+        params.put("grant_type", "refresh_token");
+        params.put("refresh_token", oldToken.getRefreshToken());
+        String response = HttpUtil.post(source.refresh(), params, false);
+        JSONObject object = JSONObject.parseObject(response);
+
+        this.checkResponse(object);
+
+        return AuthResponse.builder()
+            .code(AuthResponseStatus.SUCCESS.getCode())
+            .data(AuthToken.builder()
+                .accessToken(object.getString("access_token"))
+                .expireIn(object.getIntValue("expires_in"))
+                .refreshToken(object.getString("refresh_token"))
+                .scope(object.getString("scope"))
+                .openId(object.getString("open_id"))
+                .build())
+            .build();
+    }
+
+    private void checkResponse(JSONObject object) {
+        if (object.containsKey("error_response")) {
+            throw new AuthException(object.getJSONObject("error_response").getString("zh_desc"));
+        }
+    }
+
+    @Override
+    public String authorize(String state) {
+        return UrlBuilder.fromBaseUrl(source.authorize())
+            .queryParam("app_key", config.getClientId())
+            .queryParam("response_type", "code")
+            .queryParam("redirect_uri", config.getRedirectUri())
+            .queryParam("scope", "snsapi_base")
+            .queryParam("state", getRealState(state))
+            .build();
+    }
+
+}

src/main/java/me/zhyd/oauth/utils/GlobalAuthUtils.java

@@ -122,6 +122,9 @@ public class GlobalAuthUtils {
      * @return str
      */
     public static String parseMapToString(Map<String, String> params, boolean encode) {
+        if (null == params || params.isEmpty()) {
+            return "";
+        }
         List<String> paramList = new ArrayList<>();
         params.forEach((k, v) -> {
             if (null == v) {
@@ -208,10 +211,7 @@ public class GlobalAuthUtils {
      * @return BASE64 encoded signature string
      */
     public static String generateTwitterSignature(Map<String, String> params, String method, String baseUrl, String apiSecret, String tokenSecret) {
-        TreeMap<String, String> map = new TreeMap<>();
-        for (Map.Entry<String, String> e : params.entrySet()) {
-            map.put(urlEncode(e.getKey()), e.getValue());
-        }
+        TreeMap<String, String> map = new TreeMap<>(params);
         String str = parseMapToString(map, true);
         String baseStr = method.toUpperCase() + "&" + urlEncode(baseUrl) + "&" + urlEncode(str);
         String signKey = apiSecret + "&" + (StringUtils.isEmpty(tokenSecret) ? "" : tokenSecret);
@@ -234,10 +234,7 @@ public class GlobalAuthUtils {
      * @return Signature
      */
     public static String generateElemeSignature(String appKey, String secret, long timestamp, String action, String token, Map<String, Object> parameters) {
-        final Map<String, Object> sorted = new TreeMap<>();
-        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
-            sorted.put(entry.getKey(), entry.getValue());
-        }
+        final Map<String, Object> sorted = new TreeMap<>(parameters);
         sorted.put("app_key", appKey);
         sorted.put("timestamp", timestamp);
         StringBuffer string = new StringBuffer();
@@ -250,14 +247,14 @@ public class GlobalAuthUtils {
     }
 
     /**
-     * MD5加密饿了么请求的Signature
+     * MD5加密
      * <p>
      * 代码copy并修改自：https://coding.net/u/napos_openapi/p/eleme-openapi-java-sdk/git/blob/master/src/main/java/eleme/openapi/sdk/utils/SignatureUtil.java
      *
-     * @param str 饿了么请求的Signature
+     * @param str 待加密的字符串
      * @return md5 str
      */
-    private static String md5(String str) {
+    public static String md5(String str) {
         MessageDigest md = null;
         StringBuilder buffer = null;
         try {
@@ -274,4 +271,32 @@ public class GlobalAuthUtils {
         return null == buffer ? "" : buffer.toString();
     }
 
+    /**
+     * 生成京东宙斯平台的签名字符串
+     * 宙斯签名规则过程如下:
+     * 将所有请求参数按照字母先后顺序排列，例如将access_token,app_key,method,timestamp,v 排序为access_token,app_key,method,timestamp,v
+     * 1.把所有参数名和参数值进行拼接，例如：access_tokenxxxapp_keyxxxmethodxxxxxxtimestampxxxxxxvx
+     * 2.把appSecret夹在字符串的两端，例如：appSecret+XXXX+appSecret
+     * 3.使用MD5进行加密，再转化成大写
+     * link: http://open.jd.com/home/home#/doc/common?listId=890
+     * link: https://github.com/pingjiang/jd-open-api-sdk-src/blob/master/src/main/java/com/jd/open/api/sdk/DefaultJdClient.java
+     *
+     * @param appSecret 京东应用密钥
+     * @param params    签名参数
+     * @return 签名后的字符串
+     * @since 1.15.0-alpha
+     */
+    public static String generateJdSignature(String appSecret, Map<String, Object> params) {
+        Map<String, Object> treeMap = new TreeMap<>(params);
+        StringBuilder signBuilder = new StringBuilder(appSecret);
+        for (Map.Entry<String, Object> entry : treeMap.entrySet()) {
+            String name = entry.getKey();
+            String value = String.valueOf(entry.getValue());
+            if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(value)) {
+                signBuilder.append(name).append(value);
+            }
+        }
+        signBuilder.append(appSecret);
+        return md5(signBuilder.toString()).toUpperCase();
+    }
 }

src/main/java/me/zhyd/oauth/utils/UrlBuilder.java

@@ -4,6 +4,7 @@ import com.xkcoding.http.util.MapUtil;
 import com.xkcoding.http.util.StringUtil;
 import lombok.Setter;
 
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -35,6 +36,16 @@ public class UrlBuilder {
         return builder;
     }
 
+    /**
+     * 只读的参数Map
+     *
+     * @return unmodifiable Map
+     * @since 1.15.0-alpha
+     */
+    public Map<String, Object> getReadOnlyParams() {
+        return Collections.unmodifiableMap(params);
+    }
+
     /**
      * 添加参数
      *