From 466304bea2226318ccb6833b5709293d08c267d9 Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Wed, 10 Nov 2021 20:15:11 +0800
Subject: [PATCH] TLS for peer manage server

---
 core                                               |  2 +-
 .../com/jd/blockchain/boot/peer/PeerBooter.java    |  1 -
 .../resources/config/application-peer.properties   | 14 ++++++++++++++
 .../src/main/resources/scripts/peer-startup.sh     |  7 +++++--
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 deploy/deploy-peer/src/main/resources/config/application-peer.properties

diff --git a/core b/core
index 11437fb1..ec548986 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 11437fb19cc5aa91a5d5484acbe130223b300bcb
+Subproject commit ec548986c628788db7044f13492947705a44b931
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 f8383ce4..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
@@ -37,7 +37,6 @@ 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/application-peer.properties b/deploy/deploy-peer/src/main/resources/config/application-peer.properties
new file mode 100644
index 00000000..18a85177
--- /dev/null
+++ b/deploy/deploy-peer/src/main/resources/config/application-peer.properties
@@ -0,0 +1,14 @@
+# gzip
+server.compression.enabled=true
+server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
+
+# TLS
+server.ssl.enabled=false
+server.ssl.key-store=
+server.ssl.key-store-type=
+server.ssl.key-alias=
+server.ssl.key-store-password=
+server.ssl.client-auth=
+server.ssl.trust-store=
+server.ssl.trust-store-password=
+server.ssl.trust-store-type=
\ No newline at end of file
diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
index e54c7d38..bd564b10 100644
--- a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
+++ b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
@@ -42,13 +42,16 @@ CONFIG_PATH=$APP_HOME/config
 #ledger-binding.conf完整路径
 LEDGER_BINDING_CONFIG=$CONFIG_PATH/ledger-binding.conf
 
+#application-peer.properties完整路径
+SPRING_CONFIG=$CONFIG_PATH/application-peer.properties
+
 #定义程序启动的参数
 JAVA_OPTS="-jar -server -Xms2048m -Xmx2048m -Djdchain.log=$APP_HOME/logs -Dlogging.config=file:$APP_HOME/config/log4j2-peer.xml"
 
 #APP具体相关命令
-APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG" -p "$WEB_PORT
+APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG" -p "$WEB_PORT" -sp "$SPRING_CONFIG
 if [ $IS_CONFIG = true ];then
-    APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG
+    APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG" -sp "$SPRING_CONFIG
 fi
 
 #APP_JAR的具体路径