Merge pull request #469 from WeBankBlockchain/release-1.0.1

Release 1.0.1
WeBankBlockchain · Jan 15, 2021 · c4d69c6 · c4d69c6
2 parents 8bc72e3 + 19aeadd
commit c4d69c6
Show file tree

Hide file tree

Showing 17 changed files with 276 additions and 61 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,12 @@
+### v1.0.1
+
+(2020-01-15)
+
+**功能**
+
+* 启动脚本添加参数，修复新版本JDK无法使用的问题
+* 新增`deploy_system_contract.sh`脚本，替换`Java`命令部署Proxy、Hub
+
 ### v1.0.0
 
 (2020-12-17)

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 sourceCompatibility = '1.8'
-version = '1.0.0'
+version = '1.0.1'
 
 task stubSourceJar(type: Jar) {
     into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' }

diff --git a/demo/bcos/build.sh b/demo/bcos/build.sh
@@ -91,7 +91,7 @@ build_accounts() {
     cd -
 }
 
-deploy_contract() {
+deploy_system_contract() {
     cd console
     bash start.sh <<EOF
     deployByCNS HelloWeCross 1.0

diff --git a/demo/build.sh b/demo/build.sh
@@ -247,8 +247,8 @@ config_router_8250() {
     cp ${ROOT}/bcos/nodes/127.0.0.1/sdk/* conf/chains/bcos/
 
     # deploy system contracts
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/bcos
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/bcos
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos -H
 
     cd -
 }
@@ -274,8 +274,8 @@ config_router_8251() {
     sed_i 's/Org1MSP/Org2MSP/g' conf/accounts/fabric_admin_org2/account.toml
 
     # deploy system chaincodes
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.fabric.proxy.ProxyChaincodeDeployment deploy chains/fabric
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.fabric.hub.HubChaincodeDeployment deploy chains/fabric
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric -P
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric -H
 
     cd -
 }
@@ -297,9 +297,9 @@ build_wecross() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_wecross.sh ]; then
-            bash download_wecross.sh -t v1.0.0
+            bash download_wecross.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.1
         fi
     fi
 
@@ -320,9 +320,9 @@ build_wecross_console() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_console.sh ]; then
-            bash download_console.sh -t v1.0.0
+            bash download_console.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.1
         fi
     fi
 
@@ -358,9 +358,9 @@ build_account_manager() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_account_manager.sh ]; then
-            bash download_account_manager.sh -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash download_account_manager.sh -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         fi
     fi
 

diff --git a/demo/build_cross_all.sh b/demo/build_cross_all.sh
@@ -270,8 +270,8 @@ config_router_group1() {
     cp ${ROOT}/bcos/nodes/127.0.0.1/sdk/* conf/chains/bcos-group1/
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/bcos-group1
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/bcos-group1
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos-group1 -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos-group1 -H
 
     cd -
 }
@@ -296,8 +296,8 @@ config_router_group2() {
     fi
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/bcos-group2
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/bcos-group2
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos-group2 -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos-group2 -H
 
     cd -
 }
@@ -323,8 +323,8 @@ config_router_gm() {
     fi
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.guomi.preparation.ProxyContractDeployment deploy chains/bcos-gm
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.guomi.preparation.HubContractDeployment deploy chains/bcos-gm
+    bash deploy_system_contract.sh -t GM_BCOS2.0 -c chains/bcos-gm -P
+    bash deploy_system_contract.sh -t GM_BCOS2.0 -c chains/bcos-gm -H
 
     cd -
 }
@@ -351,8 +351,8 @@ config_router_fabric() {
     sed_i 's/Org1MSP/Org2MSP/g' conf/accounts/fabric_admin_org2/account.toml
 
     # deploy system chaincodes
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.fabric.proxy.ProxyChaincodeDeployment deploy chains/fabric-mychannel
-    java -cp 'conf/:lib/*:plugin/*' com.webank.wecross.stub.fabric.hub.HubChaincodeDeployment deploy chains/fabric-mychannel
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric-mychannel -P
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric-mychannel -H
 
     cd -
 }
@@ -389,9 +389,9 @@ build_wecross() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_wecross.sh ]; then
-            bash download_wecross.sh -t v1.0.0
+            bash download_wecross.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.1
         fi
     fi
 
@@ -412,9 +412,9 @@ build_wecross_console() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_console.sh ]; then
-            bash download_console.sh -t v1.0.0
+            bash download_console.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.1
         fi
     fi
 
@@ -450,9 +450,9 @@ build_account_manager() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_account_manager.sh ]; then
-            bash download_account_manager.sh -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash download_account_manager.sh -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         fi
     fi
 

diff --git a/demo/build_cross_channel.sh b/demo/build_cross_channel.sh
@@ -214,7 +214,7 @@ config_router_8250()
     sed_i  's/payment/payment1/g'  conf/wecross.toml
 
     # deploy proxy
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.fabric.proxy.ProxyChaincodeDeployment deploy chains/fabric
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric -P
 
     cd -
 }
@@ -249,7 +249,7 @@ config_router_8251()
 
 
     # deploy proxy
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.fabric.proxy.ProxyChaincodeDeployment deploy chains/fabric
+    bash deploy_system_contract.sh -t Fabric1.4 -c chains/fabric -P
 
     cd -
 }
@@ -259,19 +259,19 @@ download_wecross()
     # Download
     LOG_INFO "Download WeCross ..."
     if [ -e download_wecross.sh ];then
-        bash download_wecross.sh -t v1.0.0
+        bash download_wecross.sh -t v1.0.1
     else
-        bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.0
+        bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.1
     fi
 }
 
 download_wecross_console()
 {
     LOG_INFO "Download WeCross Console ..."
     if [ -e download_console.sh ];then
-        bash download_console.sh -t v1.0.0
+        bash download_console.sh -t v1.0.1
     else
-        bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.0
+        bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.1
     fi
 }
 

diff --git a/demo/build_cross_gm.sh b/demo/build_cross_gm.sh
@@ -217,8 +217,8 @@ config_router_8250() {
     cp ${ROOT}/bcos/nodes/127.0.0.1/sdk/* conf/chains/bcos/
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/bcos
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/bcos
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/bcos -H
 
     cd -
 }
@@ -244,8 +244,8 @@ config_router_8251() {
     fi
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.guomi.preparation.ProxyContractDeployment deploy chains/bcos_gm
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.guomi.preparation.HubContractDeployment deploy chains/bcos_gm
+    bash deploy_system_contract.sh -t GM_BCOS2.0 -c chains/bcos_gm -P
+    bash deploy_system_contract.sh -t GM_BCOS2.0 -c chains/bcos_gm -H
 
     cd -
 }
@@ -267,9 +267,9 @@ build_wecross() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_wecross.sh ]; then
-            bash download_wecross.sh -t v1.0.0
+            bash download_wecross.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.1
         fi
     fi
 
@@ -290,9 +290,9 @@ build_wecross_console() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_console.sh ]; then
-            bash download_console.sh -t v1.0.0
+            bash download_console.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.1
         fi
     fi
 
@@ -323,9 +323,9 @@ build_account_manager() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_account_manager.sh ]; then
-            bash download_account_manager.sh -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash download_account_manager.sh -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         fi
     fi
 

diff --git a/demo/build_cross_groups.sh b/demo/build_cross_groups.sh
@@ -205,8 +205,8 @@ config_router_8250() {
     cp ${ROOT}/bcos/nodes/127.0.0.1/sdk/* conf/chains/group1/
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/group1
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/group1
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/group1 -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/group1 -H
 
     cd -
 }
@@ -231,8 +231,8 @@ config_router_8251() {
     fi
 
     # deploy system contracts
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.ProxyContractDeployment deploy chains/group2
-    java -cp conf/:lib/*:plugin/* com.webank.wecross.stub.bcos.normal.preparation.HubContractDeployment deploy chains/group2
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/group2 -P
+    bash deploy_system_contract.sh -t BCOS2.0 -c chains/group2 -H
 
     cd -
 }
@@ -254,9 +254,9 @@ build_wecross() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_wecross.sh ]; then
-            bash download_wecross.sh -t v1.0.0
+            bash download_wecross.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_wecross.sh) -t v1.0.1
         fi
     fi
 
@@ -277,9 +277,9 @@ build_wecross_console() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_console.sh ]; then
-            bash download_console.sh -t v1.0.0
+            bash download_console.sh -t v1.0.1
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.0
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_console.sh) -t v1.0.1
         fi
     fi
 
@@ -310,9 +310,9 @@ build_account_manager() {
         LOG_INFO "${name} exists."
     else
         if [ -e download_account_manager.sh ]; then
-            bash download_account_manager.sh -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash download_account_manager.sh -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         else
-            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.0 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
+            bash <(curl -sL https://github.com/WebankBlockchain/WeCross/releases/download/resources/download_account_manager.sh) -t v1.0.1 -u ${DB_USERNAME} -p ${DB_PASSWORD} -H ${DB_IP} -P ${DB_PORT}
         fi
     fi
 

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v1.0.0
+v1.0.1