🔖 发布1.5.1版本。注意：1.5.0版本因特殊原因已不可用！

✨ 增加小米登录支持

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.4.0-blue.svg" ></img>
+		<img src="https://img.shields.io/badge/Maven Central-1.5.1-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>
@@ -35,11 +35,12 @@
             <td align="center" width="200"><a href="#授权facebook"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/facebook.png" width="20"></a></td>
             <td align="center" width="200"><a href="#授权抖音"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/douyin.png" width="20"></a></td>
             <td align="center" width="200"><a href="#授权领英"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/linkedin.png" width="20"></a></td>
+            <td align="center" width="200"><a href="#授权微软"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/microsoft.png" width="20"></a></td>
+            <td align="center" width="200"><a href="#授权小米"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/mi.png" width="20"></a></td>
             <td align="center" width="200"><a href="#授权csdn"><img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/csdn.png" width="20"></a></td>
         </tr>
     </table>
 </center>
-
 -------------------------------------------------------------------------------
 
 
@@ -62,7 +63,7 @@ JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具
 <dependency>
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.1</version>
 </dependency>
 ```
 - 调用api
@@ -105,6 +106,8 @@ authRequest.login("code");
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/facebook.png" width="20">  |  [AuthFacebookRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java)   |  <a href="https://developers.facebook.com/docs/facebook-login/manually-build-a-login-flow" target="_blank">参考文档</a>  |
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/douyin.png" width="20">  |  [AuthDouyinRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java)   |  <a href="https://www.douyin.com/platform/doc" target="_blank">参考文档</a>  |
 |  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/linkedin.png" width="20">  |  [AuthLinkedinRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java)   |  <a href="https://docs.microsoft.com/zh-cn/linkedin/shared/authentication/authorization-code-flow?context=linkedin/context" target="_blank">参考文档</a>  |
+|  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/microsoft.png" width="20">  | [AuthMicrosoftRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java) | <a href="https://docs.microsoft.com/zh-cn/graph/auth/" target="_blank">参考文档</a> |
+|  <img src="https://gitee.com/yadong.zhang/static/raw/master/JustAuth/mi.png" width="20">  | [AuthMiRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java) | <a href="https://dev.mi.com/console/doc/detail?pId=711" 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)  |  无 |
 
 _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经下线。如果以前申请过的应用，可以继续使用，但是不再支持申请新的应用。so, 本项目中的CSDN登录只能针对少部分用户使用了_
@@ -130,6 +133,8 @@ _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经
 
 [YurunOAuthLogin](https://gitee.com/yurunsoft/YurunOAuthLogin): PHP 第三方登录授权 SDK
 
+[阿里妈妈MUX倾力打造的矢量图标库-iconfont](https://www.iconfont.cn/search/index): 本文档中的图标大部分取自该平台
+
 
 ## 参考授权图例
 
@@ -197,6 +202,11 @@ _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经
 
 ![授权领英登录](https://images.gitee.com/uploads/images/2019/0527/152207_a6342979_784199.png "授权领英登录")
 
+
+#### 授权微软
+
+#### 授权小米
+
 #### 授权csdn
 
 _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经下线。如果以前申请过的应用，可以继续使用，但是不再支持申请新的应用。so, 本项目中的CSDN登录只能针对少部分用户使用了_
@@ -208,7 +218,7 @@ _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经
 | <img src="https://gitee.com/yadong.zhang/static/raw/master/wx/wechat_account.jpg" width="200" /> | <img src="https://gitee.com/yadong.zhang/static/raw/master/wx/wx.png" width="170"/> |
 
  **QQ群** 
- 
+
 - JustAuth交流群 （230017570）：专业交流该项目
 
 - 开源总群 （190886500）：各个开源项目的都有，也有博客建设等方面的朋友。（注意，该群需付费进入，防止发垃圾广告、垃圾推广等人士）
@@ -216,6 +226,6 @@ _请知悉：经咨询CSDN官方客服得知，CSDN的授权开放平台已经
 
 ## 请喝咖啡
 
-| 支付宝  | 微信  | 
-| :------------: | :------------: | 
+| 支付宝  | 微信  |
+| :------------: | :------------: |
 | <img src="https://gitee.com/yadong.zhang/static/raw/master/qrcode/zfb_code.png" width="200"/> | <img src="https://gitee.com/yadong.zhang/static/raw/master/qrcode/wx_code.png" width="200" /> |

pom.xml

@@ -6,11 +6,14 @@
 
     <groupId>me.zhyd.oauth</groupId>
     <artifactId>JustAuth</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.1</version>
 
     <name>JustAuth</name>
     <url>https://gitee.com/yadong.zhang/JustAuth</url>
-    <description>史上最全的整合第三方登录的工具, Just Auth</description>
+    <description>
+        史上最全的整合第三方登录的工具,目前已支持Github、Gitee、微博、钉钉、百度、Coding、腾讯云开发者平台、OSChina、支付宝、QQ、微信、淘宝、Google、Facebook、抖音、领英、小米和微软等第三方平台的授权登录。
+        Login, so easy!
+    </description>
 
     <licenses>
         <license>
@@ -77,12 +80,6 @@
             <artifactId>fastjson</artifactId>
             <version>${fastjson-version}</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.google.api-client</groupId>
-            <artifactId>google-api-client</artifactId>
-            <version>${google-api-version}</version>
-        </dependency>-->
-
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
@@ -117,12 +114,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Javadoc -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
-            <!-- GPG -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -134,7 +129,6 @@
             <id>release</id>
             <build>
                 <plugins>
-                    <!-- Source -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
@@ -149,7 +143,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- Javadoc -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
@@ -162,7 +155,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- GPG -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>

src/main/java/me/zhyd/oauth/authorization/Authorization.java

@@ -11,5 +11,11 @@ import me.zhyd.oauth.config.AuthConfig;
  */
 public interface Authorization {
 
+    /**
+     * 获取授权页面地址
+     *
+     * @param config 授权基础配置
+     * @return 授权页面地址
+     */
     String getAuthorizeUrl(AuthConfig config);
 }

src/main/java/me/zhyd/oauth/authorization/AuthorizationFactory.java

@@ -69,6 +69,8 @@ public class AuthorizationFactory {
         AuthorizationFactory.register(AuthSource.FACEBOOK, new FacebookAuthorization());
         AuthorizationFactory.register(AuthSource.DOUYIN, new DouyinAuthorization());
         AuthorizationFactory.register(AuthSource.LINKEDIN, new LinkedinAuthorization());
+        AuthorizationFactory.register(AuthSource.MICROSOFT, new MicrosoftAuthorization());
+        AuthorizationFactory.register(AuthSource.MI, new MiAuthorization());
         loader = true;
     }
 

src/main/java/me/zhyd/oauth/authorization/MiAuthorization.java

@@ -0,0 +1,19 @@
+package me.zhyd.oauth.authorization;
+
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+/**
+ * 小米授权
+ *
+ * @author yangkai.shen (https://xkcoding.com)
+ * @version 1.5
+ * @since 1.5
+ */
+public class MiAuthorization implements Authorization {
+
+    @Override
+    public String getAuthorizeUrl(AuthConfig config) {
+        return UrlBuilder.getMiAuthorizeUrl(config.getClientId(), config.getRedirectUri());
+    }
+}

src/main/java/me/zhyd/oauth/authorization/MicrosoftAuthorization.java

@@ -0,0 +1,19 @@
+package me.zhyd.oauth.authorization;
+
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+/**
+ * 微软授权
+ *
+ * @author yangkai.shen (https://xkcoding.com)
+ * @version 1.5
+ * @since 1.5
+ */
+public class MicrosoftAuthorization implements Authorization {
+
+    @Override
+    public String getAuthorizeUrl(AuthConfig config) {
+        return UrlBuilder.getMicrosoftAuthorizeUrl(config.getClientId(), config.getRedirectUri());
+    }
+}

src/main/java/me/zhyd/oauth/consts/ApiUrl.java

@@ -503,6 +503,64 @@ public enum ApiUrl {
         public String refresh() {
             return "https://www.linkedin.com/oauth/v2/accessToken";
         }
+    },
+    /**
+     * 微软
+     */
+    MICROSOFT {
+        @Override
+        public String authorize() {
+            return "https://login.microsoftonline.com/common/oauth2/v2.0/authorize";
+        }
+
+        @Override
+        public String accessToken() {
+            return "https://login.microsoftonline.com/common/oauth2/v2.0/token";
+        }
+
+        @Override
+        public String userInfo() {
+            return "https://graph.microsoft.com/v1.0/me";
+        }
+
+        @Override
+        public String revoke() {
+            throw new AuthException(ResponseStatus.UNSUPPORTED);
+        }
+
+        @Override
+        public String refresh() {
+            return "https://login.microsoftonline.com/common/oauth2/v2.0/token";
+        }
+    },
+    /**
+     * 小米
+     */
+    MI {
+        @Override
+        public String authorize() {
+            return "https://account.xiaomi.com/oauth2/authorize";
+        }
+
+        @Override
+        public String accessToken() {
+            return "https://account.xiaomi.com/oauth2/token";
+        }
+
+        @Override
+        public String userInfo() {
+            return "https://open.account.xiaomi.com/user/profile";
+        }
+
+        @Override
+        public String revoke() {
+            throw new AuthException(ResponseStatus.UNSUPPORTED);
+        }
+
+        @Override
+        public String refresh() {
+            return "https://account.xiaomi.com/oauth2/token";
+        }
     };
 
     /**

src/main/java/me/zhyd/oauth/model/AuthSource.java

@@ -25,4 +25,6 @@ public enum AuthSource {
     FACEBOOK,
     DOUYIN,
     LINKEDIN,
+    MICROSOFT,
+    MI
 }

src/main/java/me/zhyd/oauth/model/AuthToken.java

@@ -27,4 +27,10 @@ public class AuthToken {
     private String tokenType;
     private String idToken;
 
+    /**
+     * 小米附带属性
+     */
+    private String macAlgorithm;
+    private String macKey;
+
 }

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

@@ -0,0 +1,108 @@
+package me.zhyd.oauth.request;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthSource;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+import java.text.MessageFormat;
+
+/**
+ * 小米登录
+ *
+ * @author yangkai.shen (https://xkcoding.com)
+ * @version 1.5
+ * @since 1.5
+ */
+public class AuthMiRequest extends BaseAuthRequest {
+    private static final String PREFIX = "&&&START&&&";
+
+    public AuthMiRequest(AuthConfig config) {
+        super(config, AuthSource.MI);
+    }
+
+    @Override
+    protected AuthToken getAccessToken(String code) {
+        String accessTokenUrl = UrlBuilder.getMiAccessTokenUrl(config.getClientId(), config.getClientSecret(), config.getRedirectUri(), code);
+        return getToken(accessTokenUrl);
+    }
+
+    private AuthToken getToken(String accessTokenUrl) {
+        HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
+        String jsonStr = StrUtil.replace(response.body(), PREFIX, StrUtil.EMPTY);
+        JSONObject object = JSONObject.parseObject(jsonStr);
+
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getString("error_description"));
+        }
+
+        return AuthToken.builder()
+                .accessToken(object.getString("access_token"))
+                .expireIn(object.getIntValue("expires_in"))
+                .scope(object.getString("scope"))
+                .tokenType(object.getString("token_type"))
+                .refreshToken(object.getString("refresh_token"))
+                .openId(object.getString("openId"))
+                .macAlgorithm(object.getString("mac_algorithm"))
+                .macKey(object.getString("mac_key"))
+                .build();
+    }
+
+    @Override
+    protected AuthUser getUserInfo(AuthToken authToken) {
+        // 获取用户信息
+        HttpResponse userResponse = HttpRequest.get(UrlBuilder.getMiUserInfoUrl(config.getClientId(), authToken.getAccessToken()))
+                .execute();
+
+        JSONObject userProfile = JSONObject.parseObject(userResponse.body());
+        if (StrUtil.equalsIgnoreCase(userProfile.getString("result"), "error")) {
+            throw new AuthException(userProfile.getString("description"));
+        }
+
+        JSONObject user = userProfile.getJSONObject("data");
+
+        AuthUser authUser = AuthUser.builder()
+                .uuid(authToken.getOpenId())
+                .username(user.getString("miliaoNick"))
+                .nickname(user.getString("miliaoNick"))
+                .avatar(user.getString("miliaoIcon"))
+                .email(user.getString("mail"))
+                .token(authToken)
+                .source(AuthSource.MI)
+                .build();
+
+        // 获取用户邮箱手机号等信息
+        String emailPhoneUrl = MessageFormat.format("{0}?clientId={1}&token={2}", "https://open.account.xiaomi.com/user/phoneAndEmail", config
+                .getClientId(), authToken.getAccessToken());
+
+        HttpResponse emailResponse = HttpRequest.get(emailPhoneUrl).execute();
+        JSONObject userEmailPhone = JSONObject.parseObject(emailResponse.body());
+        if (!StrUtil.equalsIgnoreCase(userEmailPhone.getString("result"), "error")) {
+            JSONObject emailPhone = userEmailPhone.getJSONObject("data");
+            authUser.setEmail(emailPhone.getString("email"));
+        }
+
+        return authUser;
+    }
+
+    /**
+     * 刷新access token （续期）
+     *
+     * @param authToken 登录成功后返回的Token信息
+     * @return AuthResponse
+     */
+    @Override
+    public AuthResponse refresh(AuthToken authToken) {
+        String miRefreshUrl = UrlBuilder.getMiRefreshUrl(config.getClientId(), config.getClientSecret(), config.getRedirectUri(), authToken
+                .getRefreshToken());
+
+        return AuthResponse.builder().code(ResponseStatus.SUCCESS.getCode()).data(getToken(miRefreshUrl)).build();
+    }
+}

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

@@ -0,0 +1,106 @@
+package me.zhyd.oauth.request;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthSource;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微软登录
+ *
+ * @author yangkai.shen (https://xkcoding.com)
+ * @version 1.5
+ * @since 1.5
+ */
+public class AuthMicrosoftRequest extends BaseAuthRequest {
+    public AuthMicrosoftRequest(AuthConfig config) {
+        super(config, AuthSource.MICROSOFT);
+    }
+
+    @Override
+    protected AuthToken getAccessToken(String code) {
+        String accessTokenUrl = UrlBuilder.getMicrosoftAccessTokenUrl(config.getClientId(), config.getClientSecret(), config
+                .getRedirectUri(), code);
+
+        return getToken(accessTokenUrl);
+    }
+
+    /**
+     * 获取token，适用于获取access_token和刷新token
+     *
+     * @param accessTokenUrl 实际请求token的地址
+     * @return token对象
+     */
+    private AuthToken getToken(String accessTokenUrl) {
+        Map<String, Object> paramMap = new HashMap<>(6);
+        HttpUtil.decodeParamMap(accessTokenUrl, "UTF-8").forEach(paramMap::put);
+        HttpResponse response = HttpRequest.post(accessTokenUrl)
+                .header("Host", "https://login.microsoftonline.com")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .form(paramMap)
+                .execute();
+        String accessTokenStr = response.body();
+        JSONObject object = JSONObject.parseObject(accessTokenStr);
+
+        this.checkResponse(object);
+
+        return AuthToken.builder()
+                .accessToken(object.getString("access_token"))
+                .expireIn(object.getIntValue("expires_in"))
+                .scope(object.getString("scope"))
+                .tokenType(object.getString("token_type"))
+                .refreshToken(object.getString("refresh_token"))
+                .build();
+    }
+
+    private void checkResponse(JSONObject response) {
+        if (response.containsKey("error")) {
+            throw new AuthException(response.getString("error_description"));
+        }
+    }
+
+    @Override
+    protected AuthUser getUserInfo(AuthToken authToken) {
+        String token = authToken.getAccessToken();
+        String tokenType = authToken.getTokenType();
+        String jwt = tokenType + " " + token;
+        HttpResponse response = HttpRequest.get(UrlBuilder.getMicrosoftUserInfoUrl())
+                .header("Authorization", jwt)
+                .execute();
+        String userInfo = response.body();
+        JSONObject object = JSONObject.parseObject(userInfo);
+        return AuthUser.builder()
+                .uuid(object.getString("id"))
+                .username(object.getString("userPrincipalName"))
+                .nickname(object.getString("displayName"))
+                .location(object.getString("officeLocation"))
+                .email(object.getString("mail"))
+                .token(authToken)
+                .source(AuthSource.MICROSOFT)
+                .build();
+    }
+
+    /**
+     * 刷新access token （续期）
+     *
+     * @param authToken 登录成功后返回的Token信息
+     * @return AuthResponse
+     */
+    @Override
+    public AuthResponse refresh(AuthToken authToken) {
+        String refreshTokenUrl = UrlBuilder.getMicrosoftRefreshUrl(config.getClientId(), config.getClientSecret(), config
+                .getRedirectUri(), authToken.getRefreshToken());
+
+        return AuthResponse.builder().code(ResponseStatus.SUCCESS.getCode()).data(getToken(refreshTokenUrl)).build();
+    }
+}

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

@@ -77,12 +77,27 @@ public class UrlBuilder {
     private static final String DOUYIN_USER_INFO_PATTERN = "{0}?access_token={1}&open_id={2}";
     private static final String DOUYIN_REFRESH_TOKEN_PATTERN = "{0}?client_key={1}&refresh_token={2}&grant_type=refresh_token";
 
+    private static final String LINKEDIN_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&state={3}&response_type=code&scope=r_liteprofile%20r_emailaddress%20w_member_social";
+    private static final String LINKEDIN_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&code={3}&redirect_uri={4}&grant_type=authorization_code";
+    private static final String LINKEDIN_USER_INFO_PATTERN = "{0}?projection=(id,firstName,lastName,profilePicture(displayImage~:playableStreams))";
+    private static final String LINKEDIN_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&refresh_token={3}&grant_type=refresh_token";
+
+    private static final String MICROSOFT_AUTHORIZE_PATTERN = "{0}?client_id={1}&response_type=code&redirect_uri={2}&response_mode=query&scope=offline_access%20user.read%20mail.read&state={3}";
+    private static final String MICROSOFT_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&scope=user.read%20mail.read&redirect_uri={3}&code={4}&grant_type=authorization_code";
+    private static final String MICROSOFT_USER_INFO_PATTERN = "{0}";
+    private static final String MICROSOFT_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&scope=user.read%20mail.read&redirect_uri={3}&refresh_token={4}&grant_type=refresh_token";
+
+    private static final String MI_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&response_type=code&scope=user/profile%20user/openIdV2%20user/phoneAndEmail&state={3}&skip_confirm=false";
+    private static final String MI_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&redirect_uri={3}&code={4}&grant_type=authorization_code";
+    private static final String MI_USER_INFO_PATTERN = "{0}?clientId={1}&token={2}";
+    private static final String MI_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&redirect_uri={3}&refresh_token={4}&grant_type=refresh_token";
+
     /**
      * 获取githubtoken的接口地址
      *
-     * @param clientId     github应用的Client ID
-     * @param clientSecret github应用的Client Secret
-     * @param code         github授权前的code，用来换token
+     * @param clientId     github 应用的Client ID
+     * @param clientSecret github 应用的Client Secret
+     * @param code         github 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -114,9 +129,9 @@ public class UrlBuilder {
     /**
      * 获取weibo token的接口地址
      *
-     * @param clientId     weibo应用的App Key
-     * @param clientSecret weibo应用的App Secret
-     * @param code         weibo授权前的code，用来换token
+     * @param clientId     weibo 应用的App Key
+     * @param clientSecret weibo 应用的App Secret
+     * @param code         weibo 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -148,9 +163,9 @@ public class UrlBuilder {
     /**
      * 获取gitee token的接口地址
      *
-     * @param clientId     gitee应用的Client ID
-     * @param clientSecret gitee应用的Client Secret
-     * @param code         gitee授权前的code，用来换token
+     * @param clientId     gitee 应用的Client ID
+     * @param clientSecret gitee 应用的Client Secret
+     * @param code         gitee 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -205,9 +220,9 @@ public class UrlBuilder {
     /**
      * 获取baidu token的接口地址
      *
-     * @param clientId     baidu应用的API Key
-     * @param clientSecret baidu应用的Secret Key
-     * @param code         baidu授权前的code，用来换token
+     * @param clientId     baidu 应用的API Key
+     * @param clientSecret baidu 应用的Secret Key
+     * @param code         baidu 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -239,7 +254,7 @@ public class UrlBuilder {
     /**
      * 获取收回baidu授权的地址
      *
-     * @param accessToken baidu授权登录后的token
+     * @param accessToken baidu 授权登录后的token
      * @return json
      */
     public static String getBaiduRevokeUrl(String accessToken) {
@@ -249,9 +264,9 @@ public class UrlBuilder {
     /**
      * 获取csdn token的接口地址
      *
-     * @param clientId     csdn应用的App Key
-     * @param clientSecret csdn应用的App Secret
-     * @param code         csdn授权前的code，用来换token
+     * @param clientId     csdn 应用的App Key
+     * @param clientSecret csdn 应用的App Secret
+     * @param code         csdn 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -283,9 +298,9 @@ public class UrlBuilder {
     /**
      * 获取coding token的接口地址
      *
-     * @param clientId     coding应用的App Key
-     * @param clientSecret coding应用的App Secret
-     * @param code         coding授权前的code，用来换token
+     * @param clientId     coding 应用的App Key
+     * @param clientSecret coding 应用的App Secret
+     * @param code         coding 授权前的code，用来换token
      * @return full url
      */
     public static String getCodingAccessTokenUrl(String clientId, String clientSecret, String code) {
@@ -316,9 +331,9 @@ public class UrlBuilder {
     /**
      * 获取腾讯云开发者平台 token的接口地址
      *
-     * @param clientId     coding应用的App Key
-     * @param clientSecret coding应用的App Secret
-     * @param code         coding授权前的code，用来换token
+     * @param clientId     coding 应用的App Key
+     * @param clientSecret coding 应用的App Secret
+     * @param code         coding 授权前的code，用来换token
      * @return full url
      */
     public static String getTencentCloudAccessTokenUrl(String clientId, String clientSecret, String code) {
@@ -349,9 +364,9 @@ public class UrlBuilder {
     /**
      * 获取oschina token的接口地址
      *
-     * @param clientId     oschina应用的App Key
-     * @param clientSecret oschina应用的App Secret
-     * @param code         oschina授权前的code，用来换token
+     * @param clientId     oschina 应用的App Key
+     * @param clientSecret oschina 应用的App Secret
+     * @param code         oschina 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -383,9 +398,9 @@ public class UrlBuilder {
     /**
      * 获取qq token的接口地址
      *
-     * @param clientId     qq应用的App Key
-     * @param clientSecret qq应用的App Secret
-     * @param code         qq授权前的code，用来换token
+     * @param clientId     qq 应用的App Key
+     * @param clientSecret qq 应用的App Secret
+     * @param code         qq 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -396,8 +411,9 @@ public class UrlBuilder {
     /**
      * 获取qq用户详情的接口地址
      *
-     * @param token  qq 应用的token
-     * @param openId qq 应用的openId
+     * @param clientId qq 应用的clientId
+     * @param token    qq 应用的token
+     * @param openId   qq 应用的openId
      * @return full url
      */
     public static String getQqUserInfoUrl(String clientId, String token, String openId) {
@@ -440,8 +456,8 @@ public class UrlBuilder {
     /**
      * 获取微信 授权地址
      *
-     * @param clientId    微信应用的appid
-     * @param redirectUrl 微信应用授权成功后的回调地址
+     * @param clientId    微信 应用的appid
+     * @param redirectUrl 微信 应用授权成功后的回调地址
      * @return full url
      */
     public static String getWeChatAuthorizeUrl(String clientId, String redirectUrl) {
@@ -451,9 +467,9 @@ public class UrlBuilder {
     /**
      * 获取微信 token的接口地址
      *
-     * @param clientId     微信应用的appid
-     * @param clientSecret 微信应用的secret
-     * @param code         微信授权前的code，用来换token
+     * @param clientId     微信 应用的appid
+     * @param clientSecret 微信 应用的secret
+     * @param code         微信 授权前的code，用来换token
      * @return full url
      */
     public static String getWeChatAccessTokenUrl(String clientId, String clientSecret, String code) {
@@ -463,8 +479,8 @@ public class UrlBuilder {
     /**
      * 获取微信 用户详情的接口地址
      *
-     * @param token  微信应用返回的 access token
-     * @param openId 微信应用返回的openId
+     * @param token  微信 应用返回的 access token
+     * @param openId 微信 应用返回的openId
      * @return full url
      */
     public static String getWeChatUserInfoUrl(String token, String openId) {
@@ -474,8 +490,8 @@ public class UrlBuilder {
     /**
      * 获取微信 刷新令牌 地址
      *
-     * @param clientId     微信应用的appid
-     * @param refreshToken 微信应用返回的刷新token
+     * @param clientId     微信 应用的appid
+     * @param refreshToken 微信 应用返回的刷新token
      * @return full url
      */
     public static String getWeChatRefreshUrl(String clientId, String refreshToken) {
@@ -485,9 +501,9 @@ public class UrlBuilder {
     /**
      * 获取Taobao token的接口地址: 淘宝的授权登录，在这一步就会返回用户信息
      *
-     * @param clientId     taobao应用的App Key
-     * @param clientSecret taobao应用的App Secret
-     * @param code         taobao授权前的code，用来换token
+     * @param clientId     taobao 应用的App Key
+     * @param clientSecret taobao 应用的App Secret
+     * @param code         taobao 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -520,9 +536,9 @@ public class UrlBuilder {
     /**
      * 获取Google token的接口地址
      *
-     * @param clientId     google应用的Client ID
-     * @param clientSecret google应用的Client Secret
-     * @param code         google授权前的code，用来换token
+     * @param clientId     google 应用的Client ID
+     * @param clientSecret google 应用的Client Secret
+     * @param code         google 授权前的code，用来换token
      * @param redirectUri  待跳转的页面
      * @return full url
      */
@@ -612,21 +628,14 @@ public class UrlBuilder {
     /**
      * 获取Douyin 刷新令牌 地址
      *
-     * @param clientId     Douyin应用的client_key
-     * @param refreshToken Douyin应用返回的refresh_token
+     * @param clientId     Douyin 应用的client_key
+     * @param refreshToken Douyin 应用返回的refresh_token
      * @return full url
      */
     public static String getDouyinRefreshUrl(String clientId, String refreshToken) {
         return MessageFormat.format(DOUYIN_REFRESH_TOKEN_PATTERN, ApiUrl.DOUYIN.refresh(), clientId, refreshToken);
     }
 
-
-
-    private static final String LINKEDIN_AUTHORIZE_PATTERN = "{0}?client_id={1}&redirect_uri={2}&state={3}&response_type=code&scope=r_liteprofile%20r_emailaddress%20w_member_social";
-    private static final String LINKEDIN_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&code={3}&redirect_uri={4}&grant_type=authorization_code";
-    private static final String LINKEDIN_USER_INFO_PATTERN = "{0}?projection=(id,firstName,lastName,profilePicture(displayImage~:playableStreams))";
-    private static final String LINKEDIN_REFRESH_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&refresh_token={3}&grant_type=refresh_token";
-
     /**
      * 获取Linkedin授权地址
      *
@@ -635,7 +644,8 @@ public class UrlBuilder {
      * @return full url
      */
     public static String getLinkedinAuthorizeUrl(String clientId, String redirectUrl) {
-        return MessageFormat.format(LINKEDIN_AUTHORIZE_PATTERN, ApiUrl.LINKEDIN.authorize(), clientId, redirectUrl, System.currentTimeMillis());
+        return MessageFormat.format(LINKEDIN_AUTHORIZE_PATTERN, ApiUrl.LINKEDIN.authorize(), clientId, redirectUrl, System
+                .currentTimeMillis());
     }
 
     /**
@@ -644,7 +654,7 @@ public class UrlBuilder {
      * @param clientId     Linkedin 应用的Client ID
      * @param clientSecret Linkedin 应用的Client Secret
      * @param code         Linkedin 授权前的code，用来换token
-     * @param redirectUrl google 应用授权成功后的回调地址
+     * @param redirectUrl  Linkedin 应用授权成功后的回调地址
      * @return full url
      */
     public static String getLinkedinAccessTokenUrl(String clientId, String clientSecret, String code, String redirectUrl) {
@@ -663,12 +673,107 @@ public class UrlBuilder {
     /**
      * 获取Linkedin 刷新令牌 地址
      *
-     * @param clientId     Linkedin应用的client_key
+     * @param clientId     Linkedin 应用的client_key
      * @param clientSecret Linkedin 应用的Client Secret
-     * @param refreshToken Linkedin应用返回的refresh_token
+     * @param refreshToken Linkedin 应用返回的refresh_token
      * @return full url
      */
     public static String getLinkedinRefreshUrl(String clientId, String clientSecret, String refreshToken) {
         return MessageFormat.format(LINKEDIN_REFRESH_TOKEN_PATTERN, ApiUrl.LINKEDIN.refresh(), clientId, clientSecret, refreshToken);
     }
+
+    /**
+     * 获取微软授权地址
+     *
+     * @param clientId    微软 应用的Client ID
+     * @param redirectUrl 微软 应用授权成功后的回调地址
+     * @return full url
+     */
+    public static String getMicrosoftAuthorizeUrl(String clientId, String redirectUrl) {
+        return MessageFormat.format(MICROSOFT_AUTHORIZE_PATTERN, ApiUrl.MICROSOFT.authorize(), clientId, redirectUrl, System
+                .currentTimeMillis());
+    }
+
+    /**
+     * 获取微软 token的接口地址
+     *
+     * @param clientId     微软 应用的Client ID
+     * @param clientSecret 微软 应用的Client Secret
+     * @param redirectUrl  微软 应用授权成功后的回调地址
+     * @param code         微软 授权前的code，用来换token
+     * @return full url
+     */
+    public static String getMicrosoftAccessTokenUrl(String clientId, String clientSecret, String redirectUrl, String code) {
+        return MessageFormat.format(MICROSOFT_ACCESS_TOKEN_PATTERN, ApiUrl.MICROSOFT.accessToken(), clientId, clientSecret, redirectUrl, code);
+    }
+
+    /**
+     * 获取微软用户详情的接口地址
+     *
+     * @return full url
+     */
+    public static String getMicrosoftUserInfoUrl() {
+        return MessageFormat.format(MICROSOFT_USER_INFO_PATTERN, ApiUrl.MICROSOFT.userInfo());
+    }
+
+    /**
+     * 获取微软 刷新令牌 地址
+     *
+     * @param clientId     微软 应用的client_key
+     * @param clientSecret 微软 应用的Client Secret
+     * @param redirectUrl  微软 应用授权成功后的回调地址
+     * @param refreshToken 微软 应用返回的refresh_token
+     * @return full url
+     */
+    public static String getMicrosoftRefreshUrl(String clientId, String clientSecret, String redirectUrl, String refreshToken) {
+        return MessageFormat.format(MICROSOFT_REFRESH_TOKEN_PATTERN, ApiUrl.MICROSOFT.refresh(), clientId, clientSecret, redirectUrl, refreshToken);
+    }
+
+    /**
+     * 获取小米授权地址
+     *
+     * @param clientId    小米 应用的Client ID
+     * @param redirectUrl 小米 应用授权成功后的回调地址
+     * @return full url
+     */
+    public static String getMiAuthorizeUrl(String clientId, String redirectUrl) {
+        return MessageFormat.format(MI_AUTHORIZE_PATTERN, ApiUrl.MI.authorize(), clientId, redirectUrl, System.currentTimeMillis());
+    }
+
+    /**
+     * 获取小米 token的接口地址
+     *
+     * @param clientId     小米 应用的Client ID
+     * @param clientSecret 小米 应用的Client Secret
+     * @param redirectUrl  小米 应用授权成功后的回调地址
+     * @param code         小米 授权前的code，用来换token
+     * @return full url
+     */
+    public static String getMiAccessTokenUrl(String clientId, String clientSecret, String redirectUrl, String code) {
+        return MessageFormat.format(MI_ACCESS_TOKEN_PATTERN, ApiUrl.MI.accessToken(), clientId, clientSecret, redirectUrl, code);
+    }
+
+    /**
+     * 获取小米用户详情的接口地址
+     *
+     * @param clientId 小米 应用的client_key
+     * @param token    token
+     * @return full url
+     */
+    public static String getMiUserInfoUrl(String clientId, String token) {
+        return MessageFormat.format(MI_USER_INFO_PATTERN, ApiUrl.MI.userInfo(), clientId, token);
+    }
+
+    /**
+     * 获取小米 刷新令牌 地址
+     *
+     * @param clientId     小米 应用的client_key
+     * @param clientSecret 小米 应用的Client Secret
+     * @param redirectUrl  小米 应用授权成功后的回调地址
+     * @param refreshToken 小米 应用返回的refresh_token
+     * @return full url
+     */
+    public static String getMiRefreshUrl(String clientId, String clientSecret, String redirectUrl, String refreshToken) {
+        return MessageFormat.format(MI_REFRESH_TOKEN_PATTERN, ApiUrl.MI.refresh(), clientId, clientSecret, redirectUrl, refreshToken);
+    }
 }

src/test/java/me/zhyd/oauth/AuthRequestTest.java

@@ -167,4 +167,30 @@ public class AuthRequestTest {
         // 授权登录后会返回一个code，用这个code进行登录
         AuthResponse login = authRequest.login("code");
     }
+
+    @Test
+    public void microsoftTest() {
+        AuthRequest authRequest = new AuthMicrosoftRequest(AuthConfig.builder()
+                .clientId("clientId")
+                .clientSecret("clientSecret")
+                .redirectUri("redirectUri")
+                .build());
+        // 返回授权页面，可自行调整
+        String url = authRequest.authorize();
+        // 授权登录后会返回一个code，用这个code进行登录
+        AuthResponse login = authRequest.login("code");
+    }
+
+    @Test
+    public void miTest() {
+        AuthRequest authRequest = new AuthMiRequest(AuthConfig.builder()
+                .clientId("clientId")
+                .clientSecret("clientSecret")
+                .redirectUri("redirectUri")
+                .build());
+        // 返回授权页面，可自行调整
+        String url = authRequest.authorize();
+        // 授权登录后会返回一个code，用这个code进行登录
+        AuthResponse login = authRequest.login("code");
+    }
 }

update.md

@@ -1,3 +1,7 @@
+### 2019/05/28
+1. 增加小米账号和微软的授权登陆
+2. 发布1.5.0版本
+
 ### 2019/05/26
 1. 增加抖音和Linkedin的授权登陆
 2. 修改部分图片命名