Merge pull request #291 from WeBankFinTech/release/1.8.0

Release/1.8.0
WeBankBlockchain · Jan 26, 2021 · ef216f7 · ef216f7
2 parents 5fef93f + e76f1d0
commit ef216f7
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.1
+1.8.0
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-        compile("com.webank:weid-contract-java:1.2.29-rc.2-SNAPSHOT") {
+        compile("com.webank:weid-contract-java:1.2.29") {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
         }
         compile fileTree(dir: 'lib', include: '*.jar')

diff --git a/src/main/java/com/webank/weid/protocol/cpt/Cpt109.java b/src/main/java/com/webank/weid/protocol/cpt/Cpt109.java
@@ -19,6 +19,8 @@
 
 package com.webank.weid.protocol.cpt;
 
+import com.github.reinert.jjschema.Attributes;
+
 import lombok.Data;
 
 /**
@@ -28,6 +30,8 @@
  */
 
 @Data
+@Attributes(title = "Trusted Timestamp", 
+    description = "Trusted Timestamp from authorized 3rd-party, or chain consensus")
 public class Cpt109 {
 
     /**

diff --git a/src/main/java/com/webank/weid/protocol/response/WeIdListResult.java b/src/main/java/com/webank/weid/protocol/response/WeIdListResult.java
@@ -0,0 +1,17 @@
+package com.webank.weid.protocol.response;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * get WeId and errorCode by pubkeyList response.
+ *
+ */
+@Data
+public class WeIdListResult {
+
+    private List<String> weIdList;
+
+    private List<Integer> errorCodeList;
+}
diff --git a/src/main/java/com/webank/weid/rpc/WeIdService.java b/src/main/java/com/webank/weid/rpc/WeIdService.java
@@ -32,6 +32,7 @@
 import com.webank.weid.protocol.request.ServiceArgs;
 import com.webank.weid.protocol.response.CreateWeIdDataResult;
 import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.protocol.response.WeIdListResult;
 
 
 /**
@@ -219,4 +220,11 @@ ResponseData<List<WeIdPojo>> getWeIdList(
      * @return total weid
      */
     ResponseData<Integer> getWeIdCount();
+
+    /**
+     * get WeID list by pubKey list.
+     * @param pubKeyList the pubKey list
+     * @return return the WeIDListResult
+     */
+    ResponseData<WeIdListResult> getWeIdListByPubKeyList(List<WeIdPublicKey> pubKeyList);
 }
diff --git a/src/main/java/com/webank/weid/service/impl/WeIdServiceImpl.java b/src/main/java/com/webank/weid/service/impl/WeIdServiceImpl.java
@@ -20,10 +20,12 @@
 package com.webank.weid.service.impl;
 
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.fisco.bcos.web3j.crypto.ECKeyPair;
@@ -47,6 +49,7 @@
 import com.webank.weid.protocol.request.ServiceArgs;
 import com.webank.weid.protocol.response.CreateWeIdDataResult;
 import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.protocol.response.WeIdListResult;
 import com.webank.weid.rpc.WeIdService;
 import com.webank.weid.util.DataToolUtils;
 import com.webank.weid.util.WeIdUtils;
@@ -960,4 +963,33 @@ public ResponseData<List<WeIdPojo>> getWeIdList(
     public ResponseData<Integer> getWeIdCount() {
         return weIdServiceEngine.getWeIdCount();
     }
+
+    @Override
+    public ResponseData<WeIdListResult> getWeIdListByPubKeyList(List<WeIdPublicKey> pubKeyList) {
+        if (pubKeyList == null || pubKeyList.size() == 0) {
+            return new ResponseData<>(null, ErrorCode.ILLEGAL_INPUT);
+        }
+        WeIdListResult weIdListResult = new WeIdListResult();
+        weIdListResult.setWeIdList(new ArrayList<>());
+        weIdListResult.setErrorCodeList(new ArrayList<>());
+        ResponseData<WeIdListResult> responseData = new ResponseData<WeIdListResult>();
+        pubKeyList.forEach(weIdPublicKey -> {
+            String weId = WeIdUtils.convertPublicKeyToWeId(weIdPublicKey.getPublicKey());
+            if (StringUtils.isBlank(weId)) {
+                weIdListResult.getWeIdList().add(null);
+                weIdListResult.getErrorCodeList().add(ErrorCode.WEID_PUBLICKEY_INVALID.getCode());
+            } else {
+                if (this.isWeIdExist(weId).getResult()) {
+                    weIdListResult.getWeIdList().add(weId);
+                    weIdListResult.getErrorCodeList().add(ErrorCode.SUCCESS.getCode());
+                } else {
+                    weIdListResult.getWeIdList().add(null);
+                    weIdListResult.getErrorCodeList().add(
+                         ErrorCode.WEID_PUBLIC_KEY_NOT_EXIST.getCode());
+                }
+            }
+        });
+        responseData.setResult(weIdListResult);
+        return responseData;
+    }
 }
diff --git a/src/test/java/com/webank/weid/full/auth/TestGetAllAuthorityIssuerList.java b/src/test/java/com/webank/weid/full/auth/TestGetAllAuthorityIssuerList.java
@@ -16,6 +16,7 @@
 import com.webank.weid.protocol.request.RemoveAuthorityIssuerArgs;
 import com.webank.weid.protocol.response.CreateWeIdDataResult;
 import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.util.DataToolUtils;
 
 
 public class TestGetAllAuthorityIssuerList extends TestBaseService {
@@ -148,10 +149,10 @@ public void testGetAllAuthorityIssuerList_removeListThenQuery() {
 
         Assert.assertEquals(ErrorCode.SUCCESS.getCode(), response.getErrorCode().intValue());
         List<AuthorityIssuer> authorityIssuers = response.getResult();
-
+        String sdkWeId = DataToolUtils.convertPrivateKeyToDefaultWeId(privateKey);
         for (int i = 0; i < authorityIssuers.size(); i++) {
             String weId = authorityIssuers.get(i).getWeId();
-            if (!weId.equals(createWeId.getWeId())) {
+            if (!weId.equals(createWeId.getWeId()) && !sdkWeId.equals(weId)) {
                 RemoveAuthorityIssuerArgs removeAuthorityIssuerArgs =
                     new RemoveAuthorityIssuerArgs();
                 removeAuthorityIssuerArgs.setWeId(weId);

diff --git a/src/test/java/com/webank/weid/full/weid/TestGetWeIdDocument.java b/src/test/java/com/webank/weid/full/weid/TestGetWeIdDocument.java
@@ -19,6 +19,9 @@
 
 package com.webank.weid.full.weid;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
@@ -33,11 +36,13 @@
 import com.webank.weid.full.TestBaseUtil;
 import com.webank.weid.protocol.base.WeIdDocument;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
+import com.webank.weid.protocol.base.WeIdPublicKey;
 import com.webank.weid.protocol.request.AuthenticationArgs;
 import com.webank.weid.protocol.request.PublicKeyArgs;
 import com.webank.weid.protocol.request.ServiceArgs;
 import com.webank.weid.protocol.response.CreateWeIdDataResult;
 import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.protocol.response.WeIdListResult;
 
 /**
  * getWeIdDocument method for testing WeIdService.
@@ -334,4 +339,22 @@ public void testGetWeIdDocument_weIdIsNull() {
         Assert.assertEquals(ErrorCode.WEID_INVALID.getCode(), weIdDoc.getErrorCode().intValue());
         Assert.assertNull(weIdDoc.getResult());
     }
+
+    /**
+     * case: getWeIdList By publicKeyList.
+     */
+    @Test
+    public void testGetWeIdListByPubkeyList() {
+        List<WeIdPublicKey> pubKeyList = new ArrayList<>();
+        int num = 5;
+        for (int i = 0; i < num; i++) {
+            WeIdPublicKey publicKey = new WeIdPublicKey();
+            publicKey.setPublicKey(TestBaseUtil.createEcKeyPair().getPublicKey());
+            pubKeyList.add(publicKey);
+        }
+        ResponseData<WeIdListResult> weIdListRes = weIdService.getWeIdListByPubKeyList(pubKeyList);
+        LogUtil.info(logger, "getWeIdListByPubKeyList", weIdListRes);
+        Assert.assertEquals(ErrorCode.SUCCESS.getCode(), weIdListRes.getErrorCode().intValue());
+        Assert.assertEquals(num, weIdListRes.getResult().getWeIdList().size());
+    }
 }