Merge pull request #224 from youwenbusi/develop

fix bug of developEvidence and registerPolicy

Author: youwenbusi

VERSION

@@ -1 +1 @@
-1.3.1-rc1
+1.3.1-rc2-SNAPSHOT

build.gradle

@@ -36,6 +36,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     if (gradle.startParameter.isOffline()) {
@@ -186,7 +187,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 artifacts {
     archives jar
     archives sourcesJar
-    archives javadocJar
+    //archives javadocJar
 }
 
 

common/script/tpl/fisco.properties.tpl

@@ -53,7 +53,7 @@ group.id=${MASTER_GROUP_ID}
 #         fisco bcos node cert related config                                                         #
 #                                                                                                     #
 #######################################################################################################
-# Fisco-Bcos sdk SSL encrypt type, false:ECDSA, true:SaM2
+# Fisco-Bcos sdk SSL encrypt type, 0:ECDSA, 1:SaM2
 sdk.sm-crypto=${SDK_SM_CRYPTO}
 # fisco-bcos sdk cert path contains[ca.crt,sdk.crt,sdk.key]
 # if sdk.sm-crypto is true, contains [gm] directory, and gm dir contains [gmca.crt,gmsdk.crt,gmsdk.key,gmensdk.crt,gmensdk.key]

common/script/tpl/weidentity.properties.tpl

@@ -6,11 +6,15 @@
 # The organization ID for AMOP communication.
 blockchain.orgid=${ORG_ID}
 
+# The Chain Id
+chain.id=${CHAIN_ID}
+
 # AMOP Config
 # Timeout for amop request, default: 5000ms
 amop.request.timeout=5000
-# The Communication ID for AMOP
+
 amop.id=${AMOP_ID}
+amop.privateKey="xeewrwervvwv"
 
 # Blockchain node info.
 nodes=${BLOCKCHIAN_NODE_INFO}
@@ -43,7 +47,7 @@ datasource1.jdbc.timeBetweenEvictionRunsMillis=600000
 datasource1.jdbc.numTestsPerEvictionRun=5
 datasource1.jdbc.minEvictableIdleTimeMillis=1800000
 
-# Redisson config
+# Redis config
 # If you want to configure redis in cluster mode, enter multiple node addresses separated by commas.
 redis.url=${REDIS_ADDRESS}
 redis.password=${REDIS_PASSWORD}
@@ -66,9 +70,9 @@ redis_cluster.master_connection_pool_size=64
 # the second segment is the name of the table, and if not, the default is the first data source and the default table `sdk_all_data`,
 # Multiple domains can be configured at the same time.
 # example:
-# domain.credential=datasource1:credential_data
+# domain.credential=datasource1:credential_info
 # domain.credential.timeout=86400000
-# domain.weidDocument=datasource1:weid_document_data
+# domain.weIdDocument=datasource1:weid_document_info
 # domain.credential.timeout=86400000
 
 # the default domain
@@ -79,14 +83,14 @@ domain.defaultInfo.timeout=31556908799941
 domain.encryptKey=datasource1:encrypt_key_info
 domain.encryptKey.timeout=31556908799941
 
-# 
+# zkp credential template secret
 domain.templateSecret=***REMOVED***
 domain.templateSecret.timeout=31556908799941
 
-# 
+# zkp credential master secret
 domain.masterKey=***REMOVED***
 
-# 
+# zkp credential signature
 domain.credentialSignature=datasource1:credential_signature
 
 # weid auth info
@@ -119,7 +123,7 @@ zkp.cpt.array.length=5
 #######################################################################################################
 # Endpoint Service Integration-side parameters
 # Listener port required to be opened for RPC Server, default: 6010
-rpc.listener.port=6010
+endpoint.listener.port=6010
 
 
 #######################################################################################################
@@ -132,4 +136,4 @@ wesign.accessTokenUrl=
 wesign.signTicketUrl=
 wesign.timestampUrl=
 wesign.appId=
-wesign.secret=
+wesign.secret=

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-weidSdkVersion=1.8.6-rc1
+weidSdkVersion=1.8.6-rc.3-SNAPSHOT
 repoType=zn
 jdkTlsNamedGroups=secp256r1,secp256k1
 signing.keyId=

src/main/java/com/webank/weid/service/ContractService.java

@@ -3,50 +3,33 @@
 package com.webank.weid.service;
 
 import com.webank.weid.config.FiscoConfig;
-import com.webank.weid.constant.BuildToolsConstant;
-import com.webank.weid.constant.CnsType;
-import com.webank.weid.constant.DataFrom;
-import com.webank.weid.constant.ErrorCode;
-import com.webank.weid.constant.FileOperator;
-import com.webank.weid.constant.WeIdConstant;
-import com.webank.weid.contract.deploy.DeployEvidence;
+import com.webank.weid.constant.*;
 import com.webank.weid.contract.deploy.v2.DeployContractV2;
+import com.webank.weid.contract.deploy.v2.DeployEvidenceV2;
 import com.webank.weid.contract.deploy.v3.DeployContractV3;
+import com.webank.weid.contract.deploy.v3.DeployEvidenceV3;
 import com.webank.weid.contract.v2.WeIdContract;
 import com.webank.weid.dto.CnsInfo;
 import com.webank.weid.dto.DeployInfo;
 import com.webank.weid.dto.ShareInfo;
-import com.webank.weid.protocol.base.AuthorityIssuer;
-import com.webank.weid.protocol.base.CptBaseInfo;
-import com.webank.weid.protocol.base.HashContract;
-import com.webank.weid.protocol.base.WeIdAuthentication;
-import com.webank.weid.protocol.base.WeIdPrivateKey;
+import com.webank.weid.protocol.base.*;
 import com.webank.weid.protocol.request.CptStringArgs;
 import com.webank.weid.protocol.request.CreateWeIdArgs;
 import com.webank.weid.protocol.response.ResponseData;
 import com.webank.weid.service.impl.CptServiceImpl;
 import com.webank.weid.service.impl.WeIdServiceImpl;
 import com.webank.weid.service.impl.engine.DataBucketServiceEngine;
-import com.webank.weid.util.ClassUtils;
-import com.webank.weid.util.ConfigUtils;
-import com.webank.weid.util.DataToolUtils;
-import com.webank.weid.util.FileUtils;
-import com.webank.weid.util.WeIdSdkUtils;
-import com.webank.weid.util.WeIdUtils;
-import java.io.File;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import com.webank.weid.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.math.BigInteger;
+import java.util.*;
+
 import static com.webank.weid.constant.ChainVersion.FISCO_V2;
 
 @Service
@@ -462,11 +445,22 @@ public String deployEvidence(FiscoConfig fiscoConfig, String groupId, DataFrom f
         try {
             //  获取私钥
             WeIdPrivateKey currentPrivateKey = WeIdSdkUtils.getCurrentPrivateKey();
-            String hash = DeployEvidence.deployContract(
-                currentPrivateKey.getPrivateKey(), 
-                groupId, 
-                false
-            );
+            String hash = null;
+            if (FISCO_V2.getVersion() == Integer.parseInt(fiscoConfig.getVersion())) {
+                hash = DeployEvidenceV2.deployContract(
+                        fiscoConfig,
+                        currentPrivateKey.getPrivateKey(),
+                        groupId,
+                        false
+                );
+            } else {
+                hash = DeployEvidenceV3.deployContract(
+                        fiscoConfig,
+                        currentPrivateKey.getPrivateKey(),
+                        groupId,
+                        false
+                );
+            }
             if (StringUtils.isBlank(hash)) {
                 log.error("[deployEvidence] deploy the evidence fail, please check the log.");
                 return StringUtils.EMPTY;

src/main/java/com/webank/weid/service/WeIdSdkService.java

@@ -2,29 +2,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.sun.codemodel.JCodeModel;
-import com.webank.weid.constant.BuildToolsConstant;
-import com.webank.weid.constant.CnsType;
-import com.webank.weid.constant.DataFrom;
-import com.webank.weid.constant.ErrorCode;
-import com.webank.weid.constant.FileOperator;
-import com.webank.weid.dto.CptFile;
-import com.webank.weid.dto.CptInfo;
-import com.webank.weid.dto.DataPanel;
-import com.webank.weid.dto.Issuer;
-import com.webank.weid.dto.PageDto;
-import com.webank.weid.dto.PojoInfo;
-import com.webank.weid.dto.PolicyInfo;
-import com.webank.weid.dto.WeIdInfo;
-import com.webank.weid.protocol.base.AuthorityIssuer;
-import com.webank.weid.protocol.base.ClaimPolicy;
-import com.webank.weid.protocol.base.Cpt;
-import com.webank.weid.protocol.base.CptBaseInfo;
-import com.webank.weid.protocol.base.HashContract;
-import com.webank.weid.protocol.base.IssuerType;
-import com.webank.weid.protocol.base.PresentationPolicyE;
-import com.webank.weid.protocol.base.WeIdAuthentication;
-import com.webank.weid.protocol.base.WeIdPrivateKey;
-import com.webank.weid.protocol.base.WeIdPublicKey;
+import com.webank.weid.constant.*;
+import com.webank.weid.dto.*;
+import com.webank.weid.protocol.base.*;
 import com.webank.weid.protocol.request.CptStringArgs;
 import com.webank.weid.protocol.request.CreateWeIdArgs;
 import com.webank.weid.protocol.request.RegisterAuthorityIssuerArgs;
@@ -40,40 +20,26 @@
 import com.webank.weid.service.impl.CptServiceImpl;
 import com.webank.weid.service.impl.PolicyServiceImpl;
 import com.webank.weid.service.impl.WeIdServiceImpl;
-import com.webank.weid.util.ConfigUtils;
-import com.webank.weid.util.DataToolUtils;
-import com.webank.weid.util.FileUtils;
-import com.webank.weid.util.WeIdSdkUtils;
-import com.webank.weid.util.WeIdUtils;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import com.webank.weid.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.fisco.bcos.sdk.client.Client;
-import org.jsonschema2pojo.DefaultGenerationConfig;
-import org.jsonschema2pojo.GenerationConfig;
-import org.jsonschema2pojo.NoopAnnotator;
-import org.jsonschema2pojo.SchemaGenerator;
-import org.jsonschema2pojo.SchemaMapper;
-import org.jsonschema2pojo.SchemaStore;
+import org.jsonschema2pojo.*;
 import org.jsonschema2pojo.rules.RuleFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 @Slf4j
 public class WeIdSdkService {
@@ -486,8 +452,11 @@ private WeIdAuthentication getCurrentWeIdAuth() {
 		WeIdPrivateKey weIdPrivateKey = WeIdSdkUtils.getWeIdPrivateKey(hash);
 		WeIdAuthentication callerAuth = new WeIdAuthentication();
 		callerAuth.setWeIdPrivateKey(weIdPrivateKey);
-		callerAuth.setWeId(WeIdUtils.convertPublicKeyToWeId(
-				DataToolUtils.publicKeyFromPrivate(new BigInteger(weIdPrivateKey.getPrivateKey())).toString()));
+		String weid = WeIdUtils.convertPublicKeyToWeId(
+				DataToolUtils.publicKeyFromPrivate(new BigInteger(weIdPrivateKey.getPrivateKey())).toString());
+		callerAuth.setWeId(weid);
+		WeIdDocument weIdDocument = getWeIdService().getWeIdDocument(weid).getResult();
+		callerAuth.setAuthenticationMethodId(weIdDocument.getAuthentication().get(0).getId());
 		return callerAuth;
 	}