From 2bcc7832d4973434dd404f9063ceb0a61837b3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BA=B7?= <wangkangit@163.com>
Date: Wed, 6 Sep 2017 22:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91,=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E6=AD=BB=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/itkk/udf/id/IdWorker.java   | 24 +++++++++----------
 .../java/org/itkk/udf/id/IdWorkerInit.java    | 12 ++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java
index d376089..c1a08be 100644
--- a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java
+++ b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java
@@ -21,62 +21,62 @@ public class IdWorker {
     /**
      * 描述 : 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动）
      */
-    private final long twepoch = 1288834974657L;
+    private long twepoch = 1288834974657L;
 
     /**
      * 描述 : 机器标识位数
      */
-    private final long workerIdBits = 5L;
+    private long workerIdBits = 5L;
 
     /**
      * 描述 : 数据中心标识位数
      */
-    private final long datacenterIdBits = 5L;
+    private long datacenterIdBits = 5L;
 
     /**
      * 描述 : 机器ID最大值
      */
-    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits);
 
     /**
      * 描述 : 数据中心ID最大值
      */
-    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
 
     /**
      * 描述 : 毫秒内自增位
      */
-    private final long sequenceBits = 12L;
+    private long sequenceBits = 12L;
 
     /**
      * 描述 : 机器ID偏左移12位
      */
-    private final long workerIdShift = sequenceBits;
+    private long workerIdShift = sequenceBits;
 
     /**
      * 描述 : 数据中心ID左移17位
      */
-    private final long datacenterIdShift = sequenceBits + workerIdBits;
+    private long datacenterIdShift = sequenceBits + workerIdBits;
 
     /**
      * 描述 : 时间毫秒左移22位
      */
-    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+    private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
 
     /**
      * 描述 : 序列号最大值 , 一微秒能产生的ID个数
      */
-    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+    private long sequenceMask = -1L ^ (-1L << sequenceBits);
 
     /**
      * 描述 : 机器ID( 0 - 31 )
      */
-    private final long workerId;
+    private long workerId;
 
     /**
      * 描述 : 数据中心ID( 0 - 31 )
      */
-    private final long datacenterId;
+    private long datacenterId;
 
     /**
      * 描述 : 序列号( 0 - 4095)
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 e76daaa..bbfb7bc 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
@@ -133,6 +133,18 @@ public class IdWorkerInit {
                         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), jdkSerializationRedisSerializer.serialize(this.cacheValue));
+                        //检查是否是死锁
+                        if (!lock) {
+                            //获得缓存过期时间
+                            long expiration = connection.ttl(serializer.serialize(key));
+                            //如果等于-1,则代表死锁
+                            if (expiration == -1) {
+                                //删除缓存
+                                connection.del(serializer.serialize(key));
+                                //重新创建锁
+                                lock = connection.setNX(serializer.serialize(key), jdkSerializationRedisSerializer.serialize(this.cacheValue));
+                            }
+                        }
                         //获取失败
                         if (!lock) {
                             //获得数据