From f805123c597cf3cb294ba094a85442de8ad6f399 Mon Sep 17 00:00:00 2001
From: JasperXgwang <jasperxgwang@126.com>
Date: Tue, 17 Jul 2018 14:45:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bugs:=201=20=E4=BF=AE=E6=94=B9rocksDB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E8=8E=B7=E5=8F=96=E4=B9=B1?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=202=20=E6=96=B0=E8=81=94=E7=9B=9F?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8A=A0=E5=85=A5=E6=97=B6=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=8C=BA=E5=9D=97=E8=80=8C=E6=9D=83=E9=99=90=E6=9C=AA?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mindata/blockchain/block/db/RocksDbStoreImpl.java  |  2 +-
 .../blockchain/socket/client/ClientStarter.java        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/mindata/blockchain/block/db/RocksDbStoreImpl.java b/src/main/java/com/mindata/blockchain/block/db/RocksDbStoreImpl.java
index 28fb3fc..17d5cd4 100644
--- a/src/main/java/com/mindata/blockchain/block/db/RocksDbStoreImpl.java
+++ b/src/main/java/com/mindata/blockchain/block/db/RocksDbStoreImpl.java
@@ -34,7 +34,7 @@ public class RocksDbStoreImpl implements DbStore {
         try {
             byte[] bytes = rocksDB.get(key.getBytes(Const.CHARSET));
             if (bytes != null) {
-                return new String(bytes);
+                return new String(bytes, Const.CHARSET);
             }
             return null;
         } catch (Exception e) {
diff --git a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java
index 4043821..ec1207c 100644
--- a/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java
+++ b/src/main/java/com/mindata/blockchain/socket/client/ClientStarter.java
@@ -9,6 +9,7 @@ import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.stream.Collectors;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 import org.slf4j.Logger;
@@ -69,6 +70,15 @@ public class ClientStarter {
     private Map<String,Integer> nodesStatus = Maps.newConcurrentMap();
     private volatile boolean isNodesReady = false; // 节点是否已准备好
 
+    /**
+     * 初始化权限信息
+     * 避免新联盟节点加入时，同步区块而权限未初始化导致同步异常
+     */
+    @PostConstruct
+    public void initPermission() {
+        fetchPermission();
+    }
+
     /**
      * 从麦达区块链管理端获取已登记的各服务器ip
      * 隔5分钟去获取一次
-- 
Gitee