From 61ad0cd7bf5dd3d69e5c6b4cf358f1f08f651de4 Mon Sep 17 00:00:00 2001
From: imuge <liuyuanmu@jd.com>
Date: Thu, 25 Feb 2021 20:20:58 +0800
Subject: [PATCH] gateway

---
 core                                                           | 2 +-
 .../java/com/jd/blockchain/gateway/boot/GatewayBooter.java     | 3 ++-
 deploy/deploy-gateway/src/main/resources/config/gateway.conf   | 3 +++
 deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml  | 2 +-
 .../src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java  | 3 ++-
 deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml   | 2 +-
 framework                                                      | 2 +-
 libs/utils                                                     | 2 +-
 .../src/main/java/com/jdchain/samples/sdk/TestNet.java         | 3 +++
 9 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core b/core
index dca33af8..b1847088 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit dca33af897f78bbd7330f264ddf483c79a8018fe
+Subproject commit b18470883823edf06dd1a82c375e4e30e3b914f1
diff --git a/deploy/deploy-gateway/src/main/java/com/jd/blockchain/gateway/boot/GatewayBooter.java b/deploy/deploy-gateway/src/main/java/com/jd/blockchain/gateway/boot/GatewayBooter.java
index 82413a65..2af2bf5d 100644
--- a/deploy/deploy-gateway/src/main/java/com/jd/blockchain/gateway/boot/GatewayBooter.java
+++ b/deploy/deploy-gateway/src/main/java/com/jd/blockchain/gateway/boot/GatewayBooter.java
@@ -1,6 +1,7 @@
 package com.jd.blockchain.gateway.boot;
 
 import com.jd.blockchain.gateway.GatewayServerBooter;
+import utils.ConsoleUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -17,7 +18,7 @@ public class GatewayBooter {
 		try {
 			GatewayServerBooter.main(args);
 		} catch (Exception e) {
-			System.err.println("Error!!! --[" + e.getClass().getName() + "] " + e.getMessage());
+			ConsoleUtils.error("Gateway start error!", e);
 		}
 	}
 }
diff --git a/deploy/deploy-gateway/src/main/resources/config/gateway.conf b/deploy/deploy-gateway/src/main/resources/config/gateway.conf
index 06e8cece..b5a45a5a 100644
--- a/deploy/deploy-gateway/src/main/resources/config/gateway.conf
+++ b/deploy/deploy-gateway/src/main/resources/config/gateway.conf
@@ -12,6 +12,9 @@ peer.port=7080
 #共识节点的服务是否启用安全证书；
 peer.secure=false
 
+#账本节点拓扑信息落盘，默认false
+topology.store=false
+
 #共识节点的服务提供解析器
 #BftSmart共识Provider：com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider
 #简单消息共识Provider：com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider
diff --git a/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml b/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
index a83fdec9..0ef507c4 100644
--- a/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
+++ b/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
@@ -30,7 +30,7 @@
         <logger name="org.springframework" level="error"></logger>
         <logger name="bftsmart" level="error"></logger>
         <!--修改此处，以变更日志等级-->
-        <root level="info">
+        <root level="all">
             <appender-ref ref="Console"/>
             <appender-ref ref="GWRolling"/>
             <appender-ref ref="GWRollingError"/>
diff --git a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
index df9196e5..4aba298e 100644
--- a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
+++ b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java
@@ -11,6 +11,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -36,7 +37,7 @@ public class PeerBooter {
 			HomeContext homeContext = HomeBooter.createHomeContext(args);
 			startPeer(homeContext);
 		} catch (Exception e) {
-			System.err.println("Error!!! --[" + e.getClass().getName() + "] " + e.getMessage());
+			e.printStackTrace();
 		}
 	}
 
diff --git a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
index ebd1df90..d519bee0 100644
--- a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
+++ b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
@@ -30,7 +30,7 @@
         <logger name="org.springframework" level="error"></logger>
         <logger name="bftsmart" level="error"></logger>
         <!--修改此处，以变更日志等级-->
-        <root level="info">
+        <root level="all">
             <appender-ref ref="Console"/>
             <appender-ref ref="PeerRolling"/>
             <appender-ref ref="PeerRollingError"/>
diff --git a/framework b/framework
index 916e21b7..3a248fae 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 916e21b7c988f90bbbd0db7e865de5c25e8673d5
+Subproject commit 3a248fae776380b2b31ef90a7b6b5a2a17e20482
diff --git a/libs/utils b/libs/utils
index 31463f40..1f1ab748 160000
--- a/libs/utils
+++ b/libs/utils
@@ -1 +1 @@
-Subproject commit 31463f4010755362333b4fd00902ba4686c63258
+Subproject commit 1f1ab74811e6dc2722a0d68fb70946df78bd9c9f
diff --git a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
index 086bc83f..412b0b96 100644
--- a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
+++ b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
@@ -95,6 +95,9 @@ public class TestNet {
             // 启动网关
             startGateway(peerNodes);
 
+            // 睡10秒，等待网关启动成功
+            Thread.sleep(10000);
+
             // 初始化样例数据
             initSampleData(ledgerHash);