Merge pull request #349 from youwenbusi/feature/reconstruction

final

.ci/ca.crt

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPTCCAiWgAwIBAgIJAMS6EqK879cHMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV
-BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe
-Fw0xOTA5MDYwMzI4MThaFw0yOTA5MDMwMzI4MThaMDUxDjAMBgNVBAMMBWNoYWlu
-MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMy81sz5eAudWDVvOSF4BRrdSZp+uWO8VJph
-e2eA1C7gFkd2259gSbvg8mBRivXu5hGvTbbKdFsiq732zixzGzRZ8kyYkUr2QqPy
-H8tFAjx+frBQXcBooVDYIPal59thPOuuJsVIWFGqgTnWJCqpymcAzdQAFJ3ebtwH
-jvlGW2WN6NJm5bEY5MObKn3391C+rRFVzqm01TRhUWzLczr4Ajv+HyuQheLq+FpY
-rKYMgcsXnYK023+VRuXJIc89Ph7JFWFthU8I30AL6BZWsGNZwT+VNkfaie2iMcaS
-UkQaLtEL1BVsxqborTljO43Yb9u5OZ4ihu2KFXvKN6GUcmii4fECAwEAAaNQME4w
-HQYDVR0OBBYEFAYOx+/OBQb7/EOgf5bKy1WBGfq8MB8GA1UdIwQYMBaAFAYOx+/O
-BQb7/EOgf5bKy1WBGfq8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AK7+Xa0MTi7DtE7czIFMJ5FL5lIZ+OX6heKngxE3pun37aFO3PEgQtvr9gutLzQX
-/Yiy8vY2lPtO7erHH6do3H5D6NlAMDsfh8CRuq4DeseNpinA4KwiFmvBEdsWxDI+
-qpyHYx3YOnE7wYbossg0+m+eDrFT0SdowY8zHI65qb0T+urtqMWG60dCcmOPe8+E
-mPL7JVuTLC0pQiQvVdhM9yyX2sgD8Bwmsw5SILQ9UdX7TVFN4VSuTUh2+DNiR4gt
-Umw9W6G7bSG2ZlDhwXesgJdzXcGoPR0j9z4kqf5vvnYCZETG7NZ6++EJ5byZqM49
-JaWJWp2OMDwm4e3nLPOS26g=
------END CERTIFICATE-----

.ci/script/build-ci.sh

@@ -47,8 +47,8 @@ function modify_config()
         cp ${java_source_code_dir}/ecdsa_key ${java_source_code_dir}/src/test/resources/
     fi
     cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/test/resources
-    cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/test/resources
-    cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/test/resources
+    cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/test/resources
+    cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/test/resources
     cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/main/resources
     cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/test/resources
 	cp -r ${java_source_code_dir}/src/main/resources/WeDPR_dynamic_lib ${java_source_code_dir}/src/test/resources
