Merge pull request #5 from WeBankBlockchain/develop

youwenbusi · web-flow · commit 188c13bc4617 · 2023-03-16T10:40:58.000+08:00
add lib
diff --git a/.gitignore b/.gitignore
@@ -115,7 +115,7 @@ modules.xml
 .mtj.tmp/
 
 # Package Files #
-*.jar
+#*.jar
 *.war
 *.ear
 *.zip
diff --git a/lib/WeDPR-Java-SDK.jar b/lib/WeDPR-Java-SDK.jar
diff --git a/lib/WeDPR-ecies.jar b/lib/WeDPR-ecies.jar
diff --git a/src/main/resources/fisco.properties b/src/main/resources/fisco.properties
@@ -57,9 +57,9 @@ group.id=1
 sdk.sm-crypto=0
 # 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
diff --git a/src/main/resources/fisco.properties.tpl b/src/main/resources/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
diff --git a/src/test/resources/fisco.properties.tpl b/src/test/resources/fisco.properties.tpl
@@ -57,9 +57,9 @@ group.id=1
 sdk.sm-crypto=false
 # 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
