From 3beb04c45f544979610af10444df58746b486595 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Jun 2022 17:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8A=E6=94=BE=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/aop/NoRepeatSubmitAop.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
index 48a3fd7828..e1716469f2 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
@@ -49,6 +49,8 @@ public class NoRepeatSubmitAop {
             long leaseTime = noRepeatSubmit.leaseTime();
             //如果获取不到锁等待0秒直接返回 持锁时间为leaseTime
             lock = distributedLock.getLock(RedisKeys.getNoRepeatSubmitKey(key), leaseTime, NumConstant.ZERO_L, TimeUnit.MILLISECONDS);
+            //因为getLock如果获取失败抛异常 所以不做锁状态的判断
+            result = pjp.proceed();
         } catch (Exception e) {
             log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage());
             //"未获取到锁，重复提交了
@@ -56,13 +58,6 @@ public class NoRepeatSubmitAop {
         } finally {
             distributedLock.unLock(lock);
         }
-        try {
-            //因为getLock如果获取失败抛异常 所以不做锁状态的判断
-            result = pjp.proceed();
-        } finally {
-            distributedLock.unLock(lock);
-        }
-
 
         return result;