v1.2.0

CodingCattwo · Oct 11, 2019 · cabd194 · cabd194
1 parent d1a2d10
commit cabd194
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,21 @@ matrix:
       dist: xenial
       before_install:
         - pip install MySQL-python
+    - name: "Python 3.4 on Xenial Linux"
+      python: 3.4
+      dist: xenial
+      before_install:
+        - pip install PyMySQL
+    - name: "Python 3.5 on Xenial Linux"
+      python: 3.5
+      dist: xenial
+      before_install:
+        - pip install PyMySQL
+    - name: "Python 3.6 on Xenial Linux"
+      python: 3.6
+      dist: xenial
+      before_install:
+        - pip install PyMySQL
     - name: "Python 3.7 on Xenial Linux"
       python: 3.7
       dist: xenial

diff --git a/deploy/comm/build.py b/deploy/comm/build.py
@@ -321,8 +321,10 @@ def changeFrontConfig():
 
     if_exist_fisco = getCommProperties("if.exist.fisco")
     fisco_dir = getCommProperties("fisco.dir")
+    node_dir = getCommProperties("node.dir") 
     if if_exist_fisco == "no":
         fisco_dir = currentDir + "/nodes/127.0.0.1"
+        node_dir = currentDir + "/nodes/127.0.0.1/node0"
 
     # init file
     server_dir = currentDir + "/webase-front/conf"
@@ -338,6 +340,7 @@ def changeFrontConfig():
     doCmd('sed -i "s/keyServer: 127.0.0.1:5001/keyServer: {}:{}/g" {}/application.yml'.format(deploy_ip, mgr_port, server_dir))
     doCmd('sed -i "s%./h2/webasefront%../h2/{}%g" {}/application.yml'.format(frontDb, server_dir))
     doCmd('sed -i "s%monitorDisk: /%monitorDisk: {}%g" {}/application.yml'.format(fisco_dir, server_dir))
+    doCmd('sed -i "s%nodeCertPath: /fisco/nodes/127.0.0.1/node0%nodeCertPath: {}%g" {}/application.yml'.format(node_dir, server_dir))
 
     return
 

diff --git a/deploy/common.properties b/deploy/common.properties
@@ -1,7 +1,7 @@
 [common]
 
 # WeBASE版本(v1.1.0或以上版本)
-webase.version=v1.1.0
+webase.version=v1.2.0
 
 # 节点管理子系统mysql数据库配置
 mysql.ip=localhost
@@ -33,8 +33,12 @@ node.rpcPort=8545
 if.exist.fisco=no
 
 # 使用已有链时需配置
-# 已有链的路径，start_all.sh脚本所在路径，路径下要存在sdk目录
+# 已有链的路径，start_all.sh脚本所在路径
+# 路径下要存在sdk目录，里面存放sdk证书（ca.crt、node.crt和node.key）
 fisco.dir=/data/app/nodes/127.0.0.1
+# 前置所连接节点的绝对路径
+# 路径下有conf目录，里面存放节点证书（ca.crt、node.crt和node.key）
+node.dir=/data/app/nodes/127.0.0.1/node0
 
 # 搭建新链时需配置
 # FISCO-BCOS版本