Skip to content

Commit e45cf5c

Browse files
youwenbusiyouwenbusi
authored
Merge pull request #8 from WeBankBlockchain/develop
release v3.1.0
2 parents 188c13b + 571f961 commit e45cf5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+358
-75
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### V3.1.0 (2023-4-28)
2+
Feature:
3+
1. Adapt to WeIdentity-Java-SDK v3.01-rc.1 to provide functional components that do not rely on blockchain
4+
5+
特性：
6+
1. 适配WeIdentity-Java-SDK v3.1.0-rc.1，提供无需依赖区块链的功能组件
7+
18
### V3.0.0 (2022-12-15)
29
Feature:
310
1. Stripped functionality such as presentation file transfer and format conversion from the original weid-java-sdk into toolbox components(weid-kit)

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ WeIdentity-Kit
1010

1111
| weid-kit 版本 | weid-java-sdk 版本 |weid-blockchain 版本 | weid-contract-java 版本 | 备注 |
1212
| :---- | :---- | :---- | :---- | :---- |
13-
| v3.0.0-rc.1 | v3.0.0-rc.1 | v3.0.0-rc.1 | v1.3.1-rc1 | 从原来weid-java-sdk分离出来的WeIdentity的扩展工具箱 |
13+
| v3.0.0-rc.1 | v3.0.0-rc.1 | v3.0.0-rc.1 | v1.3.1-rc.1 | 从原来weid-java-sdk分离出来的WeIdentity的扩展工具箱 |
14+
| v3.1.0-rc.1 | v3.1.0-rc.1 | v3.1.0-rc.1 | v1.3.2-rc.1 | 适配WeIdentity-Java-SDK v3.1.0-rc.1 |
1415
* WeIdentity及其组件的[兼容版本说明文档](https://weidentity.readthedocs.io/zh_CN/develop/docs/compatibility.html) 请查看！
1516
联系我们
1617
--------

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-rc.1
1+
3.1.0-rc.1

‎build.gradle‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ List lombok = [
8080
"org.projectlombok:lombok:1.18.10"
8181
]
8282

83-
def log4j_version="2.18.0"
83+
def log4j_version="2.20.0"
8484
List logger = [
8585
"org.slf4j:jul-to-slf4j:1.7.30",
8686
"org.apache.logging.log4j:log4j-api:$log4j_version",
@@ -106,7 +106,7 @@ List jmockit = [
106106
"org.jmockit:jmockit:1.47"
107107
]
108108

109-
def jackson_version="2.13.3"
109+
def jackson_version="2.14.2"
110110
List json = [
111111
"com.fasterxml.jackson.core:jackson-databind:$jackson_version",
112112
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version",
@@ -116,18 +116,18 @@ List json = [
116116
"com.networknt:json-schema-validator:1.0.71",
117117
]
118118

119-
def gson_version = "2.8.9"
119+
def gson_version = "2.10.1"
120120
List gson = [
121121
"com.google.code.gson:gson:$gson_version"
122122
]
123123

124124
List mysql_driver = [
125-
"mysql:mysql-connector-java:8.0.20", // todo runtime
125+
"mysql:mysql-connector-java:8.0.32", // todo runtime
126126
"org.apache.commons:commons-dbcp2:2.5.0"
127127
]
128128

129129
List redisson = [
130-
"org.redisson:redisson:3.13.1"
130+
"org.redisson:redisson:3.20.0"
131131
]
132132

133133
List zxing = [
@@ -145,7 +145,7 @@ List pdfbox = [
145145
]
146146

147147
List protobuf = [
148-
"com.google.protobuf:protobuf-java:3.19.2"
148+
"com.google.protobuf:protobuf-java:3.22.2"
149149
]
150150

151151
List caffeine = [
@@ -157,7 +157,7 @@ List oval = [
157157
]
158158

159159
List spring = [
160-
"org.springframework:spring-core:5.3.21"
160+
"org.springframework:spring-core:5.3.25"
161161
]
162162

163163
configurations {
@@ -173,9 +173,7 @@ dependencies {
173173
localDeps 'org.projectlombok:lombok:1.18.10'
174174
if (!gradle.startParameter.isOffline()) {
175175
compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval, gson
176-
//compile("com.webank:weid-contract-java:1.3.1-rc1")
177-
compile("com.webank:weid-blockchain:3.0.0-rc.1")
178-
compile("com.webank:weid-java-sdk:3.0.0-rc.1")
176+
compile("com.webank:weid-java-sdk:3.1.0-rc.1")
179177

180178
compile fileTree(dir: 'lib', include: '*.jar')
181179
implementation 'com.google.guava:guava:31.1-jre'

‎global.status‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"authority_issuer_current_cpt_id":1000,"none_authority_issuer_current_cpt_id":2000000,"authority_issuer_current_policy_id":1000,"none_authority_issuer_current_policy_id":2000000,"presentationId":1}

‎src/main/java/com/webank/weid/kit/amop/AmopServiceImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public ResponseData<RequestIssueCredentialResponse> requestIssueCredential(
273273
PolicyAndPreCredential policyAndPreCredential = args.getPolicyAndPreCredential();
274274
String claimJson = args.getClaim();
275275
CredentialPojo preCredential = policyAndPreCredential.getPreCredential();
276-
com.webank.weid.protocol.response.ResponseData<CredentialPojo> userCredentialResp =
276+
com.webank.weid.blockchain.protocol.response.ResponseData<CredentialPojo> userCredentialResp =
277277
credentialPojoService.prepareZkpCredential(
278278
preCredential,
279279
claimJson,
@@ -384,7 +384,7 @@ private ResponseData<PresentationE> preparePresentation(
384384
credentialList.add(userCredential);
385385

386386
//put pre-credential and user-credential(based on CPT 111)
387-
com.webank.weid.protocol.response.ResponseData<com.webank.weid.protocol.base.PresentationE> presentationResp =
387+
com.webank.weid.blockchain.protocol.response.ResponseData<com.webank.weid.protocol.base.PresentationE> presentationResp =
388388
credentialPojoService.createPresentation(
389389
credentialList,
390390
policyAndChallenge.getPresentationPolicyE(),
@@ -413,11 +413,11 @@ private void blindCredentialSignature(RequestIssueCredentialResponse response, S
413413
}
414414

415415
Integer cptId = credentialPojo.getCptId();
416-
com.webank.weid.protocol.response.ResponseData<CredentialTemplateEntity> resp1 = cptService.queryCredentialTemplate(cptId);
416+
com.webank.weid.blockchain.protocol.response.ResponseData<CredentialTemplateEntity> resp1 = cptService.queryCredentialTemplate(cptId);
417417
CredentialTemplateEntity template = resp1.getResult();
418418
String id = new StringBuffer().append(userId).append("_").append(cptId)
419419
.toString();
420-
com.webank.weid.protocol.response.ResponseData<String> dbResp = getDataDriver()
420+
com.webank.weid.blockchain.protocol.response.ResponseData<String> dbResp = getDataDriver()
421421
.get(DataDriverConstant.DOMAIN_USER_MASTER_SECRET, id);
422422
if (dbResp.getErrorCode().intValue() != KitErrorCode.SUCCESS.getCode()) {
423423
throw new DatabaseException("database error!");
@@ -440,7 +440,7 @@ private void blindCredentialSignature(RequestIssueCredentialResponse response, S
440440
//String dbKey = (String) preCredential.getClaim()
441441
// .get(CredentialConstant.CREDENTIAL_META_KEY_ID);
442442
String dbKey = credentialPojo.getId();
443-
com.webank.weid.protocol.response.ResponseData<Integer> dbResponse =
443+
com.webank.weid.blockchain.protocol.response.ResponseData<Integer> dbResponse =
444444
getDataDriver().addOrUpdate(
445445
DataDriverConstant.DOMAIN_USER_CREDENTIAL_SIGNATURE,
446446
dbKey,

‎src/main/java/com/webank/weid/kit/amop/callback/KeyManagerCallbackWeId.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private Persistence getDataDriver() {
6262
public GetEncryptKeyResponse onPush(GetEncryptKeyArgs arg) {
6363
logger.info("[KeyManagerCallback.onPush] begin query key param:{}", arg);
6464
GetEncryptKeyResponse encryptResponse = new GetEncryptKeyResponse();
65-
ResponseData<String> keyResponse = this.getDataDriver().get(
65+
com.webank.weid.blockchain.protocol.response.ResponseData<String> keyResponse = this.getDataDriver().get(
6666
DataDriverConstant.DOMAIN_ENCRYPTKEY, arg.getKeyId());
6767
if (keyResponse.getErrorCode().intValue() == KitErrorCode.SUCCESS.getCode()
6868
&& StringUtils.isBlank(keyResponse.getResult())) {
@@ -123,15 +123,15 @@ private boolean checkAuthority(GetEncryptKeyArgs arg, Map<String, Object> keyMap
123123
return false;
124124
}
125125
// 验证signValue
126-
com.webank.weid.protocol.response.ResponseData<WeIdDocument> domRes = this.getWeIdService().getWeIdDocument(arg.getWeId());
126+
com.webank.weid.blockchain.protocol.response.ResponseData<WeIdDocument> domRes = this.getWeIdService().getWeIdDocument(arg.getWeId());
127127
if (domRes.getErrorCode().intValue() != KitErrorCode.SUCCESS.getCode()) {
128128
logger.info(
129129
"[checkAuthority] can not get the WeIdDocument, this weid is {}.",
130130
arg.getWeId()
131131
);
132132
return false;
133133
}
134-
com.webank.weid.constant.ErrorCode errorCode = DataToolUtils.verifySignatureFromWeId(
134+
com.webank.weid.blockchain.constant.ErrorCode errorCode = DataToolUtils.verifySignatureFromWeId(
135135
arg.getKeyId(),
136136
arg.getSignValue(),
137137
domRes.getResult(),

‎src/main/java/com/webank/weid/kit/amop/callback/RequestVerifyChallengeCallbackWeId.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public RequestVerifyChallengeResponse onPush(RequestVerifyChallengeArgs args) {
5555
return result;
5656
}
5757
String rawData = challenge.toJson();
58-
ResponseData<WeIdDocument> weIdDocResp = weIdService.getWeIdDocument(weId);
59-
com.webank.weid.constant.ErrorCode errorCode = DataToolUtils
58+
com.webank.weid.blockchain.protocol.response.ResponseData<WeIdDocument> weIdDocResp = weIdService.getWeIdDocument(weId);
59+
com.webank.weid.blockchain.constant.ErrorCode errorCode = DataToolUtils
6060
.verifySignatureFromWeId(rawData, signData, weIdDocResp.getResult(), null);
6161
if (errorCode.getCode() != KitErrorCode.SUCCESS.getCode()) {
6262
logger.error("[RequestVerifyChallengeCallback] verify challenge signature failed.");

‎src/main/java/com/webank/weid/kit/amop/callback/WeIdAuthWeIdAmopCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public GetWeIdAuthResponse onPush(GetWeIdAuthArgs args) {
5959
);
6060
dataMap.put(ParamKeyConstant.WEID_AUTH_SIGN_DATA, challengeSign);
6161

62-
ResponseData<WeIdDocument> weIdDocResp = weIdService.getWeIdDocument(fromWeId);
62+
com.webank.weid.blockchain.protocol.response.ResponseData<WeIdDocument> weIdDocResp = weIdService.getWeIdDocument(fromWeId);
6363
if (weIdDocResp.getErrorCode() != KitErrorCode.SUCCESS.getCode()) {
6464
logger.error("[WeIdAuthCallback->onPush] get weid document by weid ->{} failed.",
6565
fromWeId);

‎src/main/java/com/webank/weid/kit/amop/inner/DownTransDataService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private ResponseData<String> getCodeData(
5555
logger.info("[getCodeData] begin query data param:{}", arg);
5656
ResponseData<String> codeDataRes = new ResponseData<String>();
5757
codeDataRes.setResult(StringUtils.EMPTY);
58-
com.webank.weid.protocol.response.ResponseData<String> responseData = this.getDataDriver().get(
58+
com.webank.weid.blockchain.protocol.response.ResponseData<String> responseData = this.getDataDriver().get(
5959
DataDriverConstant.DOMAIN_RESOURCE_INFO, arg.getResourceId());
6060
// 数据查询出错
6161
if (responseData.getErrorCode().intValue() != KitErrorCode.SUCCESS.getCode()) {
@@ -122,7 +122,7 @@ private ResponseData<String> getCodeData(
122122
private GetEncryptKeyResponse getEncryptKey(GetTransDataArgs arg) {
123123
logger.info("[getEncryptKey] begin query encrypt key param:{}", arg);
124124
GetEncryptKeyResponse encryptResponse = new GetEncryptKeyResponse();
125-
com.webank.weid.protocol.response.ResponseData<String> keyResponse = this.getDataDriver().get(
125+
com.webank.weid.blockchain.protocol.response.ResponseData<String> keyResponse = this.getDataDriver().get(
126126
DataDriverConstant.DOMAIN_ENCRYPTKEY, arg.getResourceId());
127127
if (keyResponse.getErrorCode().intValue() == KitErrorCode.SUCCESS.getCode()
128128
&& StringUtils.isBlank(keyResponse.getResult())) {
@@ -188,15 +188,15 @@ private boolean checkAuthority(GetTransDataArgs arg, Map<String, Object> keyMap)
188188
return false;
189189
}
190190
// 验证signValue
191-
com.webank.weid.protocol.response.ResponseData<WeIdDocument> domRes = this.getWeIdService().getWeIdDocument(arg.getWeId());
191+
com.webank.weid.blockchain.protocol.response.ResponseData<WeIdDocument> domRes = this.getWeIdService().getWeIdDocument(arg.getWeId());
192192
if (domRes.getErrorCode().intValue() != KitErrorCode.SUCCESS.getCode()) {
193193
logger.error(
194194
"[checkAuthority] can not get the WeIdDocument, this weid is {}.",
195195
arg.getWeId()
196196
);
197197
return false;
198198
}
199-
com.webank.weid.constant.ErrorCode errorCode = DataToolUtils.verifySignatureFromWeId(
199+
com.webank.weid.blockchain.constant.ErrorCode errorCode = DataToolUtils.verifySignatureFromWeId(
200200
arg.getResourceId(),
201201
arg.getSignValue(),
202202
domRes.getResult(),

0 commit comments

Comments
 (0)