Merge pull request #843 from WeBankBlockchain/lab-dev

fix depend

Changelog.md

@@ -4,6 +4,7 @@
 **Fix**
 - `/trans/convertRawTxStr`接口返回未签名交易体的哈希值或签名后的交易体字符串
 - 修改发交易入参中的`funcParam`，从`List<Object>`改为`List<String>`
+- `/trans/transWithSign`等通过签名服务对交易签名接口，通过WeBASE-Sign的`/sign/hash`新接口进行交易签名
 
 **兼容性**
 - 支持FISCO-BCOS v3.0.0 及以上版本

build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 
-def spring_boot_version="2.5.12"
+def spring_boot_version="2.7.10"
 List spring_boot =[
     "org.springframework.boot:spring-boot-starter-web:$spring_boot_version",
     "org.springframework.boot:spring-boot-autoconfigure:$spring_boot_version",
@@ -90,7 +90,6 @@ List scaffold = [
 dependencies {
     compile spring_boot,swagger,logger,jaxb,jackson,scaffold
     compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.3.0-SNAPSHOT') {
-        exclude group: "org.fisco-bcos.java-sdk"
         exclude group: "org.slf4j"
     }
     // support guomi/ecdsa same time, support solcJ-0.5.2
@@ -108,10 +107,10 @@ dependencies {
     // cover low version
     compile 'org.slf4j:jcl-over-slf4j:1.7.30'
     compile 'com.google.guava:guava:30.0-jre'
-    compile 'org.yaml:snakeyaml:1.31'
+    compile 'org.yaml:snakeyaml:2.0'
     compile 'javax.validation:validation-api:2.0.1.Final'
 
-    testCompile('org.springframework.boot:spring-boot-starter-test:$spring_boot_version') {
+    testCompile("org.springframework.boot:spring-boot-starter-test:$spring_boot_version") {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
     testCompile 'junit:junit:4.13.1',

src/main/java/com/webank/webase/front/transaction/TransService.java

@@ -76,6 +76,7 @@
 import org.fisco.bcos.sdk.v3.utils.Numeric;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 /**
@@ -100,8 +101,7 @@ public class TransService {
     @Qualifier(value = "ecdsa")
     private CryptoSuite ecdsaCryptoSuite;
     @Autowired
-    private SysConfigServiceInWebase sysConfigServiceInWebase;
-    @Autowired
+    @Lazy
     private CNSServiceInWebase cnsServiceInWebase;
     /**
      * if use wasm(liquid), use 2

src/main/resources/application-docker.yml

@@ -59,7 +59,9 @@ spring:
     multipart:
       max-request-size: 30MB # request max size
       max-file-size: 20MB # single file size
-
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
 
 logging:
   config: classpath:log4j2.xml

src/main/resources/application.yml

@@ -59,7 +59,9 @@ spring:
     multipart:
       max-request-size: 30MB # request max size
       max-file-size: 20MB # single file size
-
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
 
 logging:
   config: classpath:log4j2.xml