Merge pull request #191 from WeBankFinTech/release/1.0.24

Release/1.0.24

Author: yanggang-JV

CHANGELOG.md

@@ -1,3 +1,9 @@
+### V1.0.24 (2021-03-29)
+
+* 新增功能:
+1. 前端页面重构优化
+2. 集成WeBase辅助配置安装
+
 ### V1.0.23 (2021-01-26)
 
 * 新增功能:

README.md

@@ -9,12 +9,13 @@ WeIdentity JAVA SDK安装部署工具
 版本说明
 --------
 
-| weid-build-tools 版本 | weid-java-sdk 版本 | weid-contract-java 版本 |
-| :---- | :---- | :---- |
-| v1.0.23 | v1.8.0 | v1.2.29 |
-| v1.0.22 | v1.7.1 | v1.2.28 |
-| v1.0.21 | v1.7.0 | v1.2.27 |
-| v1.0.20 | v1.6.7 | v1.2.26 |
-| v1.0.19 | v1.6.6 | v1.2.24 |
-| v1.0.18 | v1.6.5 | v1.2.23 |
-| v1.0.12 | v1.6.4 | v1.2.21 |
+| weid-build-tools 版本 | weid-java-sdk 版本 | weid-contract-java 版本 | 备注 |
+| :---- | :---- | :---- | :---- |
+| v1.0.24 | v1.8.0 | v1.2.29 | 1.0.23的重构(前端重构)版本 |
+| v1.0.23 | v1.8.0 | v1.2.29 | - |
+| v1.0.22 | v1.7.1 | v1.2.28 | - |
+| v1.0.21 | v1.7.0 | v1.2.27 | - |
+| v1.0.20 | v1.6.7 | v1.2.26 | - |
+| v1.0.19 | v1.6.6 | v1.2.24 | - |
+| v1.0.18 | v1.6.5 | v1.2.23 | - |
+| v1.0.12 | v1.6.4 | v1.2.21 | - |

VERSION

@@ -1 +1 @@
-1.0.23
+1.0.24

build.gradle

@@ -93,7 +93,7 @@ List http_proxy = [
 ]
 
 List redis_driver = [
-        "org.redisson:redisson:3.13.1"
+        "org.redisson:redisson:3.15.0"
 ]
 
 def spring_version = "5.3.2"

src/main/java/com/webank/weid/app/BuildToolApplication.java

@@ -19,17 +19,15 @@
 
 package com.webank.weid.app;
 
-import java.security.InvalidAlgorithmParameterException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.web.client.RestTemplate;
 
 import com.webank.weid.config.StaticConfig;
 
@@ -41,8 +39,13 @@ public class BuildToolApplication extends StaticConfig {
     public static String[] args;
     public static ConfigurableApplicationContext context;
 
-    public static void main(String[] args) throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
+    public static void main(String[] args) {
         BuildToolApplication.args = args;
         BuildToolApplication.context = SpringApplication.run(BuildToolApplication.class, args);
-    }  
+    }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }

src/main/java/com/webank/weid/command/BatchTransaction.java

@@ -21,9 +21,8 @@
 
 import java.util.Calendar;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.JCommander;
 import com.webank.weid.config.StaticConfig;
@@ -36,13 +35,9 @@
  * @author yanggang
  *
  */
+@Slf4j
 public class BatchTransaction extends StaticConfig {
 
-    /**
-     * log4j.
-     */
-    private static final Logger logger = LoggerFactory.getLogger(BatchTransaction.class);
-    
     //异步处理入口
     private static TransactionService transactionService = new  TransactionService();
 
@@ -95,13 +90,13 @@ public static void main(String[] args) {
             }
         } catch (Exception e) {
             String message = "[BatchTransaction] process has error.";
-            logger.error(message, e);
+            log.error(message, e);
             System.out.println(message);
         }
         System.exit(1);
     }
     private static void log(String message) {
-        logger.info(message);
+        log.info(message);
         System.out.println(message);
     }
 }

src/main/java/com/webank/weid/command/CreateWeId.java

@@ -21,41 +21,38 @@
 
 import java.io.File;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 import com.webank.weid.config.StaticConfig;
 import com.webank.weid.constant.DataFrom;
-import com.webank.weid.service.BuildToolService;
+import com.webank.weid.constant.ErrorCode;
+import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.service.WeIdSdkService;
 import com.webank.weid.util.FileUtils;
 import com.webank.weid.util.WeIdUtils;
 
 /**
  * @author tonychen 2019/4/11
  */
