Merge pull request #223 from youwenbusi/develop

Develop

Author: youwenbusi

.gitignore

@@ -201,4 +201,5 @@ resources/conf/
 resources/fisco.properties
 resources/weidentity.properties
 resources/log4j2.xml
-run.config
+run.config
+logs/

CHANGELOG.md

@@ -1,3 +1,8 @@
+### V1.3.1 (2022-10-14)
+* 优化功能:
+1. 前端获取weid列表的方式改变
+2. 集成weid-java-sdk 1.8.6
+
 ### V1.3.0 (2022-08-16)
 
 * 新增功能:

README.md

@@ -11,6 +11,7 @@ WeIdentity JAVA SDK安装部署工具
 
 | weid-build-tools 版本 | weid-java-sdk 版本 | weid-contract-java 版本 | 备注 |
 | :---- | :---- | :---- | :---- |
+| v1.3.1 | v1.8.6 | v1.3.1 | 替换合约，改变获取所有weid的方式 |
 | v1.3.0 | v1.8.5 | v1.3.0 | 替换web3sdk、支持国密和FISCO BCOS 3.0 |
 | v1.0.28 | v1.8.3 | v1.2.30 | 升级log4j |
 | v1.0.27 | v1.8.2 | v1.2.30 | - |

VERSION

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

gradle.properties

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

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

@@ -137,7 +137,10 @@ public ResponseData<PageDto<WeIdInfo>> getWeIdList(
 			Integer pageSize,
 			Integer indexFirst
 	) {
-		ResponseData<List<String>> response = getWeIdService().getWeIdList(indexFirst, indexFirst+pageSize-1);
+		Integer total = getWeIdService().getWeIdCount().getResult();
+		Integer indexLast = indexFirst+pageSize-1;
+		if(indexFirst+pageSize > total) {indexLast = total-1;}
+		ResponseData<List<String>> response = getWeIdService().getWeIdList(indexFirst, indexLast);
 		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());