oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复过期方法

Browse Source
This commit is contained in:
xingyu4j
2022-12-01 10:49:56 +08:00
parent 79df30d0f8
commit 80db91ea97
18 changed files with 344 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
View File

@@ -63,7 +63,7 @@
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>4.3.8.B</version>
<version>4.4.0</version>
</dependency>
<!-- TODO 芋艿：清理 -->

1
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java
View File

@@ -45,6 +45,7 @@ public class YudaoAuthRequestFactory extends AuthRequestFactory {
* @param source {@link AuthSource}
* @return {@link AuthRequest}
*/
@Override
public AuthRequest get(String source) {
// 先尝试获取自定义扩展的
AuthRequest authRequest = getExtendRequest(source);

2
yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
View File

@@ -35,7 +35,7 @@
<groupId>com.github.binarywang</groupId>
<!-- <artifactId>weixin-java-mp</artifactId>-->
<artifactId>wx-java-mp-spring-boot-starter</artifactId>
<version>4.3.8.B</version>
<version>4.4.0</version>
</dependency>
<!-- TODO 芋艿：清理 -->
</dependencies>

8
yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/context/EnvContextHolder.java vendored
View File

@@ -18,18 +18,18 @@ public class EnvContextHolder {
*
* 使用 {@link List} 的原因，可能存在多层设置或者清理
*/
private static final ThreadLocal<List<String>> tagContext = TransmittableThreadLocal.withInitial(ArrayList::new);
private static final ThreadLocal<List<String>> TAG_CONTEXT = TransmittableThreadLocal.withInitial(ArrayList::new);
public static void setTag(String tag) {
tagContext.get().add(tag);
TAG_CONTEXT.get().add(tag);
}
public static String getTag() {
return CollUtil.getLast(tagContext.get());
return CollUtil.getLast(TAG_CONTEXT.get());
}
public static void removeTag() {
List<String> tags = tagContext.get();
List<String> tags = TAG_CONTEXT.get();
if (CollUtil.isEmpty(tags)) {
return;
}