From 06356aab40a78325f722f5520eb99769a87f1068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 4 Apr 2023 16:56:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=E5=BE=AE=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/boot/starter/lock/aspect/BaseAspect.java    | 2 +-
 .../jero/boot/starter/lock/aspect/DistributedLockHandler.java | 4 ++--
 .../com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/BaseAspect.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/BaseAspect.java
index 70183336..a9a2c968 100644
--- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/BaseAspect.java
+++ b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/BaseAspect.java
@@ -44,7 +44,7 @@ public class BaseAspect {
         Object value = expression.getValue(context);
         if (value != null) {
             if (value instanceof List) {
-                List value1 = (List) value;
+                List<Object> value1 = (List) value;
                 for (Object o : value1) {
                     addKeys(keys, o, keyConstant);
                 }
diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java
index 88b9e76a..97d643ea 100644
--- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java
+++ b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/DistributedLockHandler.java
@@ -82,14 +82,14 @@ public class DistributedLockHandler extends BaseAspect{
     private RLock getLock(ProceedingJoinPoint joinPoint, JLock jLock) {
         String[] keys = jLock.lockKey();
         if (keys.length == 0) {
-            throw new RuntimeException("keys不能为空");
+            throw new IllegalArgumentException("keys不能为空");
         }
         String[] parameterNames = new LocalVariableTableParameterNameDiscoverer().getParameterNames(((MethodSignature) joinPoint.getSignature()).getMethod());
         Object[] args = joinPoint.getArgs();
 
         LockModel lockModel = jLock.lockModel();
         if (!lockModel.equals(LockModel.MULTIPLE) && !lockModel.equals(LockModel.REDLOCK) && keys.length > 1) {
-            throw new RuntimeException("参数有多个,锁模式为->" + lockModel.name() + ".无法锁定");
+            throw new IllegalArgumentException("参数有多个,锁模式为->" + lockModel.name() + ".无法锁定");
         }
         RLock rLock = null;
         String keyConstant = jLock.keyConstant();
diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java
index 21f6d9d7..6fe8560f 100644
--- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java
+++ b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java
@@ -63,7 +63,7 @@ public class RepeatSubmitAspect extends BaseAspect{
                     return joinPoint.proceed();
                 } else {
                     // 未获取到锁
-                    throw new Exception("请勿重复提交");
+                    throw new IllegalArgumentException("请勿重复提交");
                 }
             } finally {
                 // 如果锁还存在，在方法执行完成后，释放锁