@@ -60,8 +60,8 @@ function gradle_build_sdk()
 {
     #run gradle build
     cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/main/resources
-    cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/main/resources
-    cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/main/resources
+    cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/main/resources
+    cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/main/resources
 
     export FISCO_BCOS_VERSION="2"
     export CNS_PROFILE_ACTIVE="ci"

.ci/script/weid-build-tools/build-ci.sh

@@ -37,8 +37,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
 
     # copy blockchain cfg files
     cp .ci/ca.crt weid-build-tools/resources/
-    cp .ci/node.crt weid-build-tools/resources/
-    cp .ci/node.key weid-build-tools/resources/
+    cp .ci/sdk.crt weid-build-tools/resources/
+    cp .ci/sdk.key weid-build-tools/resources/
 
     # run repo ci scripts
     cd weid-build-tools/

.ci/script/weid-http-service/build-ci.sh

@@ -33,10 +33,10 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
     cp src/main/resources/* weid-http-service/src/test/resources/
     cp .ci/ca.crt weid-http-service/src/test/resources/
     cp .ci/ca.crt weid-http-service/src/main/resources/
-    cp .ci/node.crt weid-http-service/src/test/resources/
-    cp .ci/node.crt weid-http-service/src/main/resources/
-    cp .ci/node.key weid-http-service/src/test/resources/
-    cp .ci/node.key weid-http-service/src/main/resources/
+    cp .ci/sdk.crt weid-http-service/src/test/resources/
+    cp .ci/sdk.crt weid-http-service/src/main/resources/
+    cp .ci/sdk.key weid-http-service/src/test/resources/
+    cp .ci/sdk.key weid-http-service/src/main/resources/
 
     # run repo ci scripts
     cd weid-http-service/

.ci/script/weid-sample/build-ci.sh

@@ -35,8 +35,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
     cp src/main/resources/fisco.properties weid-sample/src/main/resources/
     cp src/main/resources/weidentity.properties weid-sample/src/main/resources/
     cp .ci/ca.crt weid-sample/src/main/resources/
-    cp .ci/node.crt weid-sample/src/main/resources/
-    cp .ci/node.key weid-sample/src/main/resources/
+    cp .ci/sdk.crt weid-sample/src/main/resources/
+    cp .ci/sdk.key weid-sample/src/main/resources/
 
     # run repo ci scripts
     cd weid-sample/

.ci/sdk.crt

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIBeDCCAR6gAwIBAgIJALkdvuWSdhvfMAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
+BmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MCAX
+DTIyMDMyMzA5MTM0NFoYDzIxMjIwMjI3MDkxMzQ0WjAxMQwwCgYDVQQDDANzZGsx
+EzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBWMBAGByqGSM49AgEG
+BSuBBAAKA0IABEhQrhgxPHQIGOW7V12Jv+7BzKnheZYPIPbqMR/993QGKqk/5u3+
+FyVE2xEGlXa/agLUU2JhmD9yH3nlKR/agfWjGjAYMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMAoGCCqGSM49BAMCA0gAMEUCIFzn+OXMvv8yD3jzKjb7ccLfPMoUxUZB
+pHHmaeaxfamBAiEA6vK2UJivk2j1bxV3NnqTKtDqCwzRHkEAD55iId/mU50=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIBcDCCARagAwIBAgIJAKybOwjnSONHMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
+BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAeFw0y
+MjAzMjMwOTEzNDRaFw0zMjAzMjAwOTEzNDRaMDcxDzANBgNVBAMMBmFnZW5jeTET
+MBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MFYwEAYHKoZIzj0C
+AQYFK4EEAAoDQgAEtaOfgPeNxIkIftVUjvOccocHx4LWnr8lIyT62IKNQPXtDi8U
+cJ/0ZaO1btA9lBP4v7YYXVS08iAPvbwwkd002aMQMA4wDAYDVR0TBAUwAwEB/zAK
+BggqhkjOPQQDAgNIADBFAiEA1bFbIlVgMr7pbS1VO4UgMnVSPKt1M5115niCdgfU
+b1UCIHXSu/stpU+2FWD6HwKRWZQ7VQu/m3qxWpg/+a/S/roM
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIBVzCB/wIJAKoq+vyUmlMJMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMMBWNoYWlu
+MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0yMjAzMjMw
+OTEzNDRaGA8yMTIyMDIyNzA5MTM0NFowNTEOMAwGA1UEAwwFY2hhaW4xEzARBgNV
+BAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0CAQYFK4EE
+AAoDQgAEZC0Gxxlvd4jLugWP/usLPQYWvXYWjMHSwF/U2ZQeYklf85r3GaqP6HV2
+yEnvDuaemDxMPItzy5cHzjfSBrif5TAKBggqhkjOPQQDAgNHADBEAiA4or46kQ4R
+IKQZQyjbL+JvHsj5nMLyaHe4esX9xRVwTQIgI0P7B7XJd8qX8qZqgp2hWbVNdtN/
+7W1/jYj/9NjJysE=
+-----END CERTIFICATE-----

.ci/sdk.key

@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgsT4z8MIQvU/QnUhRsz9b
+YUx609vYlghhWRiyekMbIaChRANCAARIUK4YMTx0CBjlu1ddib/uwcyp4XmWDyD2
+6jEf/fd0BiqpP+bt/hclRNsRBpV2v2oC1FNiYZg/ch955Skf2oH1
+-----END PRIVATE KEY-----

CHANGELOG.md

@@ -1,18 +1,24 @@
+### 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
+- Bugfixes:
+1. the value of sdk.sm-crypto in fisco.properties adapt to FISCO BCOS 3.0 guomi
+
 ### V1.8.6 (2022-10-14)
-Features:
+- Features:
 1. Upgrade the property fields in WeIdDocument to conform to the W3C DID Specification
 2. Upgrade the way data is stored and retrieved in the weid-contract
 3. Upgrade the interfaces related to WeId and Evidence
 
 ### V1.8.5 (2022-08-16)
-Features:
+- Features:
 1. Replace the web3sdk with fisco-bcos-java-sdk
 2. Support the OSCCA-approved(SM2/SM3) cryptography algorithm
 3. Support the FISCO BCOS 3.0.0 (rc4 version)
 4. Upgrade the functionality of WeID-Build-Tools to accommodate the new version of weid-java-sdk 
 
 ### V1.7.0 (2021-01-08)
-Features: 
+- Features: 
 1. FISCO BCOS 1.3.x support is fully removed - please use the FISCO BCOS 2.x node version respectively.
 2. Evidence and WeIdDocument query performance improved due to support batch type blockchain node data lookup.
 3. Authority Issuer can be registered by any WeID while only administrator can recognize.

VERSION

@@ -1 +1 @@
-1.8.6-rc.3-SNAPSHOT
+3.0.0-rc.1

build.gradle

@@ -174,7 +174,8 @@ dependencies {
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval, gson
         //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-contract-java:1.3.1-rc1")
+        compile("com.webank:weid-blockchain:3.0.0-rc.1")
 
         compile fileTree(dir: 'lib', include: '*.jar')
         implementation 'com.google.guava:guava:31.1-jre'
@@ -244,6 +245,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from 'build/docs/javadoc'
 }
 
+//tasks.withType(Javadoc).all { enabled = false}
+
 test {
     systemProperty "jdk.tls.namedGroups", "${jdkTlsNamedGroups}"
     jvmArgs "-javaagent:${classpath.find { it.name.contains("jmockit") }.absolutePath}"

dist/conf/fisco.properties.tpl

@@ -53,7 +53,7 @@ group.id=1
 #         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]