From 64b8e8cf1865399b945676ed77ae55967815db4c Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:14:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20XxlJobConfi?= =?UTF-8?q?guration.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/boot/starter/job/config/XxlJobConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java b/jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java index 228d2af9..7248582d 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java +++ b/jero-boot/jero-boot-starter/jero-boot-starter-job/src/main/java/com/jero/boot/starter/job/config/XxlJobConfiguration.java @@ -10,6 +10,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import javax.annotation.Resource; + /** * 定时任务配置 @@ -21,7 +23,7 @@ import org.springframework.context.annotation.Configuration; public class XxlJobConfiguration { - @Autowired + @Resource private XxlJobProperties xxlJobProperties; //@Bean(initMethod = "start", destroyMethod = "destroy") From 729bb4f6cc7e75a3b046ab9d3d8c0c7a73be6f50 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:30:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20Masterslave?= =?UTF-8?q?RedissonConfigStrategyImpl.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/impl/MasterslaveRedissonConfigStrategyImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java index d4e14ba3..052b04f2 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java +++ b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java @@ -43,7 +43,7 @@ public class MasterslaveRedissonConfigStrategyImpl implements RedissonConfigStra } slaveList.remove(0); - config.useMasterSlaveServers().addSlaveAddress((String[]) slaveList.toArray()); + config.useMasterSlaveServers().addSlaveAddress(slaveList.toArray(new String[0])); log.info("初始化主从方式Config,redisAddress:" + address); } catch (Exception e) { log.error("主从Redisson初始化错误", e); From 16672de2473168ac935998130d66379c4b1e4b53 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:31:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20RedissonMan?= =?UTF-8?q?ager.java=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/core/RedissonManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/RedissonManager.java b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/RedissonManager.java index 43f1d20d..5580a15c 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/RedissonManager.java +++ b/jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/core/RedissonManager.java @@ -33,7 +33,7 @@ public class RedissonManager { public RedissonManager(RedissonProperties redissonProperties) { //装配开关 Boolean enabled = redissonProperties.getEnabled(); - if (enabled) { + if (enabled != null && enabled) { try { config = RedissonConfigFactory.getInstance().createConfig(redissonProperties); redisson = (Redisson) Redisson.create(config); From 3174eefeb8bf20bbd6307370102f7da3a1abaf02 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:31:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20Distributed?= =?UTF-8?q?LockHandler.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/boot/starter/lock/aspect/DistributedLockHandler.java | 1 + 1 file changed, 1 insertion(+) 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 e928aa08..edcba56b 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 @@ -160,6 +160,7 @@ public class DistributedLockHandler extends BaseAspect{ case WRITE: rLock = redissonClient.getReadWriteLock(getValueBySpEL(keys[0], parameterNames, args, keyConstant).get(0)).writeLock(); break; + default: break; } return rLock; } From 1f914f3341543e78695ef597e10d08d9a83830cd Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:33:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20RepeatSubmi?= =?UTF-8?q?tAspect.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/boot/starter/lock/aspect/RepeatSubmitAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cffeda9b..cf6ec3c7 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 @@ -51,7 +51,7 @@ public class RepeatSubmitAspect extends BaseAspect{ // 获取参数 Object[] args = joinPoint.getArgs(); // 进行一些参数的处理，比如获取订单号，操作人id等 - StringBuffer lockKeyBuffer = new StringBuffer(); +// StringBuffer lockKeyBuffer = new StringBuffer(); String key =getValueBySpEL(jRepeat.lockKey(), parameterNames, args,"RepeatSubmit").get(0); // 公平加锁，lockTime后锁自动释放 boolean isLocked = false; From c16fd44b3b229b47fe38d22936229b0375012532 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Thu, 9 Mar 2023 17:36:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20BaseRabbiMq?= =?UTF-8?q?Handler.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-rabbitmq/src/main/java/com/jero/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java b/jero-boot/jero-boot-starter/jero-boot-starter-rabbitmq/src/main/java/com/jero/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java index 3b3aca59..014c9f67 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-rabbitmq/src/main/java/com/jero/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java +++ b/jero-boot/jero-boot-starter/jero-boot-starter-rabbitmq/src/main/java/com/jero/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java @@ -12,7 +12,7 @@ public class BaseRabbiMqHandler { private String token= UserTokenContext.getToken(); - public void onMessage(T t, Long deliveryTag, Channel channel, MqListener mqListener) { + public void onMessage(T t, Long deliveryTag, Channel channel, MqListener mqListener) { try { UserTokenContext.setToken(token); mqListener.handler(t, channel);