Merge pull request #21 from justauth/dependabot/maven/cn.hutool-hutool-core-5.8.19

⬆️ Bump hutool-core from 5.6.5 to 5.8.19
Merge branch 'master' into dependabot/maven/cn.hutool-hutool-core-5.8.19
2025-12-11 00:18:07 +08:00 · 2024-12-14 19:18:11 +08:00 · 2024-12-14 19:18:01 +08:00 · 2024-12-14 19:16:52 +08:00 · 2024-12-14 19:16:22 +08:00 · 2024-12-14 18:57:45 +08:00
9 changed files with 461 additions and 157 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 ## 版本更新记录

+### 【1.4.0】2021-05-10
+
+- 升级 `JustAuth` 版本：1.16.1，新增Amazon、Slack、LINE、Okta、钉钉账号登录，同时修复若干BUG，详细信息请参考参考：https://github.com/justauth/JustAuth/blob/master/CHANGELOGS.md#1161
+- 升级 `hutool-core` 版本：5.6.5
+
+### 【1.3.5】2021-01-04
+
+- 升级 `JustAuth` 版本：1.15.9，新增飞书、京东、阿里云、喜马拉雅、企业微信网页端登录
+- 升级 `hutool-core` 版本：5.5.6
+
+### 【1.3.4】2020-09-12
+
+- 升级 `JustAuth` 版本：1.15.7，更新最新的 GitHub API
+
+### 【1.3.4.beta】2020-08-29
+
+- 升级 `JustAuth` 版本：1.15.7-beta.3，支持自定义 http config 以及自定义 scopes
+- 升级 `hutool-core` 版本：5.4.0，修复 `JSONUtil.toJsonStr(obj)` 报错的问题，参见 [ISSUE#8](https://github.com/justauth/justauth-spring-boot-starter/issues/8)
+
 ### 【1.3.3】2020-04-13

 - 升级 `JustAuth` 版本：1.15.1
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ https://github.com/xkcoding/justauth-spring-boot-starter-demo
 <dependency>
  <groupId>com.xkcoding.justauth</groupId>
  <artifactId>justauth-spring-boot-starter</artifactId>
-  <version>1.3.3</version>
+  <version>1.4.0</version>
 </dependency>
 ```

@@ -37,10 +37,11 @@ https://github.com/xkcoding/justauth-spring-boot-starter-demo
 注意：

 - `justauth.type`节点的配置，请根据项目实际情况选择，多余的可以删除
- 如果使用QQ登录，并且需要获取`unionId`，则必须传`union-id`配置，并置为`true`
+- 如果使用 QQ 登录，并且需要获取`unionId`，则必须传`union-id`配置，并置为`true`
 - 如果使用支付宝登录，必传`alipay-public-key`
- 如果使用Stack Overflow登录，必传`stack-overflow-key`
+- 如果使用 Stack Overflow 登录，必传`stack-overflow-key`
 - 如果使用企业微信登录，必传`agent-id`
+- 如果使用 CODING 登录，必传`coding-group-name`

 ```yaml
 justauth:
@@ -75,10 +76,7 @@ justauth:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
      redirect-uri: http://oauth.xkcoding.com/demo/oauth/coding/callback
-    TENCENT_CLOUD:
-      client-id: 10**********6
-      client-secret: 1f7d08**********5b7**********29e
-      redirect-uri: http://oauth.xkcoding.com/demo/oauth/tencent_cloud/callback
+      coding-group-name: xx
    OSCHINA:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
@@ -174,6 +172,24 @@ justauth:
      client-id: 10**********6
      client-secret: 1f7d08**********5b7**********29e
      redirect-uri: http://oauth.xkcoding.com/demo/oauth/twitter/callback
+    XMLY:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/xmly/callback
+      # 设备唯一标识ID
+      device-id: xxxxxxxxxxxxxx
+      # 客户端操作系统类型，1-iOS系统，2-Android系统，3-Web
+      client-os-type: 3
+      # 客户端包名，如果 clientOsType 为1或2时必填。对Android客户端是包名，对IOS客户端是Bundle ID
+      #pack-id: xxxx
+    FEISHU:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/feishu/callback
+    JD:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/jd/callback
  cache:
    type: default
 ```
@@ -522,39 +538,98 @@ justauth:
        redirect-uri: http://oauth.xkcoding.com/demo/oauth/test/callback
 ```

-## 4. 附录
+## 4. http 代理配置

-### 4.1. 基础配置
+修改配置文件，增加如下配置：

-#### 4.1.1. `justauth` 配置列表
+```yaml
+justauth:
+  http-config:
+    timeout: 30000
+    proxy:
+      GOOGLE:
+        type: HTTP
+        hostname: 127.0.0.1
+        port: 10080
+```
+
+注：当项目中使用了自定义的第三方登录，并且需要使用代理时，也要在 `http-config` 节点下添加相关配置，格式参考上面示例
+
+## 5. 自定义 Scopes
+
+修改配置文件，增加如下配置：
+
+```yml
+justauth:
+  enabled: true
+  type:
+    QQ:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: http://oauth.xkcoding.com/demo/oauth/qq/callback
+      union-id: false
+      scopes:
+       - get_user_info
+       - xxxx
+```
+
+注：你可以前往 `me.zhyd.oauth.enums.scope` 包下查看各个渠道所支持的 scopes，当然你可以不配置该项，JustAuth 会默认添加上一些基础 scope
+
+## 6. 附录
+
+### 6.1. `justauth` 配置列表

 | 属性名             | 类型                                                         | 默认值 | 可选项     | 描述                   |
 | ------------------ | ------------------------------------------------------------ | ------ | ---------- | ---------------------- |
 | `justauth.enabled` | `boolean`                                                    | true   | true/false | 是否启用 JustAuth      |
 | `justauth.type`    | `java.util.Map<me.zhyd.oauth.config.AuthSource,me.zhyd.oauth.config.AuthConfig>` | 无     |            | JustAuth 配置          |
+| `justauth.httpConfig`    | `java.util.Map<me.zhyd.oauth.config.AuthSource,com.xkcoding.justauth.autoconfigure.JustAuthProperties.JustAuthHttpConfig>` | 无     |            | http 相关配置          |
 | `justauth.cache`   | `com.xkcoding.justauth.autoconfigure.CacheProperties`        |        |            | JustAuth缓存配置       |
 | `justauth.extend`  | `com.xkcoding.justauth.autoconfigure.ExtendProperties`       | 无     |            | JustAuth第三方平台配置 |

-##### 4.1.1.1. `justauth.type` 配置列表
+#### `justauth.type` 配置列表

 | 属性名                      | 描述                                                         |
 | --------------------------- | ------------------------------------------------------------ |
 | `justauth.type.keys`        | `justauth.type` 是 `Map` 格式的，key 的取值请参考 [`AuthDefaultSource`](https://github.com/zhangyd-c/JustAuth/blob/master/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java) |
 | `justauth.type.keys.values` | `justauth.type` 是 `Map` 格式的，value 的取值请参考 [`AuthConfig`](https://github.com/zhangyd-c/JustAuth/blob/master/src/main/java/me/zhyd/oauth/config/AuthConfig.java) |

-###### 4.1.1.1.1 `justauth.type.keys.values` 所有可选配置如下：
+##### `justauth.type.keys.values` 所有可选配置如下：

 | 属性名                      | 描述                                                         | 备注                             |
 | --------------------------- | -----------------------------------------------------------  | ------------------------------- |
-| `client-id`        |  客户端id，对应各平台的appKey  | 必填 |
-| `client-secret` |  客户端Secret，对应各平台的appSecret  | 必填 |
-| `redirect-uri` |  登录成功后的回调地址  | 必填 |
-| `alipay-public-key` |  支付宝公钥  | 当使用支付宝登录时，该值必填，对应“RSA2(SHA256)密钥”中的“支付宝公钥” |
+| `client-id`        |  客户端id，对应各平台的appKey  | **必填** |
+| `client-secret` |  客户端Secret，对应各平台的appSecret  | **必填** |
+| `redirect-uri` |  登录成功后的回调地址  | **必填** |
+| `alipay-public-key` |  支付宝公钥  | 当使用支付宝登录时， **该值必填**，对应“RSA2(SHA256)密钥”中的“支付宝公钥” |
 | `union-id` |  是否需要申请unionid  | 当使用QQ登录时，该值**选填**，如果置为`true`则qq开发者应用必须具备相应权限，参考链接：[查看详情](http://wiki.connect.qq.com/unionid%E4%BB%8B%E7%BB%8D) |
-| `stack-overflow-key` |  Stack Overflow Key  | 当使用Stack Overflow登录时，该值必填 |
-| `agent-id` |  企业微信，授权方的网页应用ID  | 当使用企业微信登录时，该值必填 |
+| `stack-overflow-key` |  Stack Overflow Key  | 当使用Stack Overflow登录时， **该值必填** |
+| `agent-id` |  企业微信，授权方的网页应用ID  | 当使用企业微信登录时， **该值必填** |
+| `coding-group-name` |  团队域名前缀 | 使用 Coding 登录时， **该值必填** |

-##### 4.1.1.2.`justauth.cache` 配置列表
+#### `justauth.httpConfig` 配置列表
+
+| 属性名                      | 描述                                                         |
+| --------------------------- | ------------------------------------------------------------ |
+| `justauth.httpConfig.keys`        | `justauth.type` 是 `Map` 格式的，key 的取值请参考 [`AuthDefaultSource`](https://github.com/zhangyd-c/JustAuth/blob/master/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java) |
+| `justauth.httpConfig.keys.values` | `justauth.type` 是 `Map` 格式的，value 的取值请参考 `JustAuthProperties.JustAuthHttpConfig` |
+
+##### `justauth.httpConfig.keys.values` 所有可选配置如下：
+
+| 属性名                      | 描述                                                         | 备注                             |
+| --------------------------- | -----------------------------------------------------------  | ------------------------------- |
+| `timeout`        |  请求超时时间  |  |
+| `proxy` |  代理的相关配置，针对国外平台，需要配置代理  | **必填** |
+
+##### `justauth.httpConfig.proxy` 所有可选配置如下：
+
+| 属性名                      | 描述                                                         | 备注                             |
+| --------------------------- | -----------------------------------------------------------  | ------------------------------- |
+| `type`        |  代理类型，可选值：`HTTP`、`DIRECT`、`SOCKS`，默认为 `HTTP`  |  |
+| `hostname` |  代理 IP 地址  |  |
+| `port` |  代理端口  |  |
+
+#### `justauth.cache` 配置列表

 | 属性名                   | 类型                                                         | 默认值            | 可选项               | 描述                                                         |
 | ------------------------ | ------------------------------------------------------------ | ----------------- | -------------------- | ------------------------------------------------------------ |
@@ -562,21 +637,21 @@ justauth:
 | `justauth.cache.prefix`  | `java.lang.String`                                           | JUSTAUTH::STATE:: |                      | 缓存前缀，目前只对redis缓存生效，默认 `JUSTAUTH::STATE::`    |
 | `justauth.cache.timeout` | `java.time.Duration`                                         | 3分钟             |                      | 超时时长，目前只对redis缓存生效，默认`3分钟`                 |

-##### 4.1.1.3.`justauth.extend` 配置列表
+#### `justauth.extend` 配置列表

 | 属性名                       | 类型                                         | 默认值 | 可选项 | 描述         |
 | ---------------------------- | -------------------------------------------- | ------ | ------ | ------------ |
 | `justauth.extend.enum-class` | `Class<? extends AuthSource>`                | 无     |        | 枚举类全路径 |
 | `justauth.extend.config`     | `java.util.Map<String, ExtendRequestConfig>` | 无     |        | 对应配置信息 |

-###### 4.1.1.3.1.`justauth.extend.config` 配置列表
+##### `justauth.extend.config` 配置列表

 | 属性名                          | 类型                                                         | 默认值 | 可选项 | 描述                                                         |
 | ------------------------------- | ------------------------------------------------------------ | ------ | ------ | ------------------------------------------------------------ |
 | `justauth.extend.config.keys`   | `java.lang.String`                                           | 无     |        | key 必须在 `justauth.extend.enum-class` 配置的枚举类中声明   |
 | `justauth.extend.config.values` | `com.xkcoding.justauth.autoconfigure.ExtendProperties.ExtendRequestConfig` | 无     |        | value 就是 `AuthConfig` 的子类，增加了一个 `request-class` 属性配置请求的全类名，具体参考类[`ExtendProperties.ExtendRequestConfig`](https://github.com/justauth/justauth-spring-boot-starter/blob/master/src/main/java/com/xkcoding/justauth/autoconfigure/ExtendProperties.java#L49-L54) |

-### 4.2. SNAPSHOT版本
+### 6.2. SNAPSHOT版本

 ![https://img.shields.io/badge/snapshots-1.4.0--SNAPSHOT-green](https://img.shields.io/badge/snapshots-1.4.0--SNAPSHOT-green)如果需要体验快照版本，可以在你的 `pom.xml`进行如下配置：

--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@

  <groupId>com.xkcoding.justauth</groupId>
  <artifactId>justauth-spring-boot-starter</artifactId>
-  <version>1.3.3</version>
+  <version>1.4.1-SNAPSHOT</version>

  <name>justauth-spring-boot-starter</name>
  <url>https://github.com/xkcoding/justauth-spring-boot-starter</url>
@@ -43,6 +43,11 @@
      </roles>
      <timezone>Asia/Shanghai</timezone>
    </developer>
+    <developer>
+      <name>Yadong.Zhang</name>
+      <email>yadong.zhang0415@gmail.com</email>
+      <url>https://www.zhyd.me</url>
+    </developer>
  </developers>

  <licenses>
@@ -67,8 +72,8 @@
    <!--SpringBoot版本-->
    <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
    <!--JustAuth版本-->
-    <justauth.version>1.15.1</justauth.version>
-    <hutool.version>5.1.0</hutool.version>
+    <justauth.version>1.16.7</justauth.version>
+    <hutool.version>5.8.19</hutool.version>
  </properties>

  <dependencies>
--- a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java
+++ b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java
@@ -21,6 +21,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.xkcoding.http.config.HttpConfig;
 import com.xkcoding.justauth.autoconfigure.ExtendProperties;
 import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
 import lombok.RequiredArgsConstructor;
@@ -32,7 +33,10 @@ import me.zhyd.oauth.config.AuthSource;
 import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.exception.AuthException;
 import me.zhyd.oauth.request.*;
+import org.springframework.util.CollectionUtils;

+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -58,10 +62,10 @@ public class AuthRequestFactory {
     *
     * @return Oauth列表
     */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
    public List<String> oauthList() {
        // 默认列表
-        List<String> defaultList = properties.getType().keySet().stream().map(Enum::name).collect(Collectors.toList());
+        List<String> defaultList = new ArrayList<>(properties.getType().keySet());
        // 扩展列表
        List<String> extendList = new ArrayList<>();
        ExtendProperties extend = properties.getExtend();
@@ -114,10 +118,11 @@ public class AuthRequestFactory {
     * @param source {@link AuthSource}
     * @return {@link AuthRequest}
     */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
    private AuthRequest getExtendRequest(Class clazz, String source) {
+        String upperSource = source.toUpperCase();
        try {
-            EnumUtil.fromString(clazz, source.toUpperCase());
+            EnumUtil.fromString(clazz, upperSource);
        } catch (IllegalArgumentException e) {
            // 无自定义匹配
            return null;
@@ -129,8 +134,12 @@ public class AuthRequestFactory {
        Map<String, ExtendProperties.ExtendRequestConfig> upperConfig = new HashMap<>(6);
        extendConfig.forEach((k, v) -> upperConfig.put(k.toUpperCase(), v));

-        ExtendProperties.ExtendRequestConfig extendRequestConfig = upperConfig.get(source.toUpperCase());
+        ExtendProperties.ExtendRequestConfig extendRequestConfig = upperConfig.get(upperSource);
        if (extendRequestConfig != null) {
+
+            // 配置 http config
+            configureHttpConfig(upperSource, extendRequestConfig, properties.getHttpConfig());
+
            Class<? extends AuthRequest> requestClass = extendRequestConfig.getRequestClass();

            if (requestClass != null) {
@@ -159,12 +168,15 @@ public class AuthRequestFactory {
            return null;
        }

-        AuthConfig config = properties.getType().get(authDefaultSource);
+        AuthConfig config = properties.getType().get(authDefaultSource.name());
        // 找不到对应关系，直接返回空
        if (config == null) {
            return null;
        }

+        // 配置 http config
+        configureHttpConfig(authDefaultSource.name(), config, properties.getHttpConfig());
+
        switch (authDefaultSource) {
            case GITHUB:
                return new AuthGithubRequest(config, authStateCache);
@@ -174,26 +186,26 @@ public class AuthRequestFactory {
                return new AuthGiteeRequest(config, authStateCache);
            case DINGTALK:
                return new AuthDingTalkRequest(config, authStateCache);
+            case DINGTALK_V2:
+                return new AuthDingTalkV2Request(config, authStateCache);
+            case DINGTALK_ACCOUNT:
+                return new AuthDingTalkAccountRequest(config, authStateCache);
            case BAIDU:
                return new AuthBaiduRequest(config, authStateCache);
            case CSDN:
                return new AuthCsdnRequest(config, authStateCache);
            case CODING:
                return new AuthCodingRequest(config, authStateCache);
-            case TENCENT_CLOUD:
-                return new AuthTencentCloudRequest(config, authStateCache);
            case OSCHINA:
                return new AuthOschinaRequest(config, authStateCache);
            case ALIPAY:
                return new AuthAlipayRequest(config, authStateCache);
            case QQ:
                return new AuthQqRequest(config, authStateCache);
-            case WECHAT_MP:
-                return new AuthWeChatMpRequest(config, authStateCache);
            case WECHAT_OPEN:
                return new AuthWeChatOpenRequest(config, authStateCache);
-            case WECHAT_ENTERPRISE:
-                return new AuthWeChatEnterpriseRequest(config, authStateCache);
+            case WECHAT_MP:
+                return new AuthWeChatMpRequest(config, authStateCache);
            case TAOBAO:
                return new AuthTaobaoRequest(config, authStateCache);
            case GOOGLE:
@@ -206,6 +218,9 @@ public class AuthRequestFactory {
                return new AuthLinkedinRequest(config, authStateCache);
            case MICROSOFT:
                return new AuthMicrosoftRequest(config, authStateCache);
+            case MICROSOFT_CN:
+                return new AuthMicrosoftCnRequest(config, authStateCache);
+
            case MI:
                return new AuthMiRequest(config, authStateCache);
            case TOUTIAO:
@@ -220,18 +235,86 @@ public class AuthRequestFactory {
                return new AuthStackOverflowRequest(config, authStateCache);
            case HUAWEI:
                return new AuthHuaweiRequest(config, authStateCache);
-            case GITLAB:
-                return new AuthGitlabRequest(config, authStateCache);
+            case HUAWEI_V3:
+                return new AuthHuaweiV3Request(config, authStateCache);
+            case WECHAT_ENTERPRISE:
+                return new AuthWeChatEnterpriseQrcodeRequest(config, authStateCache);
+            case WECHAT_ENTERPRISE_V2:
+                return new AuthWeChatEnterpriseQrcodeV2Request(config, authStateCache);
+            case WECHAT_ENTERPRISE_QRCODE_THIRD:
+                return new AuthWeChatEnterpriseThirdQrcodeRequest(config, authStateCache);
+            case WECHAT_ENTERPRISE_WEB:
+                return new AuthWeChatEnterpriseWebRequest(config, authStateCache);
            case KUJIALE:
                return new AuthKujialeRequest(config, authStateCache);
-            case ELEME:
-                return new AuthElemeRequest(config, authStateCache);
+            case GITLAB:
+                return new AuthGitlabRequest(config, authStateCache);
            case MEITUAN:
                return new AuthMeituanRequest(config, authStateCache);
-            case TWITTER:
+            case ELEME:
+                return new AuthElemeRequest(config, authStateCache);
+           case TWITTER:
                return new AuthTwitterRequest(config, authStateCache);
+            case FEISHU:
+                return new AuthFeishuRequest(config, authStateCache);
+            case JD:
+                return new AuthJdRequest(config, authStateCache);
+            case ALIYUN:
+                return new AuthAliyunRequest(config, authStateCache);
+            case XMLY:
+                return new AuthXmlyRequest(config, authStateCache);
+            case AMAZON:
+                return new AuthAmazonRequest(config, authStateCache);
+            case SLACK:
+                return new AuthSlackRequest(config, authStateCache);
+            case LINE:
+                return new AuthLineRequest(config, authStateCache);
+            case OKTA:
+                return new AuthOktaRequest(config, authStateCache);
+            case PROGINN:
+                return new AuthProginnRequest(config,authStateCache);
+            case AFDIAN:
+                return new AuthAfDianRequest(config,authStateCache);
+            case APPLE:
+                return new AuthAppleRequest(config,authStateCache);
+            case FIGMA:
+                return new AuthFigmaRequest(config,authStateCache);
+            case WECHAT_MINI_PROGRAM:
+                config.setIgnoreCheckRedirectUri(true);
+                config.setIgnoreCheckState(true);
+                return new AuthWechatMiniProgramRequest(config, authStateCache);
+            case QQ_MINI_PROGRAM:
+                config.setIgnoreCheckRedirectUri(true);
+                config.setIgnoreCheckState(true);
+                return new AuthQQMiniProgramRequest(config, authStateCache);
            default:
                return null;
        }
    }
+
+    /**
+     * 配置 http 相关的配置
+     *
+     * @param authSource {@link AuthSource}
+     * @param authConfig {@link AuthConfig}
+     */
+    private void configureHttpConfig(String authSource, AuthConfig authConfig, JustAuthProperties.JustAuthHttpConfig httpConfig) {
+        if (null == httpConfig) {
+            return;
+        }
+        Map<String, JustAuthProperties.JustAuthProxyConfig> proxyConfigMap = httpConfig.getProxy();
+        if (CollectionUtils.isEmpty(proxyConfigMap)) {
+            return;
+        }
+        JustAuthProperties.JustAuthProxyConfig proxyConfig = proxyConfigMap.get(authSource);
+
+        if (null == proxyConfig) {
+            return;
+        }
+
+        authConfig.setHttpConfig(HttpConfig.builder()
+            .timeout(httpConfig.getTimeout())
+            .proxy(new Proxy(Proxy.Type.valueOf(proxyConfig.getType()), new InetSocketAddress(proxyConfig.getHostname(), proxyConfig.getPort())))
+            .build());
+    }
 }
--- a/src/main/java/com/xkcoding/justauth/autoconfigure/CacheProperties.java
+++ b/src/main/java/com/xkcoding/justauth/autoconfigure/CacheProperties.java
@@ -66,6 +66,6 @@ public class CacheProperties {
        /**
         * 自定义缓存
         */
-        CUSTOM;
+        CUSTOM
    }
 }
--- a/src/main/java/com/xkcoding/justauth/autoconfigure/ExtendProperties.java
+++ b/src/main/java/com/xkcoding/justauth/autoconfigure/ExtendProperties.java
@@ -46,7 +46,7 @@ public class ExtendProperties {

    @Getter
    @Setter
-    public static class ExtendRequestConfig extends AuthConfig{
+    public static class ExtendRequestConfig extends AuthConfig {
        /**
         * 请求对应全路径
         */
--- a/src/main/java/com/xkcoding/justauth/autoconfigure/JustAuthProperties.java
+++ b/src/main/java/com/xkcoding/justauth/autoconfigure/JustAuthProperties.java
@@ -20,10 +20,10 @@ package com.xkcoding.justauth.autoconfigure;
 import lombok.Getter;
 import lombok.Setter;
 import me.zhyd.oauth.config.AuthConfig;
-import me.zhyd.oauth.config.AuthDefaultSource;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;

+import java.net.Proxy;
 import java.util.HashMap;
 import java.util.Map;

@@ -47,7 +47,13 @@ public class JustAuthProperties {
    /**
     * JustAuth 默认配置
     */
-    private Map<AuthDefaultSource, AuthConfig> type = new HashMap<>();
+    private Map<String, AuthConfig> type = new HashMap<>();
+
+
+    /**
+     * http 相关的配置，可设置请求超时时间和代理配置
+     */
+    private JustAuthHttpConfig httpConfig;

    /**
     * JustAuth 自定义配置
@@ -61,4 +67,19 @@ public class JustAuthProperties {
    @NestedConfigurationProperty
    private CacheProperties cache = new CacheProperties();

+    @Getter
+    @Setter
+    public static class JustAuthProxyConfig {
+        private String type = Proxy.Type.HTTP.name();
+        private String hostname;
+        private int port;
+    }
+
+    @Getter
+    @Setter
+    public static class JustAuthHttpConfig {
+        private int timeout;
+        private Map<String, JustAuthProxyConfig> proxy;
+    }
+
 }
--- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,119 +1,219 @@
 {
-  "properties": [
-    {
-      "name": "justauth.type",
-      "type": "java.util.Map<me.zhyd.oauth.config.AuthSource,me.zhyd.oauth.config.AuthConfig>",
-      "description": "JustAuth 配置.",
-      "sourceType": "com.xkcoding.justauth.autoconfigure.JustAuthProperties"
-    }
-  ],
  "hints": [
    {
      "name": "justauth.type.keys",
-      "providers": [
+      "values": [
        {
-          "name": "handle-as",
-          "values": [
-            {
-              "value": "GITHUB",
-              "description": "GITHUB."
-            },
-            {
-              "value": "WEIBO",
-              "description": "WEIBO."
-            },
-            {
-              "value": "GITEE",
-              "description": "GITEE."
-            },
-            {
-              "value": "DINGTALK",
-              "description": "DINGTALK."
-            },
-            {
-              "value": "BAIDU",
-              "description": "BAIDU."
-            },
-            {
-              "value": "CSDN",
-              "description": "CSDN."
-            },
-            {
-              "value": "CODING",
-              "description": "CODING."
-            },
-            {
-              "value": "TENCENT_CLOUD",
-              "description": "TENCENT_CLOUD."
-            },
-            {
-              "value": "OSCHINA",
-              "description": "OSCHINA."
-            },
-            {
-              "value": "ALIPAY",
-              "description": "ALIPAY."
-            },
-            {
-              "value": "QQ",
-              "description": "QQ."
-            },
-            {
-              "value": "WECHAT",
-              "description": "WECHAT."
-            },
-            {
-              "value": "TAOBAO",
-              "description": "TAOBAO."
-            },
-            {
-              "value": "GOOGLE",
-              "description": "GOOGLE."
-            },
-            {
-              "value": "FACEBOOK",
-              "description": "FACEBOOK."
-            },
-            {
-              "value": "DOUYIN",
-              "description": "DOUYIN."
-            },
-            {
-              "value": "LINKEDIN",
-              "description": "LINKEDIN."
-            },
-            {
-              "value": "MICROSOFT",
-              "description": "MICROSOFT."
-            },
-            {
-              "value": "MI",
-              "description": "MI."
-            },
-            {
-              "value": "TOUTIAO",
-              "description": "TOUTIAO."
-            },
-            {
-              "value": "TEAMBITION",
-              "description": "TEAMBITION."
-            },
-            {
-              "value": "RENREN",
-              "description": "RENREN."
-            },
-            {
-              "value": "PINTEREST",
-              "description": "PINTEREST."
-            },
-            {
-              "value": "STACK_OVERFLOW",
-              "description": "STACK_OVERFLOW."
-            }
-          ],
-          "parameters": {
-            "target": "me.zhyd.oauth.config.AuthSource"
-          }
+          "value": "GITHUB",
+          "description": "GITHUB."
+        },
+        {
+          "value": "WEIBO",
+          "description": "WEIBO."
+        },
+        {
+          "value": "GITEE",
+          "description": "GITEE."
+        },
+        {
+          "value": "DINGTALK",
+          "description": "DINGTALK."
+        },
+        {
+          "value": "DINGTALK_V2",
+          "description": "DINGTALK_V2."
+        },
+        {
+          "value": "DINGTALK_ACCOUNT",
+          "description": "DINGTALK_ACCOUNT."
+        },
+        {
+          "value": "BAIDU",
+          "description": "BAIDU."
+        },
+        {
+          "value": "CSDN",
+          "description": "CSDN."
+        },
+        {
+          "value": "CODING",
+          "description": "CODING."
+        },
+        {
+          "value": "OSCHINA",
+          "description": "OSCHINA."
+        },
+        {
+          "value": "ALIPAY",
+          "description": "ALIPAY."
+        },
+        {
+          "value": "QQ",
+          "description": "QQ."
+        },
+        {
+          "value": "WECHAT_OPEN",
+          "description": "WeChat open platform."
+        },
+        {
+          "value": "WECHAT_MP",
+          "description": "WeChat Official Platform."
+        },
+        {
+          "value": "TAOBAO",
+          "description": "TAOBAO."
+        },
+        {
+          "value": "GOOGLE",
+          "description": "GOOGLE."
+        },
+        {
+          "value": "FACEBOOK",
+          "description": "FACEBOOK."
+        },
+        {
+          "value": "DOUYIN",
+          "description": "DOUYIN."
+        },
+        {
+          "value": "LINKEDIN",
+          "description": "LINKEDIN."
+        },
+        {
+          "value": "MICROSOFT",
+          "description": "MICROSOFT."
+        },
+        {
+          "value": "MICROSOFT_CN",
+          "description": "MICROSOFT_CN."
+        },
+        {
+          "value": "MI",
+          "description": "MI."
+        },
+        {
+          "value": "TOUTIAO",
+          "description": "TOUTIAO."
+        },
+        {
+          "value": "TEAMBITION",
+          "description": "TEAMBITION."
+        },
+        {
+          "value": "RENREN",
+          "description": "RENREN."
+        },
+        {
+          "value": "PINTEREST",
+          "description": "PINTEREST."
+        },
+        {
+          "value": "STACK_OVERFLOW",
+          "description": "STACK_OVERFLOW."
+        },
+        {
+          "value": "HUAWEI",
+          "description": "HUAWEI."
+        },
+        {
+          "value": "HUAWEI_V3",
+          "description": "HUAWEI_V3."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE",
+          "description": "WeChat enterprise platform."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE_V2",
+          "description": "WeChat enterprise platform v2."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE_QRCODE_THIRD",
+          "description": "WeChat enterprise qrcode third."
+        },
+        {
+          "value": "WECHAT_ENTERPRISE_WEB",
+          "description": "WeChat enterprise web."
+        },
+        {
+          "value": "KUJIALE",
+          "description": "KUJIALE."
+        },
+        {
+          "value": "GITLAB",
+          "description": "GITLAB."
+        },
+        {
+          "value": "MEITUAN",
+          "description": "MEITUAN."
+        },
+        {
+          "value": "ELEME",
+          "description": "ELEME."
+        },
+        {
+          "value": "TWITTER",
+          "description": "TWITTER."
+        },
+        {
+          "value": "FEISHU",
+          "description": "FEISHU."
+        },
+        {
+          "value": "GITLAB",
+          "description": "GITLAB."
+        },
+        {
+          "value": "JD",
+          "description": "JD."
+        },
+        {
+          "value": "ALIYUN",
+          "description": "ALIYUN."
+        },
+        {
+          "value": "XMLY",
+          "description": "XMLY."
+        },
+        {
+          "value": "AMAZON",
+          "description": "AMAZON."
+        },
+        {
+          "value": "SLACK",
+          "description": "SLACK."
+        },
+        {
+          "value": "LINE",
+          "description": "LINE."
+        },
+        {
+          "value": "OKTA",
+          "description": "OKTA."
+        },
+        {
+          "value": "PROGINN",
+          "description": "PROGINN."
+        },
+        {
+          "value": "AFDIAN",
+          "description": "AFDIAN."
+        },
+        {
+          "value": "APPLE",
+          "description": "APPLE."
+        },
+        {
+          "value": "FIGMA",
+          "description": "FIGMA."
+        },
+        {
+          "value": "WECHAT_MINI_PROGRAM",
+          "description": "WECHAT_MINI_PROGRAM."
+        },
+        {
+          "value": "QQ_MINI_PROGRAM",
+          "description": "QQ_MINI_PROGRAM."
        }
      ]
    },
--- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration
Author	SHA1	Message	Date
yadong.zhang	8f007ca121	Merge pull request #21 from justauth/dependabot/maven/cn.hutool-hutool-core-5.8.19 ⬆️ Bump hutool-core from 5.6.5 to 5.8.19	2024-12-14 19:18:11 +08:00
yadong.zhang	fb8a8b2132	Merge branch 'master' into dependabot/maven/cn.hutool-hutool-core-5.8.19	2024-12-14 19:18:01 +08:00
yadong.zhang	b39f515ecd	Merge pull request #24 from zzzgr/master ⬆️springboot3支持	2024-12-14 19:16:52 +08:00
yadong.zhang	b043116d3c	Merge pull request #26 from luoqiz/feat-update-justauth feat: 升级justauth 1.16.7	2024-12-14 19:16:22 +08:00
luoqiz	500a79b3e6	feat: 升级justauth 1.16.7	2024-12-14 18:57:45 +08:00
yiidii	41e7b958a0	⬆️springboot3支持	2024-04-16 10:29:10 +08:00
dependabot[bot]	c1dc04d4ef	⬆️ Bump hutool-core from 5.6.5 to 5.8.19 Bumps [hutool-core](https://github.com/dromara/hutool) from 5.6.5 to 5.8.19. - [Release notes](https://github.com/dromara/hutool/releases) - [Changelog](https://github.com/dromara/hutool/blob/v5-master/CHANGELOG.md) - [Commits](https://github.com/dromara/hutool/compare/5.6.5...5.8.19) --- updated-dependencies: - dependency-name: cn.hutool:hutool-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-14 16:39:36 +00:00
Yangkai.Shen	4233902219	🔖 发布 1.4.0	2021-05-10 15:55:28 +08:00
Yangkai.Shen	7f04dd3bfd	📝 编写更新记录	2021-01-04 18:50:43 +08:00
yadong.zhang	b24d490024	⬆️ 升级 `JustAuth` 版本：1.15.9，新增飞书、京东、阿里云、喜马拉雅、企业微信网页端登录	2021-01-04 11:12:32 +08:00
Yangkai.Shen	4250bdcf0c	📝 编写文档	2020-09-12 08:12:23 +08:00
Yangkai.Shen	be41025184	🔖 发布 1.3.4	2020-09-12 08:11:35 +08:00
Yangkai.Shen	e283b4731a	📝 更新记录	2020-09-12 08:11:09 +08:00
Yangkai.Shen	155786d42d	⬆️ 依赖升级，JustAuth 1.15.7.beta3 -> 1.15.7	2020-09-12 08:09:42 +08:00
Yangkai.Shen	b2c718268c	📝 编写更新记录	2020-08-31 09:52:54 +08:00
Yangkai.Shen	477805e824	⬆️ 升级 `hutool-core` 版本：5.4.0	2020-08-29 11:55:18 +08:00
Yangkai.Shen	54cad5e128	👌 去除一些 warning	2020-08-29 11:41:59 +08:00
yadong.zhang	23b781797c	⬆️ 升级 `JustAuth` 版本：1.15.7-beta.3，支持自定义 http config 和 scope	2020-08-26 10:06:06 +08:00
yadong.zhang	ce34663f92	📝 更新文档	2020-06-25 13:39:41 +08:00
yadong.zhang	6971ae0387	⬆️ 升级 `JustAuth` 版本：1.15.5，支持自定义 http config	2020-06-25 13:37:19 +08:00
yadong.zhang	8a49350b61	⬆️ 升级 JustAuth 到1.15.4-alpha	2020-06-10 20:12:23 +08:00
yadong.zhang	a82d6b6387	⬆️ 升级 JustAuth 到1.15.4-alpha	2020-06-10 20:11:21 +08:00
				`@@ -0,0 +1 @@`
				`com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration`