Merge branch 'feature/JIRA_399_gw2peer_networks' of git.jd.com:jd-blockchain/jdchain into feature/JIRA_399_gw2peer_networks

* 'feature/JIRA_399_gw2peer_networks' of git.jd.com:jd-blockchain/jdchain:
  update headers
  update headers
  update headers
  update peer-startup.sh and headers

core

@@ -1 +1 @@
-Subproject commit de60f40a2ee7992b092738f040e42532a4ea8a84
+Subproject commit 49814841e2d5c59407e3bf11d96c3a94e53661fc

deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh

@@ -7,8 +7,15 @@ JAVA_BIN=java
 APP_JAR_PREFIX=deploy-peer-
 
 #Peer节点Web端口
-#请运维根据实际环境进行调整
+#请运维根据实际环境进行调整或通过-p参数传入
 WEB_PORT=7080
+#端口配置参数
+IS_CONFIG=false
+for i in "$@"; do
+    if [ $i = "-p" ];then
+        IS_CONFIG=true
+    fi
+done
 
 #检查Java环境变量
 if [ ! -n "$JAVA_HOME" ]; then
@@ -40,6 +47,9 @@ JAVA_OPTS="-jar -server -Xms2048m -Xmx2048m"
 
 #APP具体相关命令
 APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG" -p "$WEB_PORT
+if [ $IS_CONFIG = true ];then
+    APP_CMD=$APP_SYSTEM_PATH/$APP_JAR" -home="$APP_HOME" -c "$LEDGER_BINDING_CONFIG
+fi
 
 #APP_JAR的具体路径
 APP_JAR_PATH=$APP_SYSTEM_PATH/$APP_JAR

libs/bft-smart

@@ -1 +1 @@
-Subproject commit d35aa41d6b5e56f342ffb74d0fc04892d76df5a6
+Subproject commit a1471c4389bac254357007837dfff71a2b2c40e8

test

@@ -1 +1 @@
-Subproject commit 687ee2fd6415ff304839514276c59b32765be256
+Subproject commit 79c32511abda32ce819f9deccc6f46235d281ae1