diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 99998b5eb..3a07b01b2 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -16,57 +16,57 @@ 1.6.4-snapshot - 2.6.10 + 2.6.11 3.0.3 1.6.6 2.5 - 1.2.12 + 1.2.13-SNSAPSHOT 3.5.2 - 3.5.2 + 3.5.3 3.5.2 3.17.6 1.9.2 - 2.2.0 + 2.2.2 1.7.1 - 8.7.0 + 8.12.0 2.6.7 0.31.0 7.2.9.RELEASE 1.0.3 - 4.0.0 + 4.8.0 6.7.2 3.0.4 1.18.24 1.5.2.Final - 5.8.6 + 5.8.8 3.1.1 2.3 1.0.5 1.2.83 31.1-jre 5.1.0 - 2.12.2 + 2.14.0 3.8.0 0.1.55 2.4.1 1.3.0 8.2.2 - 4.6.1 + 4.6.2 2.2.1 3.1.561 1.2.7 1.4.0 1.5.2 - 2.12.0 + 2.12.2 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml index 4a6f92dca..1c3a3bde1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml @@ -52,7 +52,7 @@ com.alipay.sdk alipay-sdk-java - 4.33.39.ALL + 4.33.44.ALL org.bouncycastle diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java index 3af543530..2cea08bf8 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java +++ b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java @@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant import com.baomidou.lock.LockFailureStrategy; import lombok.extern.slf4j.Slf4j; +import java.lang.reflect.Method; + /** * 自定义获取锁失败策略,抛出 {@link ServiceException} 异常 */ @@ -12,9 +14,8 @@ import lombok.extern.slf4j.Slf4j; public class DefaultLockFailureStrategy implements LockFailureStrategy { @Override - public void onLockFailure(String key, long acquireTimeout, int acquireCount) { - log.debug("[onLockFailure][线程:{} 获取锁失败,key:{} 获取超时时长:{} ms]", Thread.currentThread().getName(), key, acquireTimeout); + public void onLockFailure(String key, Method method, Object[] arguments) { + log.debug("[onLockFailure][线程:{} 获取锁失败,key:{} 获取失败:{} ]", Thread.currentThread().getName(), key, arguments); throw new ServiceException(GlobalErrorCodeConstants.LOCKED); } - }