Merge pull request #361 from WeBankBlockchain/feature/reconstruction

release 3.1.0-rc.1

Author: youwenbusi

CHANGELOG.md

@@ -1,3 +1,9 @@
+### V3.1.0 (2023-4-28)
+- Features:
+1. Add a way for local databases to deploy WeIdentity without deploying blockchain
+- Bugfixes:
+1. Upgrade components with known vulnerabilities
+
 ### V3.0.0 (2022-12-15)
 - Features:
 1. The project was restructured to strip the blockchain-related functions and interfaces from the project, as well as the file transfer and format conversion functions from the project

VERSION

@@ -1 +1 @@
-3.0.0-rc.1
+3.1.0-rc.1

build.gradle

@@ -80,7 +80,7 @@ List lombok = [
         "org.projectlombok:lombok:1.18.10"
 ]
 
-def log4j_version="2.18.0"
+def log4j_version="2.20.0"
 List logger = [
         "org.slf4j:jul-to-slf4j:1.7.30",
         "org.apache.logging.log4j:log4j-api:$log4j_version",
@@ -106,7 +106,7 @@ List jmockit = [
         "org.jmockit:jmockit:1.47"
 ]
 
-def jackson_version="2.13.3"
+def jackson_version="2.14.2"
 List json = [
         "com.fasterxml.jackson.core:jackson-databind:$jackson_version",
         "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version",
@@ -116,7 +116,7 @@ List json = [
         "com.networknt:json-schema-validator:1.0.71",
 ]
 
-def gson_version = "2.8.9"
+def gson_version = "2.10.1"
 List gson = [
         "com.google.code.gson:gson:$gson_version"
 ]
@@ -127,7 +127,7 @@ List mysql_driver = [
 ]
 
 List redisson = [
-        "org.redisson:redisson:3.13.1"
+        "org.redisson:redisson:3.20.0"
 ]
 
 List zxing = [
@@ -145,7 +145,7 @@ List pdfbox = [
 ]
 
 List protobuf = [
-        "com.google.protobuf:protobuf-java:3.19.2"
+        "com.google.protobuf:protobuf-java:3.22.2"
 ]
 
 List caffeine = [
@@ -156,8 +156,13 @@ List oval = [
         "net.sf.oval:oval:3.2.1"
 ]
 
+List xstream = [
+        "com.thoughtworks.xstream:xstream:1.4.20"
+]
+
 List spring = [
-        "org.springframework:spring-core:5.3.21"
+        "org.springframework:spring-core:5.3.21",
+        "org.springframework:spring-context:5.3.25"
 ]
 
 configurations {
@@ -172,10 +177,9 @@ configurations.all {
 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, gson
+        compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval, gson, spring, xstream
         //compile("com.webank:weid-contract-java:1.3.1-rc.2-SNAPSHOT")
-        //compile("com.webank:weid-contract-java:1.3.1-rc1")
-        compile("com.webank:weid-blockchain:3.0.0-rc.1")
+        compile("com.webank:weid-blockchain:3.1.0-rc.1")
 
         compile fileTree(dir: 'lib', include: '*.jar')
         implementation 'com.google.guava:guava:31.1-jre'
@@ -184,7 +188,7 @@ dependencies {
         implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15'
         annotationProcessor lombok
 
-        testCompile logger, lombok, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval, spring, gson
+        testCompile logger, lombok, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval, spring, gson, xstream
         testAnnotationProcessor lombok
     }
     if (gradleVer.startsWith("4")) {

dist/conf/fisco.properties.tpl

@@ -57,9 +57,9 @@ group.id=1
 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]
-sdk.cert-path=conf
+sdk.cert-path=resources/conf
 
 # amop public key of pem and private key of p12 configuration
-amop.pub-path=conf/amop/consumer_public_key.pem
-amop.pri-path=conf/amop/consumer_private_key.p12
+amop.pub-path=resources/conf/amop/consumer_public_key.pem
+amop.pri-path=resources/conf/amop/consumer_private_key.p12
 amop.p12-password=123456

gradle.properties

@@ -1,8 +1,8 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 jdkTlsNamedGroups=secp256r1,secp256k1
-repoType=cn
-signing.keyId=
-signing.password=
-signing.secretKeyRingFile=
-sonatypeUsername=
-sonatypePassword=
+repoType=zn
+signing.keyId=62A32F80
+signing.password=***REMOVED***
+signing.secretKeyRingFile=./secring.gpg
+sonatypeUsername=tonychen
+sonatypePassword=***REMOVED***

src/main/java/com/webank/weid/app/AppCommand.java

@@ -4,7 +4,7 @@
 
 import com.webank.weid.constant.ErrorCode;
 import com.webank.weid.exception.InitWeb3jException;
-import com.webank.weid.protocol.response.ResponseData;
+import com.webank.weid.blockchain.protocol.response.ResponseData;
 import com.webank.weid.service.rpc.WeIdService;
 import com.webank.weid.service.impl.WeIdServiceImpl;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/webank/weid/constant/DataDriverConstant.java

@@ -280,4 +280,25 @@ public final class DataDriverConstant {
     public static final String DOMAIN_RESOURCE_INFO = "domain.resourceInfo";
 
     public static final String DOMAIN_WEID_AUTH = "domain.weIdAuth";
+
+    /**
+     * 本地运行所需表.
+     */
+
+    public static final String LOCAL_WEID_DOCUMENT = "local.weIdDocument";
+
+    public static final String LOCAL_CPT = "local.cpt";
+
+    public static final String LOCAL_POLICY = "local.policy";
+
+    public static final String LOCAL_PRESENTATION = "local.presentation";
+
+    public static final String LOCAL_ROLE = "local.role";
+
+    public static final String LOCAL_AUTHORITY_ISSUER = "local.authorityIssuer";
+
+    public static final String LOCAL_SPECIFIC_ISSUER = "local.specificIssuer";
+
+    public static final String LOCAL_EVIDENCE = "local.evidence";
+
 }

src/main/java/com/webank/weid/constant/WeIdConstant.java

@@ -263,6 +263,11 @@ public final class WeIdConstant {
 
     public static final Long RECOGNIZED_AUTHORITY_ISSUER_FLAG = 1L;
 
+    /*
+     * State file path for run local
+     */
+    public static final String STATE_FILE_PATH = "output/local_state";
+
     public static enum PublicKeyType {
         SM2("SM2"),
         //RSA("RSA"),

src/main/java/com/webank/weid/exception/DataTypeCastException.java

@@ -2,7 +2,7 @@
 
 package com.webank.weid.exception;
 
-import com.webank.weid.constant.ErrorCode;
+import com.webank.weid.blockchain.constant.ErrorCode;
 
 /**
  * WeIdBase Exception. Base Exception for WeIdentity Project.

src/main/java/com/webank/weid/exception/DatabaseException.java

@@ -2,7 +2,7 @@
 
 package com.webank.weid.exception;
 
-import com.webank.weid.constant.ErrorCode;
+import com.webank.weid.blockchain.constant.ErrorCode;
 
 /**
  * Database Exception. Base Exception for WeIdentity Project.