Merge pull request #335 from youwenbusi/develop

pre-release

Author: youwenbusi

VERSION

@@ -1 +1 @@
-1.8.5-rc.1-SNAPSHOT
+1.8.5-rc.8-SNAPSHOT

authorityIssuer.address

@@ -93,7 +93,7 @@ List logger = [
 
 // junit test
 List junit = [
-        "junit:junit:4.12"
+        "junit:junit:4.13.1"
 ]
 
 List apache_commons = [
@@ -116,6 +116,11 @@ List json = [
         "com.networknt:json-schema-validator:1.0.71",
 ]
 
+def gson_version = "2.8.9"
+List gson = [
+        "com.google.code.gson:gson:$gson_version"
+]
+
 List mysql_driver = [
         "mysql:mysql-connector-java:8.0.20", // todo runtime
         "org.apache.commons:commons-dbcp2:2.5.0"
@@ -136,11 +141,11 @@ List rpc = [
 ]
 
 List pdfbox = [
-        "org.apache.pdfbox:pdfbox:2.0.16"
+        "org.apache.pdfbox:pdfbox:2.0.24"
 ]
 
 List protobuf = [
-        "com.google.protobuf:protobuf-java:3.9.1"
+        "com.google.protobuf:protobuf-java:3.19.2"
 ]
 
 List caffeine = [
@@ -160,11 +165,15 @@ configurations {
     all*.exclude group: "io.netty", module: "netty-tcnative"
 }
 
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 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
-        compile("com.webank:weid-contract-java:1.3.0-rc.2-SNAPSHOT")
+        compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval, gson
+        compile("com.webank:weid-contract-java:1.3.0-rc.4-SNAPSHOT")
 
         compile fileTree(dir: 'lib', include: '*.jar')
         implementation 'com.google.guava:guava:31.1-jre'
@@ -173,7 +182,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
+        testCompile logger, lombok, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval, spring, gson
         testAnnotationProcessor lombok
     }
     if (gradleVer.startsWith("4")) {

build.gradle

@@ -2,7 +2,7 @@
 
 #######################################################################################################
 #                                                                                                     #
-#         fisco bcos version config                                                                   #
+#         fisco bcos 2 or 3 version config                                                                   #
 #                                                                                                     #
 #######################################################################################################
 # Version
@@ -53,8 +53,8 @@ group.id=1
 #         fisco bcos node cert related config                                                         #
 #                                                                                                     #
 #######################################################################################################
-# Fisco-Bcos sdk SSL encrypt type, false:ECDSA, true:SM2
-sdk.sm-crypto=false
+# Fisco-Bcos sdk SSL encrypt type, false:ECDSA, true: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]
 sdk.cert-path=conf

cptController.address

@@ -1 +1 @@
-0x8dbf78b289f33000e57e80fc15d415b40f2cfe5688d7a92f07393b97606aeed7
+0x74ca478cbab6dd09a36da3f3bf56e433174e983ec38d5bd0d3e13593f72ae261

dist/conf/fisco.properties.tpl

@@ -1 +1 @@
-5686332858406600098574930615286920155179124750677701187633916230205742334882670952535475018419229666394535946783087534972161773024961235927824774898541110
+13079093397463814932731720163442777403208788175453836227824139092404945067394266611910031425181012754616377192193136435818972874637291518463471522281921222

evidenceController.address

@@ -50,8 +50,8 @@ private static String initCryptoKeyPair(String inputPrivateKey) {
             byte[] pubBytes = Numeric.hexStringToByteArray(cryptoKeyPair.getHexPublicKey());
             String privateKey = new BigInteger(1, priBytes).toString(10);
             String publicKey = new BigInteger(1, pubBytes).toString(10);
-            writeAddressToFile(publicKey, "ecdsa_key.pub");
-            writeAddressToFile(privateKey, "ecdsa_key");
+            writeAddressToFile(publicKey, "public_key");
+            writeAddressToFile(privateKey, "private_key");
         }
 
         //if (credentials == null) {