Merge remote-tracking branch 'origin/develop' into develop

2 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/com/zdjizhi/utils/SnowflakeId.java b/src/main/java/com/zdjizhi/utils/SnowflakeId.java
index 9a068fd..afae296 100644
--- a/src/main/java/com/zdjizhi/utils/SnowflakeId.java
+++ b/src/main/java/com/zdjizhi/utils/SnowflakeId.java
@@ -224,7 +224,7 @@ public class SnowflakeId {
      *

      * @return

      */

-    public static Long generateId(String zookeeperIp, long dataCenterIdNum) {

+    public synchronized static Long generateId(String zookeeperIp, long dataCenterIdNum) {

         if (idWorker == null) {

             getSnowflakeldInstance(zookeeperIp, dataCenterIdNum);

         }

diff --git a/src/main/java/com/zdjizhi/utils/ZookeeperUtils.java b/src/main/java/com/zdjizhi/utils/ZookeeperUtils.java
index 31e5c27..3142fff 100644
--- a/src/main/java/com/zdjizhi/utils/ZookeeperUtils.java
+++ b/src/main/java/com/zdjizhi/utils/ZookeeperUtils.java
@@ -1,15 +1,19 @@
 package com.zdjizhi.utils;

 

-import org.apache.commons.lang3.RandomUtils;

-import org.apache.log4j.Logger;

-import org.apache.zookeeper.*;

-import org.apache.zookeeper.data.ACL;

-import org.apache.zookeeper.data.Stat;

-

 import java.io.IOException;

 import java.util.List;

 import java.util.concurrent.CountDownLatch;

 

+import org.apache.log4j.Logger;

+import org.apache.zookeeper.CreateMode;

+import org.apache.zookeeper.KeeperException;

+import org.apache.zookeeper.WatchedEvent;

+import org.apache.zookeeper.Watcher;

+import org.apache.zookeeper.ZooDefs;

+import org.apache.zookeeper.ZooKeeper;

+import org.apache.zookeeper.data.ACL;

+import org.apache.zookeeper.data.Stat;

+

 

 public class ZookeeperUtils implements Watcher {

     private static Logger logger = Logger.getLogger(ZookeeperUtils.class);

@@ -40,7 +44,7 @@ public class ZookeeperUtils implements Watcher {
             connectZookeeper(zookeeperIp);

             Stat stat = zookeeper.exists(path, true);

             workerId = Integer.parseInt(getNodeDate(path));

-            if (workerId > 55) {

+            if (workerId > 63) {

                 workerId = 0;

                 zookeeper.setData(path, "1".getBytes(), stat.getVersion());

             } else {

@@ -52,8 +56,7 @@ public class ZookeeperUtils implements Watcher {
                 }

             }

         } catch (KeeperException | InterruptedException e) {

-            e.printStackTrace();

-            workerId = RandomUtils.nextInt(56, 63);

+            logger.error("modify error Can't modify,"+e.getMessage());

         }

         finally {

             closeConn();