From a8fcd3c3ab90b0c6ef81b0b053dbaa80deb26493 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 20 May 2020 16:14:03 +0800
Subject: [PATCH] =?UTF-8?q?@Lock=E7=A9=BA=E5=80=BC=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=94=81=20SpringBoot=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E8=87=B32.2.7.RELEASE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java/pom.xml                                               | 2 +-
 java/src/main/java/com/toesbieya/my/aspect/LockAspect.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.1.RELEASE</version>
+        <version>2.2.7.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.toesbieya</groupId>
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);