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") 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; } 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; 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); 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); 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);