From 79574a66e52d45517d9404594d50e547f9b7ea39 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Sat, 18 May 2019 11:26:59 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=20=E6=B3=A8=E9=87=8A=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                       |  2 +-
 .../java/me/zhyd/oauth/config/AuthConfig.java   | 11 +++++++++++
 src/main/java/me/zhyd/oauth/consts/ApiUrl.java  | 17 ++++++++++++++++-
 .../me/zhyd/oauth/model/AuthUserGender.java     |  8 ++++++--
 .../java/me/zhyd/oauth/AuthRequestTest.java     | 13 +++++++++++++
 5 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5e20f53..88abf71 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ authRequest.login("code");
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/alipay.png" width="20">  |  [AuthAlipayRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java)  |  <a href="https://alipay.open.taobao.com/docs/doc.htm?spm=a219a.7629140.0.0.336d4b70GUKXOl&treeId=193&articleId=105809&docType=1" target="_blank">参考文档</a> |
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/qq.png" width="20">  |  [AuthQqRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java)  |  <a href="http://wiki.connect.qq.com/" target="_blank">参考文档</a>  |
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/csdn.png" width="20">  |  [AuthCsdnRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java)  |  待续 |
-|  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/wechats.png" width="20">  |  [AuthWeChatRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java)   |  待续  |
+|  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/wechats.png" width="20">  |  [AuthWeChatRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java)   |  <a href="https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419316505&token=&lang=zh_CN" target="_blank">参考文档</a>  |
 
 ## 后续开发计划
 
diff --git a/src/main/java/me/zhyd/oauth/config/AuthConfig.java b/src/main/java/me/zhyd/oauth/config/AuthConfig.java
index 6b0cb4d..df47d04 100644
--- a/src/main/java/me/zhyd/oauth/config/AuthConfig.java
+++ b/src/main/java/me/zhyd/oauth/config/AuthConfig.java
@@ -6,6 +6,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 /**
+ * JustAuth配置类
+ *
  * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
  * @version 1.0
  * @since 1.8
@@ -15,8 +17,17 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class AuthConfig {
+
+    /**
+     * 客户端id：对应个平台的appKey
+     */
     private String clientId;
+
+    /**
+     * 客户端Secret：对应个平台的appSecret
+     */
     private String clientSecret;
+
     /**
      * 登录成功后的回调地址
      */
diff --git a/src/main/java/me/zhyd/oauth/consts/ApiUrl.java b/src/main/java/me/zhyd/oauth/consts/ApiUrl.java
index 7cff8e2..993dadf 100644
--- a/src/main/java/me/zhyd/oauth/consts/ApiUrl.java
+++ b/src/main/java/me/zhyd/oauth/consts/ApiUrl.java
@@ -356,18 +356,33 @@ public enum ApiUrl {
 
         @Override
         public String refresh() {
-            return  "https://api.weixin.qq.com/sns/oauth2/refresh_token";
+            return "https://api.weixin.qq.com/sns/oauth2/refresh_token";
         }
     };
 
+    /**
+     * 授权的api
+     */
     public abstract String authorize();
 
+    /**
+     * 获取accessToken的api
+     */
     public abstract String accessToken();
 
+    /**
+     * 获取用户信息的api
+     */
     public abstract String userInfo();
 
+    /**
+     * 取消授权的api
+     */
     public abstract String revoke();
 
+    /**
+     * 刷新授权的api
+     */
     public abstract String refresh();
 
 }
diff --git a/src/main/java/me/zhyd/oauth/model/AuthUserGender.java b/src/main/java/me/zhyd/oauth/model/AuthUserGender.java
index f708a6d..be3a988 100644
--- a/src/main/java/me/zhyd/oauth/model/AuthUserGender.java
+++ b/src/main/java/me/zhyd/oauth/model/AuthUserGender.java
@@ -1,5 +1,7 @@
 package me.zhyd.oauth.model;
 
+import java.util.Arrays;
+
 /**
  * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
  * @version 1.0
@@ -19,10 +21,12 @@ public enum AuthUserGender {
         if (code == null) {
             return UNKNOW;
         }
-        if ("m".equals(code) || "男".equals(code) || "1".equals(code) || "male".equalsIgnoreCase(code) || "F".equalsIgnoreCase(code)) {
+        String[] males = {"m", "男", "1", "male", "F"};
+        if (Arrays.asList(males).contains(code)) {
             return MALE;
         }
-        if ("f".equals(code) || "女".equals(code) || "0".equals(code) || "female".equalsIgnoreCase(code)) {
+        String[] females = {"f", "女", "0", "female"};
+        if (Arrays.asList(females).contains(code)) {
             return FEMALE;
         }
         return UNKNOW;
diff --git a/src/test/java/me/zhyd/oauth/AuthRequestTest.java b/src/test/java/me/zhyd/oauth/AuthRequestTest.java
index 8b67f23..8e32bf7 100644
--- a/src/test/java/me/zhyd/oauth/AuthRequestTest.java
+++ b/src/test/java/me/zhyd/oauth/AuthRequestTest.java
@@ -116,6 +116,19 @@ public class AuthRequestTest {
         authRequest.login("code");
     }
 
+    @Test
+    public void qqTest() {
+        AuthRequest authRequest = new AuthQqRequest(AuthConfig.builder()
+                .clientId("clientId")
+                .clientSecret("clientSecret")
+                .redirectUri("redirectUri")
+                .build());
+        // 返回授权页面，可自行调整
+        String url = authRequest.authorize();
+        // 授权登录后会返回一个code，用这个code进行登录
+        AuthResponse login = authRequest.login("code");
+    }
+
     @Test
     public void wechatTest() {
         AuthRequest authRequest = new AuthWeChatRequest(AuthConfig.builder()
-- 
GitLab