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 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 { // 如果锁还存在,在方法执行完成后,释放锁