+@Slf4j
 public class CreateWeId extends StaticConfig {
 
-    /**
-     * log4j.
-     */
-    private static final Logger logger = LoggerFactory.getLogger(CreateWeId.class);
-
-    private static BuildToolService buildToolService = new BuildToolService();
+    private static WeIdSdkService weIdSdkService = new WeIdSdkService();
 
     /**
      * @param args 入参
      */
     public static void main(String[] args) {
-        logger.info("[CreateWeId] begin create weId.");
-        String result = buildToolService.createWeId(DataFrom.COMMAND);
-        if (!WeIdUtils.isWeIdValid(result)) {
-            System.out.println("[CreateWeId] create WeID failed, result: " + result);
+        log.info("[CreateWeId] begin create weId.");
+        ResponseData<String> responseData = weIdSdkService.createWeId(DataFrom.COMMAND);
+        if (responseData.getErrorCode() != ErrorCode.SUCCESS.getCode()) {
+            System.out.println("[CreateWeId] create WeID failed, result: " + responseData.getErrorMessage());
             System.exit(1);
         }
-        File weIdFile = buildToolService.getWeidDir(WeIdUtils.convertWeIdToAddress(result));
+        File weIdFile = weIdSdkService.getWeidDir(WeIdUtils.convertWeIdToAddress(responseData.getResult()));
         if (weIdFile.exists()) {
-            FileUtils.writeToFile(result, "weid");
-            System.out.println("New weid has been created ---->" + result);
+            FileUtils.writeToFile(responseData.getResult(), "weid");
+            System.out.println("New weid has been created ---->" + responseData.getResult());
             System.out.println("The related private key and public key can be found at " 
                 + weIdFile.getAbsolutePath());
         }

src/main/java/com/webank/weid/command/DataBaseInit.java

@@ -19,29 +19,24 @@
 
 package com.webank.weid.command;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 import com.webank.weid.config.StaticConfig;
 import com.webank.weid.service.DataBaseService;
 
 /**
  * @author tonychen 2019/4/11
  */
+@Slf4j
 public class DataBaseInit extends StaticConfig {
 
-    /**
-     * log4j.
-     */
-    private static final Logger logger = LoggerFactory.getLogger(DataBaseInit.class);
-
     private static DataBaseService dataBaseService = new DataBaseService();
 
     /**
      * @param args 入参
      */
     public static void main(String[] args) {
-        logger.info("[DataBaseInit] begin init DataBase.");
+        log.info("[DataBaseInit] begin init DataBase.");
         dataBaseService.initDataBase();
         System.exit(0);
     }

src/main/java/com/webank/weid/command/DeployContract.java

@@ -33,10 +33,11 @@
 import com.webank.weid.contract.deploy.v2.DeployContractV2;
 import com.webank.weid.dto.DeployInfo;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
-import com.webank.weid.service.BuildToolService;
 import com.webank.weid.service.ConfigService;
-import com.webank.weid.service.DeployService;
+import com.webank.weid.service.ContractService;
+import com.webank.weid.service.GuideService;
 import com.webank.weid.util.FileUtils;
+import com.webank.weid.util.WeIdSdkUtils;
 
 public class DeployContract extends StaticConfig {
 
@@ -45,10 +46,10 @@ public class DeployContract extends StaticConfig {
      */
     private static final Logger logger = LoggerFactory.getLogger(DeployContract.class);
 
-    private static DeployService deployService = new DeployService();
+    private static ContractService contractService = new ContractService();
     private static ConfigService configService = new ConfigService();
-    private static BuildToolService buildToolService = new BuildToolService();
-    
+    private static GuideService guideService = new GuideService();
+
     public static void main(String[] args) {
         logger.info("[DeployContract] execute contract deployment.");
 
@@ -60,37 +61,37 @@ public static void main(String[] args) {
         String chainId = commandArgs.getChainId();
         String privateKeyFile = commandArgs.getPrivateKey();
         // 获取配置
-        FiscoConfig fiscoConfig = configService.loadNewFiscoConfig();
+        FiscoConfig fiscoConfig = WeIdSdkUtils.loadNewFiscoConfig();
         fiscoConfig.setChainId(chainId);
         new EncryptType(Integer.parseInt(fiscoConfig.getEncryptType()));
         // 说明给了私钥文件
         if (StringUtils.isNotBlank(privateKeyFile)) {
             String privateKey = FileUtils.readFile(privateKeyFile);
-            deployService.createAdmin(privateKey);
+            guideService.createAdmin(privateKey);
         }
         // 部署合约
-        String hash = deployService.deploy(fiscoConfig, DataFrom.COMMAND);
+        String hash = contractService.deployContract(fiscoConfig, DataFrom.COMMAND);
         System.out.println("the contract deploy successfully  --> hash : " +  hash);
         // 配置启用新hash
-        String  oldHash = buildToolService.getMainHash();
+        String  oldHash = WeIdSdkUtils.getMainHash();
         // 获取部署数据
-        DeployInfo deployInfo = deployService.getDeployInfoByHashFromChain(hash);
+        DeployInfo deployInfo = contractService.getDeployInfoByHashFromChain(hash);
         ContractConfig contract = new ContractConfig();
         contract.setWeIdAddress(deployInfo.getWeIdAddress());
         contract.setIssuerAddress(deployInfo.getAuthorityAddress());
         contract.setSpecificIssuerAddress(deployInfo.getSpecificAddress());
         contract.setEvidenceAddress(deployInfo.getEvidenceAddress());
         contract.setCptAddress(deployInfo.getCptAddress());
-        WeIdPrivateKey currentPrivateKey = DeployService.getCurrentPrivateKey();
+        WeIdPrivateKey currentPrivateKey = WeIdSdkUtils.getCurrentPrivateKey();
         // 写入全局配置中
         DeployContractV2.putGlobalValue(fiscoConfig, contract, currentPrivateKey);
         System.out.println("begin enable the hash.");
         // 节点启用新hash并停用原hash
-        deployService.enableHash(CnsType.DEFAULT, hash, oldHash);
+        contractService.enableHash(CnsType.DEFAULT, hash, oldHash);
         //重新加载合约地址
         configService.reloadAddress();
         System.out.println("begin create the weId for admin and deploy the systemCpt.");
-        deployService.deploySystemCpt(hash, DataFrom.COMMAND);
+        contractService.deploySystemCpt(hash, DataFrom.COMMAND);
         System.out.println("the systemCpt deploy successfully.");
         System.exit(0);
     }

src/main/java/com/webank/weid/command/DeployEvidence.java

@@ -26,14 +26,15 @@
 import com.webank.weid.config.FiscoConfig;
 import com.webank.weid.config.StaticConfig;
 import com.webank.weid.constant.DataFrom;
-import com.webank.weid.service.ConfigService;
-import com.webank.weid.service.DeployService;
+import com.webank.weid.service.ContractService;
+import com.webank.weid.service.GuideService;
+import com.webank.weid.util.WeIdSdkUtils;
 
 public class DeployEvidence extends StaticConfig {
 
-    private static DeployService deployService = new DeployService();
-    private static ConfigService configService = new ConfigService();
-    
+    private static ContractService contractService = new ContractService();
+    private static GuideService guideService = new GuideService();
+
     public static void main(String[] args) {
         CommandArgs commandArgs = new CommandArgs();
         JCommander.newBuilder()
@@ -52,13 +53,13 @@ public static void main(String[] args) {
         System.out.println("[DeployEvidence] begin deploy the evidence by groupId, groupId = " + goupIdStr);
         Integer groupId = Integer.parseInt(goupIdStr);
         // 检查是否有admin账户，如果没有则创建admin账户
-        String adminAddress = deployService.checkAdmin();
+        String adminAddress = guideService.checkAdmin();
         if (StringUtils.isBlank(adminAddress)) {
             System.out.println("[DeployEvidence] begin create admin...");
-            deployService.createAdmin(null);
+            guideService.createAdmin(null);
         }
-        FiscoConfig fiscoConfig = configService.loadNewFiscoConfig();
-        String hash = deployService.deployEvidence(fiscoConfig, groupId, DataFrom.COMMAND);
+        FiscoConfig fiscoConfig = WeIdSdkUtils.loadNewFiscoConfig();
+        String hash = contractService.deployEvidence(fiscoConfig, groupId, DataFrom.COMMAND);
         if (StringUtils.isNotBlank(hash)) {
             System.out.println("[DeployEvidence] the evidence deploy successfully, cns --> " + hash);
             System.exit(0);