zhuyifan

升级版本

......@@ -61,8 +61,8 @@ dependencies {
// compileOnly 'org.projectlombok:lombok'
// annotationProcessor 'org.projectlombok:lombok'
compileOnly 'org.projectlombok:lombok:1.18.20'
annotationProcessor 'org.projectlombok:lombok:1.18.20'
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
......
......@@ -58,7 +58,6 @@ public class RepeatSubmitAspect {
* 获取LockKey
*
* @param joinPoint 切入点
* @return
*/
public static String getLockKey(ProceedingJoinPoint joinPoint) {
//获取连接点的方法签名对象
......@@ -79,13 +78,13 @@ public class RepeatSubmitAspect {
continue;
}
//如果属性是RequestKeyParam注解,则拼接 连接符 "& + RequestKeyParam"
if (sb.length() > 0) {
if (!sb.isEmpty()) {
sb.append(requestLock.delimiter());
}
sb.append(args[i]);
}
//如果方法上没有加RequestKeyParam注解
if (StringUtils.isEmpty(sb.toString())) {
if (!StringUtils.hasText((sb.toString()))) {
//获取方法上的多个注解(为什么是两层数组:因为第二层数组是只有一个元素的数组)
final var parameterAnnotations = method.getParameterAnnotations();
//循环注解
......@@ -103,7 +102,7 @@ public class RepeatSubmitAspect {
//如果有,设置Accessible为true(为true时可以使用反射访问私有变量,否则不能访问私有变量)
field.setAccessible(true);
//如果属性是RequestKeyParam注解,则拼接 连接符" & + RequestKeyParam"
if (sb.length() > 0) {
if (!sb.isEmpty()) {
sb.append(requestLock.delimiter());
}
sb.append(ReflectionUtils.getField(field, object));
......@@ -112,9 +111,9 @@ public class RepeatSubmitAspect {
}
if (requestLock.isLockByLoginUser()) {
final var operatorId = LoginContextHolder.hasLogin() ? LoginContextHolder.getId() : null;
return requestLock.prefix() + (operatorId != null ? CommonConstants.COLON + operatorId : "") + (sb.length() > 0 ? CommonConstants.UNDERLINE + sb : "");
return requestLock.prefix() + (operatorId != null ? CommonConstants.COLON + operatorId : "") + (!sb.isEmpty() ? CommonConstants.UNDERLINE + sb : "");
} else {
return requestLock.prefix() + (sb.length() > 0 ? CommonConstants.UNDERLINE + sb : "");
return requestLock.prefix() + (!sb.isEmpty() ? CommonConstants.UNDERLINE + sb : "");
}
}
}
......