diff --git a/java/pom.xml b/java/pom.xml index fb2c21e..c88d67c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.1.RELEASE + 2.2.7.RELEASE com.toesbieya diff --git a/java/src/main/java/com/toesbieya/my/aspect/LockAspect.java b/java/src/main/java/com/toesbieya/my/aspect/LockAspect.java index 46e8f08..c1e9288 100644 --- a/java/src/main/java/com/toesbieya/my/aspect/LockAspect.java +++ b/java/src/main/java/com/toesbieya/my/aspect/LockAspect.java @@ -12,6 +12,7 @@ import org.aspectj.lang.reflect.MethodSignature; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -41,11 +42,11 @@ public class LockAspect { Object[] args = point.getArgs(); for (String v : values) { String lockKey = (String) SpringUtil.spell(v, parameterNames, args); + //跳过空值 + if (StringUtils.isEmpty(lockKey)) continue; LockHelper lockHelper = new RedisLockHelper(lockKey); if (!lockHelper.lock()) { - if (locks.size() > 0) { - locks.forEach(LockHelper::close); - } + locks.forEach(LockHelper::close); return Result.fail("操作失败,请刷新后重试"); } locks.add(lockHelper);