Commit 1184b46c4034eaa74e87579740ed802b322b36b0
1 parent
97a91e54
chore: up justauth 1.0.4
Showing
3 changed files
with
4 additions
and
41 deletions
yudao-dependencies/pom.xml
| ... | ... | @@ -44,7 +44,7 @@ |
| 44 | 44 | <!-- Bpm 工作流相关 --> |
| 45 | 45 | <flowable.version>6.8.0</flowable.version> |
| 46 | 46 | <!-- 工具类相关 --> |
| 47 | - <captcha-plus.version>1.0.6</captcha-plus.version> | |
| 47 | + <captcha-plus.version>1.0.7</captcha-plus.version> | |
| 48 | 48 | <jsoup.version>1.15.4</jsoup.version> |
| 49 | 49 | <lombok.version>1.18.28</lombok.version> |
| 50 | 50 | <mapstruct.version>1.5.5.Final</mapstruct.version> |
| ... | ... | @@ -65,12 +65,12 @@ |
| 65 | 65 | <okio.version>3.0.0</okio.version> |
| 66 | 66 | <okhttp3.version>4.10.0</okhttp3.version> |
| 67 | 67 | <commons-io.version>2.11.0</commons-io.version> |
| 68 | - <minio.version>8.5.4</minio.version> | |
| 68 | + <minio.version>8.5.5</minio.version> | |
| 69 | 69 | <aliyun-java-sdk-core.version>4.6.3</aliyun-java-sdk-core.version> |
| 70 | 70 | <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version> |
| 71 | 71 | <tencentcloud-sdk-java.version>3.1.758</tencentcloud-sdk-java.version> |
| 72 | - <justauth.version>1.0.3</justauth.version> | |
| 73 | - <jimureport.version>1.5.8</jimureport.version> | |
| 72 | + <justauth.version>1.0.4</justauth.version> | |
| 73 | + <jimureport.version>1.6.1</jimureport.version> | |
| 74 | 74 | <xercesImpl.version>2.12.2</xercesImpl.version> |
| 75 | 75 | <weixin-java.version>4.5.0</weixin-java.version> |
| 76 | 76 | </properties> | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java deleted
| 1 | -package cn.iocoder.yudao.framework.social.config; | |
| 2 | - | |
| 3 | -import cn.iocoder.yudao.framework.social.core.YudaoAuthRequestFactory; | |
| 4 | -import com.xingyuv.http.HttpUtil; | |
| 5 | -import com.xingyuv.http.support.hutool.HutoolImpl; | |
| 6 | -import com.xingyuv.jushauth.cache.AuthStateCache; | |
| 7 | -import com.xingyuv.justauth.autoconfigure.JustAuthProperties; | |
| 8 | -import lombok.extern.slf4j.Slf4j; | |
| 9 | -import org.springframework.boot.autoconfigure.AutoConfiguration; | |
| 10 | -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | |
| 11 | -import org.springframework.boot.context.properties.EnableConfigurationProperties; | |
| 12 | -import org.springframework.context.annotation.Bean; | |
| 13 | -import org.springframework.context.annotation.Primary; | |
| 14 | - | |
| 15 | -/** | |
| 16 | - * 社交自动装配类 | |
| 17 | - * | |
| 18 | - * @author timfruit | |
| 19 | - * @date 2021-10-30 | |
| 20 | - */ | |
| 21 | -@Slf4j | |
| 22 | -@AutoConfiguration | |
| 23 | -@EnableConfigurationProperties(JustAuthProperties.class) | |
| 24 | -public class YudaoSocialAutoConfiguration { | |
| 25 | - | |
| 26 | - @Bean | |
| 27 | - @Primary | |
| 28 | - @ConditionalOnProperty(prefix = "justauth", value = "enabled", havingValue = "true", matchIfMissing = true) | |
| 29 | - public YudaoAuthRequestFactory yudaoAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) { | |
| 30 | - // 需要修改 HttpUtil 使用的实现，避免类报错 | |
| 31 | - HttpUtil.setHttp(new HutoolImpl()); | |
| 32 | - // 创建 YudaoAuthRequestFactory | |
| 33 | - return new YudaoAuthRequestFactory(properties, authStateCache); | |
| 34 | - } | |
| 35 | - | |
| 36 | -} |
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted