wangrunpu
/
yudao-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 升级 v1.6.5

Browse Source 
Merge pull request !13 from xingyu/master
master
芋道源码 3 years ago committed by Gitee
parent 79df30d0f8 0f83d0177a
commit 5f513bff9f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
20 changed files with 346 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -24,7 +24,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>1.6.2-snapshot</revision>
<revision>1.6.5-snapshot</revision>
<!-- Maven 相关 -->
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>

32
yudao-dependencies/pom.xml
Unescape View File

@ -14,21 +14,21 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>1.6.2-snapshot</revision>
<revision>1.6.5-snapshot</revision>
<!-- 统一依赖管理 -->
<spring.boot.version>2.7.6</spring.boot.version>
<spring.cloud.version>2021.0.5</spring.cloud.version>
<spring.cloud.alibaba.version>2021.0.4.0</spring.cloud.alibaba.version>
<!-- Web 相关 -->
<knife4j.version>3.0.3</knife4j.version>
<swagger-annotations.version>1.6.7</swagger-annotations.version>
<swagger-annotations.version>1.6.8</swagger-annotations.version>
<servlet.versoin>2.5</servlet.versoin>
<!-- DB 相关 -->
<druid.version>1.2.14</druid.version>
<druid.version>1.2.15</druid.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
<dynamic-datasource.version>3.5.2</dynamic-datasource.version>
<redisson.version>3.17.7</redisson.version>
<redisson.version>3.18.0</redisson.version>
<!-- RPC 相关 -->
<dubbo.version>2.7.15</dubbo.version>
<!-- Config 配置中心相关 -->
@ -40,7 +40,7 @@
<resilience4j.version>1.7.1</resilience4j.version>
<!-- 监控相关 -->
<skywalking.version>8.12.0</skywalking.version>
<spring-boot-admin.version>2.6.9</spring-boot-admin.version>
<spring-boot-admin.version>2.7.7</spring-boot-admin.version>
<opentracing.version>0.33.0</opentracing.version>
<!-- Test 测试相关 -->
<podam.version>7.2.9.RELEASE</podam.version>
@ -51,12 +51,12 @@
<!-- 工具类相关 -->
<lombok.version>1.18.24</lombok.version>
<mapstruct.version>1.5.3.Final</mapstruct.version>
<hutool.version>5.8.9</hutool.version>
<easyexcel.verion>3.1.2</easyexcel.verion>
<hutool.version>5.8.10</hutool.version>
<easyexcel.verion>3.1.3</easyexcel.verion>
<velocity.version>2.3</velocity.version>
<screw.version>1.0.5</screw.version>
<fastjson.version>1.2.83</fastjson.version>
<guava.version>30.1.1-jre</guava.version>
<guava.version>31.1-jre</guava.version>
<guice.version>5.1.0</guice.version>
<transmittable-thread-local.version>2.14.0</transmittable-thread-local.version>
<commons-net.version>3.8.0</commons-net.version>
@ -65,7 +65,9 @@
<aj-captcha.version>1.3.0</aj-captcha.version>
<netty-all.version>4.1.82.Final</netty-all.version>
<!-- 三方云服务相关 -->
<minio.version>8.2.2</minio.version>
<okio.version>3.0.0</okio.version>
<okhttp3.version>4.10.0</okhttp3.version>
<minio.version>8.4.6</minio.version>
<aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
<tencentcloud-sdk-java.version>3.1.635</tencentcloud-sdk-java.version>
@ -430,7 +432,7 @@
</dependency>
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-basic</artifactId>
<artifactId>flowable-spring-boot-starter-process</artifactId>
<version>${flowable.version}</version>
</dependency>
<dependency>
@ -563,6 +565,16 @@
</dependency>
<!-- 三方云服务相关 -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp3.version}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-spring-boot-starter-file</artifactId>

2
yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
Unescape 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
Unescape 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
Unescape 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
Unescape 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;
}

2
yudao-framework/yudao-spring-boot-starter-flowable/pom.xml
Unescape View File

@ -26,7 +26,7 @@
<!-- flowable 工作流相关 -->
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-basic</artifactId>
<artifactId>flowable-spring-boot-starter-process</artifactId>
</dependency>
<dependency>
<groupId>org.flowable</groupId>

2
yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/swagger/SwaggerProvider.java
Unescape View File

@ -86,7 +86,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider {
*/
private String getRoutePath(RouteDefinition route) {
PredicateDefinition pathDefinition = CollUtil.findOne(route.getPredicates(),
predicateDefinition -> predicateDefinition.getName().equals("Path"));
predicateDefinition -> "Path".equals(predicateDefinition.getName()));
if (pathDefinition == null) {
log.info("[get][Route({}) 没有 Path 条件，忽略接口文档]", route.getId());
return null;

303
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

File diff suppressed because one or more lines are too long

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/file/FileConfigRefreshMessage.java
Unescape View File

@ -13,7 +13,7 @@ public class FileConfigRefreshMessage extends RemoteApplicationEvent {
}
public FileConfigRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
Unescape View File

@ -30,6 +30,7 @@ public class CaptchaController extends com.anji.captcha.controller.CaptchaContro
@ApiOperation("获得验证码")
@PermitAll
@OperateLog(enable = false) // 避免 Post 请求被记录操作日志
@Override
public ResponseModel get(@RequestBody CaptchaVO data, HttpServletRequest request) {
return super.get(data, request);
}
@ -38,6 +39,7 @@ public class CaptchaController extends com.anji.captcha.controller.CaptchaContro
@ApiOperation("校验验证码")
@PermitAll
@OperateLog(enable = false) // 避免 Post 请求被记录操作日志
@Override
public ResponseModel check(@RequestBody CaptchaVO data, HttpServletRequest request) {
return super.check(data, request);
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java
Unescape View File

@ -17,7 +17,7 @@ public class OAuth2ClientRefreshMessage extends RemoteApplicationEvent {
}
public OAuth2ClientRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/dept/DeptRefreshMessage.java
Unescape View File

@ -17,7 +17,7 @@ public class DeptRefreshMessage extends RemoteApplicationEvent {
}
public DeptRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/MenuRefreshMessage.java
Unescape View File

@ -13,7 +13,7 @@ public class MenuRefreshMessage extends RemoteApplicationEvent {
}
public MenuRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleMenuRefreshMessage.java
Unescape View File

@ -15,7 +15,7 @@ public class RoleMenuRefreshMessage extends RemoteApplicationEvent {
}
public RoleMenuRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleRefreshMessage.java
Unescape View File

@ -15,7 +15,7 @@ public class RoleRefreshMessage extends RemoteApplicationEvent {
}
public RoleRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/UserRoleRefreshMessage.java
Unescape View File

@ -15,7 +15,7 @@ public class UserRoleRefreshMessage extends RemoteApplicationEvent {
}
public UserRoleRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java
Unescape View File

@ -15,7 +15,7 @@ public class SensitiveWordRefreshMessage extends RemoteApplicationEvent {
}
public SensitiveWordRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsChannelRefreshMessage.java
Unescape View File

@ -17,7 +17,7 @@ public class SmsChannelRefreshMessage extends RemoteApplicationEvent {
}
public SmsChannelRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsTemplateRefreshMessage.java
Unescape View File

@ -17,7 +17,7 @@ public class SmsTemplateRefreshMessage extends RemoteApplicationEvent {
}
public SmsTemplateRefreshMessage(Object source, String originService, String destinationService) {
super(source, originService, destinationService);
super(source, originService, DEFAULT_DESTINATION_FACTORY.getDestination(destinationService));
}
}

Write Preview
Loading…
Cancel
Save