Merge branch 'feature/LC-stability' into 'release/1.5.0'

Feature/lc stability

See merge request jd-blockchain/jdchain!34

core

@@ -1 +1 @@
-Subproject commit 4f4fb68eea4c046102971fdc92720cc43605d05a
+Subproject commit 86d3b6786aedd814f9be5263f3c4012cb7a2ad63

deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh

@@ -41,23 +41,19 @@ checkpid() {
 #注意: 在shell编程中，"$?" 表示上一句命令或者一个函数的返回值
 ###################################
 stop() {
-  checkpid
-
-  if [[ $psid -ne 0 ]]; then
-    echo "Stopping Gateway ......(pid=$psid) "
-    JAVA_CMD="kill -9 $psid"
-    sleep 1
-    $JAVA_CMD
-    if [[ $? -eq 0 ]]; then
-      echo "[OK]"
+    checkpid
+    if [[ $psid -ne 0 ]]; then
+      echo "Stopping Gateway (PID = $psid) ......"
+      kill $psid
+      while kill -0 $psid 2>/dev/null; do sleep 1; done
+      echo "================================"
+      echo "Success"
+      echo "================================"
     else
-      echo "[Failed]"
+      echo "================================"
+      echo "WARN: Gateway is not running"
+      echo "================================"
     fi
-  else
-    echo "================================"
-    echo "WARN: Gateway is not running"
-    echo "================================"
-  fi
 }
 
 

deploy/deploy-peer/src/main/resources/config/init/bftsmart.config

@@ -72,7 +72,7 @@ system.servers.num = 4
 system.servers.f = 1
 
 #Timeout to asking for a client request
-system.totalordermulticast.timeout = 60000
+#system.totalordermulticast.timeout = 60000
 
 #Allowable time tolerance range(millisecond)
 system.totalordermulticast.timeTolerance = 3000000

deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh

@@ -8,9 +8,14 @@ PID=`ps -ef | grep $BOOT_HOME/manager/manager-booter | grep -v grep | awk '{prin
 
 #通过Kill命令将进程杀死
 if [ -z "$PID" ]; then
-    echo "Unable to find JDChain Manager PID. stop aborted."
+    echo "================================"
+    echo "WARN: Unable to find JD Chain Manager PID($PID)."
+    echo "================================"
 else
-    echo "Start to kill PID = $PID ..."
-    kill -9 $PID
-    echo "JDChain Manager has been stopped ..."
+    echo "Stopping Manager (PID = $PID) ......"
+    kill $PID
+    while kill -0 $PID 2>/dev/null; do sleep 1; done
+    echo "================================"
+    echo "Success"
+    echo "================================"
 fi

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

@@ -41,23 +41,19 @@ checkpid() {
 #注意: 在shell编程中，"$?" 表示上一句命令或者一个函数的返回值
 ###################################
 stop() {
-  checkpid
-
-  if [[ $psid -ne 0 ]]; then
-    echo "Stopping Peer ......(pid=$psid) "
-    JAVA_CMD="kill -9 $psid"
-    sleep 1
-    $JAVA_CMD
-    if [[ $? -eq 0 ]]; then
-      echo "[OK]"
+    checkpid
+    if [[ $psid -ne 0 ]]; then
+      echo "Stopping Peer (PID = $psid) ......"
+      kill $psid
+      while kill -0 $psid 2>/dev/null; do sleep 1; done
+      echo "================================"
+      echo "Success"
+      echo "================================"
     else
-      echo "[Failed]"
+      echo "================================"
+      echo "WARN: Peer is not running"
+      echo "================================"
     fi
-  else
-    echo "================================"
-    echo "WARN: Peer is not running"
-    echo "================================"
-  fi
 }
 
 

libs/bft-smart

@@ -1 +1 @@
-Subproject commit 7144cb6419866f0ae25fc38446e89123d070e611
+Subproject commit 465b42bb5793c2bcb61c2789317a85608d13d19e

libs/httpservice

@@ -1 +1 @@
-Subproject commit 2ff588e3adb44e733caf730b27917fa5e46f0129
+Subproject commit 0aad08bc7e8fe769178d6ca9a1184f4acc33e913

libs/utils

@@ -1 +1 @@
-Subproject commit 6662f18965b23910f04432488a9e10893e94f21d
+Subproject commit dedda124dfeb4488ece714d1e6af24b8d5f0a17a

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.jd.blockchain</groupId>
 	<artifactId>jdchain-root</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.5.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<description>jdchain root project</description>
 

project

@@ -1 +1 @@
-Subproject commit e6a91274cc35748ad903e432aaf34e41b3803702
+Subproject commit ec38eec4a6269e7abd35d9ea1b67417a97815bf9

samples/contract-samples/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.4.3.RELEASE</version>
+        <version>1.5.0.RELEASE</version>
     </parent>
 
     <!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->

samples/pom.xml

@@ -4,11 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jd.blockchain</groupId>
     <artifactId>jdchain-samples</artifactId>
-    <version>1.4.3.RELEASE</version>
+    <version>1.5.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <framework.version>1.4.3.RELEASE</framework.version>
+        <framework.version>1.5.0.RELEASE</framework.version>
     </properties>
 
     <modules>

samples/sdk-samples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.4.3.RELEASE</version>
+        <version>1.5.0.RELEASE</version>
     </parent>
     <artifactId>sdk-samples</artifactId>
 

test

@@ -1 +1 @@
-Subproject commit f327dda22070b123e70459848e9922f764912bbe
+Subproject commit 91e08505fbc0ccbd7cb3e5e04bea3d7c92c6a0e2