Jelajahi Sumber

Update springdoc 2.8.9 => 2.8.13,fastexcel 1.2.0 => 1.3.0,redisson 3.50.0 => 3.51.0

Yue 6 bulan lalu
induk
melakukan
fe6c446042

+ 3 - 3
SERVER/VberAdminPlusV3/pom.xml

@@ -24,16 +24,16 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>3.5.4</spring-boot.version>
         <spring-boot-admin.version>3.5.1</spring-boot-admin.version>
-        <springdoc.version>2.8.9</springdoc.version>
+        <springdoc.version>2.8.13</springdoc.version>
         <mybatis.version>3.5.16</mybatis.version>
         <mybatis-plus.version>3.5.12</mybatis-plus.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <shardingsphere.version>5.5.0</shardingsphere.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
-        <redisson.version>3.50.0</redisson.version>
+        <redisson.version>3.51.0</redisson.version>
         <xxl-job.version>2.4.1</xxl-job.version>
         <poi.version>5.2.3</poi.version>
-        <fastexcel.version>1.2.0</fastexcel.version>
+        <fastexcel.version>1.3.0</fastexcel.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.44.0</satoken.version>
         <p6spy.version>3.9.1</p6spy.version>

+ 7 - 0
SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/com/vber/common/social/config/properties/SocialLoginConfigProperties.java

@@ -2,6 +2,8 @@ package com.vber.common.social.config.properties;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 社交登录配置
  *
@@ -65,4 +67,9 @@ public class SocialLoginConfigProperties {
      */
     private String serverUrl;
 
+    /**
+     * 请求范围
+     */
+    private List<String> scopes;
+
 }

+ 2 - 1
SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/com/vber/common/social/utils/SocialUtils.java

@@ -39,7 +39,8 @@ public class SocialUtils {
         AuthConfig.AuthConfigBuilder builder = AuthConfig.builder()
                 .clientId(obj.getClientId())
                 .clientSecret(obj.getClientSecret())
-                .redirectUri(obj.getRedirectUri());
+                .redirectUri(obj.getRedirectUri())
+                .scopes(obj.getScopes());
         return switch (source.toLowerCase()) {
             case "dingtalk" -> new AuthDingTalkV2Request(builder.build(), STATE_CACHE);
             case "baidu" -> new AuthBaiduRequest(builder.build(), STATE_CACHE);