From 8104e5c54ee75393c9115c814443fe526cefd0a2 Mon Sep 17 00:00:00 2001
From: wangkang <wangkangit@163.com>
Date: Mon, 4 Sep 2017 19:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0snowflake=E7=9A=84datacenterI?=
 =?UTF-8?q?d=E5=92=8CworkerId=E7=9A=84ID=E5=88=86=E9=85=8D=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5,=E5=88=A9=E7=94=A8redis=E7=9A=84=E5=8E=9F=E5=AD=90?=
 =?UTF-8?q?=E9=94=81=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/itkk/udf/id/IdWorkerInit.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorkerInit.java b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorkerInit.java
index 084c121..6e246f2 100644
--- a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorkerInit.java
+++ b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorkerInit.java
@@ -42,7 +42,7 @@ public class IdWorkerInit {
     /**
      * job执行时间
      */
-    private static final long JOB_RUN_TIME = 20 * 1000;
+    private static final long JOB_RUN_TIME = 20l * 1000l;
 
     /**
      * 机器ID( 0 - 31 )
@@ -95,7 +95,7 @@ public class IdWorkerInit {
                 for (int i = 0; i <= MAX_COUNT; i++) { //datacenterId
                     for (int j = 0; j <= MAX_COUNT; j++) { //workerId
                         //生成key
-                        String key = cacheRedisProperties.getPrefix().concat(SPLIT).concat(CACHE_NAME).concat(SPLIT).concat(i + "").concat(SPLIT).concat(j + "");
+                        String key = cacheRedisProperties.getPrefix().concat(SPLIT).concat(CACHE_NAME).concat(SPLIT).concat(Integer.toString(i)).concat(SPLIT).concat(Integer.toString(j));
                         //创建锁
                         lock = connection.setNX(serializer.serialize(key), serializer.serialize(String.valueOf(new Date().getTime())));
                         //获得锁成功
@@ -136,14 +136,14 @@ public class IdWorkerInit {
     @Scheduled(fixedRate = JOB_RUN_TIME)
     public void refresh() {
         //id生成器实例化成功的情况下执行
-        if (this.workerId != null && this.datacenterId != null & this.idWorker != null) {
+        if (this.workerId != null && this.datacenterId != null && this.idWorker != null) {
             //开始处理
             boolean result = redisTemplate.execute((RedisCallback<Boolean>) connection -> {
                 try {
                     //实例化解析器
                     StringRedisSerializer serializer = new StringRedisSerializer();
                     //生成key
-                    String key = cacheRedisProperties.getPrefix().concat(SPLIT).concat(CACHE_NAME).concat(SPLIT).concat(this.datacenterId + "").concat(SPLIT).concat(this.workerId + "");
+                    String key = cacheRedisProperties.getPrefix().concat(SPLIT).concat(CACHE_NAME).concat(SPLIT).concat(Integer.toString(this.datacenterId)).concat(SPLIT).concat(Integer.toString(this.workerId));
                     //如果key不存在就创建(方式特殊情况,缓存丢失掉)
                     connection.setNX(serializer.serialize(key), serializer.serialize(String.valueOf(new Date().getTime())));
                     //设置超时时间