Merge pull request #272 from WeBankBlockchain/dev

1.5.5 dev => master

deploy/comm/build.py

@@ -236,10 +236,11 @@ def startNode():
     if if_exist_fisco is None:
         print ("======= FISCO-BCOS is not deploy. return! =======")
         return
-
-    fisco_dir = getCommProperties("fisco.dir")
-    if if_exist_fisco == "no":
-        fisco_dir = currentDir + "/nodes/127.0.0.1"
+    if if_exist_fisco == "yes":
+        print ("[WARN]Use existing chain does not support start or stop.")
+        return
+
+    fisco_dir = currentDir + "/nodes/127.0.0.1"
 
     if not os.path.exists(fisco_dir + "/start_all.sh"):
         print ("======= FISCO-BCOS dir:{} is not correct. please check! =======".format(fisco_dir))

deploy/common.properties

@@ -1,10 +1,10 @@
 [common]
 
 # Webase Subsystem Version (v1.1.0 or above)
-webase.web.version=v1.5.4
-webase.mgr.version=v1.5.4
-webase.sign.version=v1.5.3
-webase.front.version=v1.5.4
+webase.web.version=v1.5.5
+webase.mgr.version=v1.5.5
+webase.sign.version=v1.5.5
+webase.front.version=v1.5.5
 
 #####################################################################
 # if use [installDockerAll] to install WeBASE by docker
@@ -76,7 +76,7 @@ if.exist.fisco=no
 ### if build new chain, [if.exist.fisco=no]
 # Configuration required when building a new chain 
 # Fisco-bcos version
-fisco.version=2.8.0
+fisco.version=2.9.1
 # Number of building nodes (default value: 2)
 node.counts=nodeCounts
 

deploy/visual-deploy.properties

@@ -1,10 +1,10 @@
 [common]
 
 # Webase Subsystem Version (v1.1.0 or above)
-webase.web.version=v1.5.4
-webase.mgr.version=v1.5.4
-webase.sign.version=v1.5.3
-fisco.webase.docker.cdn.version=v1.5.4
+webase.web.version=v1.5.5
+webase.mgr.version=v1.5.5
+webase.sign.version=v1.5.5
+fisco.webase.docker.cdn.version=v1.5.5
 
 # Mysql database configuration of WeBASE-Node-Manager
 mysql.ip=localhost

release_note.txt

@@ -1 +1 @@
-v1.5.4
+v1.5.5