Merge pull request #370 from WeBankFinTech/dev

v1.5.2 dev=>master

.travis.yml

@@ -0,0 +1,34 @@
+sudo: false
+
+branches:
+  only:
+  - master
+  - dev
+
+language: java
+
+matrix:
+#  fast_finish: true
+  include:
+    - language: java
+      jdk: openjdk8
+      os: linux
+      dist: xenial
+      sudo: required
+
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+before_install:
+  - gradle wrapper
+
+install: skip
+
+script:
+  - chmod +x ./gradlew
+  - ./gradlew build -x test

Changelog.md

@@ -1,4 +1,23 @@
 
+### v1.5.2(2021-07-16)
+
+**Add**
+- 优化合约Java项目导出并支持多用户、节点检测
+- 合约仓库新增资产合约模板
+- 支持开发者导出私钥、支持合约IDE绑定合约地址
+
+**Fix**
+- 优化禁用后台鉴权，增加Swagger，方便服务端联调
+- 修复异常合约列表排序
+- 修复获取区块头接口
+
+**兼容性**
+- 支持FISCO-BCOS v2.4.x 及以上版本
+- WeBASE-Web v1.5.2+
+- WeBASE-Front v1.5.1+
+- WeBASE-Sign v1.5.0+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
 ### v1.5.1(2021-05-28)
 
 **Add**
@@ -26,6 +45,7 @@
 - 节点监控新增链上TPS、出块周期、块大小的统计
 - 新增链上全量合约统计、新增链上全量私钥统计
 - 支持导出Pem/P12/WeID或明文私钥、支持导出前置的SDK证书
+- Web3SDK切换到JavaSDK
 
 **Fix**
 - 支持合约的重复编译、部署等操作

build.gradle

@@ -21,7 +21,7 @@ repositories {
     mavenLocal()
 }
 
-def springboot_version="2.1.15.RELEASE"
+def springboot_version="2.1.18.RELEASE"
 List springboot = [
      "org.springframework.boot:spring-boot-starter-web:$springboot_version",
      "org.springframework.boot:spring-boot-starter-security:$springboot_version",
@@ -31,11 +31,27 @@ List springboot = [
 ]
 
 // cover old version
-def spring_version="5.1.15.RELEASE"
-List spring =[
+def spring_version="5.2.15.RELEASE"
+List spring = [
+    "org.springframework:spring-core:$spring_version",
+    "org.springframework:spring-aop:$spring_version",
+    "org.springframework:spring-beans:$spring_version",
+    "org.springframework:spring-context:$spring_version",
+    "org.springframework:spring-expression:$spring_version",
+    "org.springframework:spring-jcl:$spring_version",
     "org.springframework:spring-jdbc:$spring_version",
-    "org.springframework:spring-tx:$spring_version"
+    "org.springframework:spring-tx:$spring_version",
+    "org.springframework:spring-test:$spring_version",
+    "org.springframework:spring-web:$spring_version"
 ]
+// cover old version
+def spring_security_version="5.4.4"
+List spring_security = [
+    "org.springframework.security:spring-security-core:$spring_security_version",
+    "org.springframework.security:spring-security-web:$spring_security_version",
+    "org.springframework.security:spring-security-config:$spring_security_version",
+]
+
 
 List jaxb = [
      "javax.xml.bind:jaxb-api:2.3.0",
@@ -48,7 +64,7 @@ List lombok = [
     "org.projectlombok:lombok:1.18.12"
 ]
 
-def jackson_version = "2.11.0"
+def jackson_version = "2.11.4"
 List jackson = [
     "com.fasterxml.jackson.core:jackson-databind:$jackson_version",
     "com.fasterxml.jackson.core:jackson-annotations:$jackson_version",
@@ -77,13 +93,18 @@ List mbg = [
 ]
 
 List scaffold = [
-    'com.webank.webase:solscaffold:1.0.1',
-    'com.webank:SmartDev-Scaffold:1.0.0-SNAPSHOT',
-    'com.webank:solc-gradle-plugin:1.0.0'
+    'com.webank.webase:solscaffold:1.0.2',
+    'com.webank:SmartDev-Scaffold:1.0.0.1',
+    'com.webank:solc-gradle-plugin:1.0.1'
+]
+
+List swagger = [
+    'io.springfox:springfox-swagger2:2.8.0',
+    'io.springfox:springfox-swagger-ui:2.8.0'
 ]
 
 dependencies {
-    compile springboot,spring,jaxb,jackson,log4j,scaffold
+    compile springboot,spring,spring_security,jaxb,jackson,log4j,scaffold,swagger
     compile "org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.7.2"
     compile "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.0"
     compile "org.apache.commons:commons-lang3:3.8.1"