BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4f7cd65e9598680e74f0c38216f2f4c3d117bc7e

Authored by 芋道源码
Committed by Gitee
2 parents 8505873e 9d5d1921

!164 fix：使用一键改包之后，可能导致的自定义lock4j失败策略bean与lock4j提供的默认失败策略bean冲突问题 

Merge pull request !164 from baihongbin/master
Inline Side-by-side
Showing 1 changed file with 3 additions and 0 deletions
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java
  View file @4f7cd65
1 package cn.iocoder.yudao.framework.lock4j.config; 1 package cn.iocoder.yudao.framework.lock4j.config;
2 2
3 import cn.hutool.core.util.ClassUtil; 3 import cn.hutool.core.util.ClassUtil;
  4 +import com.baomidou.lock.spring.boot.autoconfigure.LockAutoConfiguration;
4 import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy; 5 import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy;
5 import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants; 6 import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants;
  7 +import org.springframework.boot.autoconfigure.AutoConfigureBefore;
6 import org.springframework.context.annotation.Bean; 8 import org.springframework.context.annotation.Bean;
7 import org.springframework.context.annotation.Configuration; 9 import org.springframework.context.annotation.Configuration;
8 10
9 @Configuration 11 @Configuration
  12 +@AutoConfigureBefore(LockAutoConfiguration.class)
10 public class YudaoLock4jConfiguration { 13 public class YudaoLock4jConfiguration {
11 14
12 static { 15 static {