Merge pull request #221 from youwenbusi/develop

1.3.1 firstly commit

Author: youwenbusi

VERSION

@@ -1 +1 @@
-1.3.0-rc1
+1.3.1-rc1-SNAPSHOT

build.gradle

@@ -46,7 +46,7 @@ repositories {
         mavenLocal()
         if ("cn" == repo) {
             println "use cn repo"
-//            maven {url "http://maven.aliyun.com/nexus/content/groups/public/"}
+            maven {url "http://maven.aliyun.com/nexus/content/groups/public/"}
             mavenCentral()
         } else {
             println "use default repo"
@@ -127,7 +127,6 @@ configurations {
 }
 
 // In this section you declare the dependencies for your production and test code
-weidSdkVersion='1.8.5-rc1'
 dependencies {
     localDeps lombok
     compile('org.springframework.boot:spring-boot-starter-web')

gradle.properties

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

src/main/java/com/webank/weid/controller/WeIdSdkController.java

@@ -60,23 +60,13 @@ public ResponseData<DataPanel> getDataPanel() {
 
 	@GetMapping("/getWeIdList")
 	public ResponseData<PageDto<WeIdInfo>> getWeIdList(
-			@RequestParam(value = "blockNumber") int blockNumber,
 			@RequestParam(value = "pageSize") int pageSize,
-			@RequestParam(value = "indexInBlock") int indexInBlock,
-			@RequestParam(value = "direction") boolean direction,
+			@RequestParam(value = "indexFirst") int indexFirst,
 			@RequestParam(value = "iDisplayStart") int iDisplayStart,
 			@RequestParam(value = "iDisplayLength") int iDisplayLength
 	) {
-		if (blockNumber == 0) {
-			try {
-				blockNumber = BaseService.getBlockNumber();
-			} catch (IOException e) {
-				log.error("[getWeIdList] get blockNumber fail.", e);
-				return new ResponseData<>(null, ErrorCode.BASE_ERROR);
-			}
-		}
 		PageDto<WeIdInfo> pageDto = new PageDto<WeIdInfo>(iDisplayStart, iDisplayLength);
-		return weIdSdkService.getWeIdList(pageDto, blockNumber, pageSize, indexInBlock, direction);
+		return weIdSdkService.getWeIdList(pageDto, pageSize, indexFirst);
 	}
 
 	@Description("查询issuer type列表")

src/main/java/com/webank/weid/dto/WeIdInfo.java

@@ -2,7 +2,7 @@
 
 package com.webank.weid.dto;
 
-import com.webank.weid.protocol.base.WeIdPojo;
+import com.webank.weid.protocol.base.WeIdDocumentMetadata;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +17,7 @@ public class WeIdInfo extends BaseDto {
     private boolean isIssuer;
     private String weIdShow;
     private boolean isAdmin;
-    private WeIdPojo weIdPojo;
+    //private WeIdDocumentMetadata weIdDocumentMetadata;
 
     public void setWeId(String weId) {
         this.weId = weId;

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

@@ -23,7 +23,6 @@
 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.WeIdPojo;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
 import com.webank.weid.protocol.base.WeIdPublicKey;
 import com.webank.weid.protocol.request.CptStringArgs;
@@ -135,29 +134,26 @@ public ResponseData<DataPanel> getDataPanel() {
 
 	public ResponseData<PageDto<WeIdInfo>> getWeIdList(
 			PageDto<WeIdInfo> pageDto,
-			Integer blockNumber,
 			Integer pageSize,
-			Integer indexInBlock,
-			boolean direction
+			Integer indexFirst
 	) {
-		ResponseData<List<WeIdPojo>> response = getWeIdService().getWeIdList(blockNumber, pageSize, indexInBlock, direction);
+		ResponseData<List<String>> response = getWeIdService().getWeIdList(indexFirst, indexFirst+pageSize-1);
 		if (response.getErrorCode() != ErrorCode.SUCCESS.getCode()) {
 			log.error("[getWeIdList] get weIdList has error, {} - {}", response.getErrorCode(), response.getErrorMessage());
 			return new ResponseData<>(pageDto, response.getErrorCode(), response.getErrorMessage());
 		}
-		List<WeIdPojo> list = response.getResult();
+		List<String> list = response.getResult();
 		pageDto.setAllCount(getWeIdService().getWeIdCount().getResult());
 		List<WeIdInfo> rList = new ArrayList<>();
 		if (list.size() > 0) {
 			String mainHash = WeIdSdkUtils.getMainHash();
-			for (WeIdPojo weIdPojo : list) {
-				WeIdInfo weInfo = getWeIdInfo(this.getWeIdAddress(weIdPojo.getId()));
+			for (String weId : list) {
+				WeIdInfo weInfo = getWeIdInfo(this.getWeIdAddress(weId));
 				if(weInfo == null) {
 					weInfo = new WeIdInfo();
 				}
-				weInfo.setWeIdPojo(weIdPojo);
-				weInfo.setWeId(weIdPojo.getId());
-				AuthorityIssuer issuer = getAuthorityIssuerService().queryAuthorityIssuerInfo(weIdPojo.getId()).getResult();
+				weInfo.setWeId(weId);
+				AuthorityIssuer issuer = getAuthorityIssuerService().queryAuthorityIssuerInfo(weId).getResult();
 				weInfo.setIssuer(issuer != null);
 				weInfo.setHash(mainHash);
 				rList.add(weInfo);
@@ -274,7 +270,7 @@ public ResponseData<String> createWeIdByPublicKey(HttpServletRequest request, Da
 		if (currentWeIdAuth.getWeId().equals(owner)) {
 			WeIdPublicKey weidPublicKey = new WeIdPublicKey();
 			weidPublicKey.setPublicKey(publicKey);
-			ResponseData<String> response = getWeIdService().delegateCreateWeId(weidPublicKey, currentWeIdAuth);
+			ResponseData<String> response = getWeIdService().createWeIdByPublicKey(weidPublicKey, currentWeIdAuth.getWeIdPrivateKey());
 			if (!response.getErrorCode().equals(ErrorCode.SUCCESS.getCode())) {
 				log.error(
 						"[CreateWeId] create WeID faild. error code : {}, error msg :{}",
@@ -489,7 +485,6 @@ private WeIdAuthentication getCurrentWeIdAuth() {
 		callerAuth.setWeIdPrivateKey(weIdPrivateKey);
 		callerAuth.setWeId(WeIdUtils.convertPublicKeyToWeId(
 				DataToolUtils.publicKeyFromPrivate(new BigInteger(weIdPrivateKey.getPrivateKey())).toString()));
-		callerAuth.setWeIdPublicKeyId(callerAuth.getWeId());
 		return callerAuth;
 	}