diff --git a/deploy/docker-demo/pom.xml b/deploy/docker-demo/pom.xml index 398d3973..59c4e340 100644 --- a/deploy/docker-demo/pom.xml +++ b/deploy/docker-demo/pom.xml @@ -10,12 +10,26 @@ 1.3.0 4.0.0 - docker-demo jdchain-demo + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + false + true + false + false + + + maven-resources-plugin 3.0.2 diff --git a/deploy/docker-demo/src/main/docker/Dockerfile b/deploy/docker-demo/src/main/docker/Dockerfile index 616e1b74..c6d8edde 100644 --- a/deploy/docker-demo/src/main/docker/Dockerfile +++ b/deploy/docker-demo/src/main/docker/Dockerfile @@ -5,6 +5,7 @@ RUN yum install wget -y \ && wget -O /etc/yum.repos.d/epel-7.repo http://mirrors.aliyun.com/repo/epel-7.repo \ && yum install java net-tools nc crontabs expect unzip -y \ && yum install langpacks-zh_CN.noarch -y \ + && yum install dos2unix -y \ && echo "LANG=zh_CN.utf8" >> /etc/locale.conf \ && source /etc/locale.conf \ && yum clean all @@ -21,6 +22,7 @@ ENV SERVER_NAME_PEER=deploy-peer ENV SERVER_NAME_GW=deploy-gateway COPY script/* /export/jdchain/ +RUN dos2unix /export/jdchain/*.sh RUN chmod +x /export/jdchain/*.sh # ports diff --git a/deploy/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java b/deploy/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java index 51cc1741..9f2e4754 100644 --- a/deploy/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java +++ b/deploy/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java @@ -162,12 +162,7 @@ public abstract class SDK_Base_Demo { System.out.println("contract's address=" + contractAddress); // 生成发布合约操作 - if(contractParams.isHasVersion()){ -// txTpl.contracts().deploy(contractParams.contractIdentity, contractCode, contractParams.version); - } else { - txTpl.contracts().deploy(contractParams.contractIdentity, contractCode); - } - + txTpl.contracts().deploy(contractParams.contractIdentity, contractCode); // 生成预发布交易; commit(txTpl,contractParams.getSignAdminKey());