Merge pull request #351 from WeBankFinTech/dev

v1.5.1 dev=>master

.gitignore

@@ -30,3 +30,7 @@
 *.srl
 gmcert.cnf
 gmsm2.param
+/output/
+generatorConfig.xml
+mbg.properties
+GenerateToolTest.java

Changelog.md

@@ -1,4 +1,24 @@
 
+### v1.5.1(2021-05-28)
+
+**Add**
+- 支持导出合约的Java工程脚手架
+- 新增合约仓库接口
+- 新增全量用户/合约通过地址搜索功能
+
+**Fix**
+- 优化开发者模式下鉴权，修复开发者模式下删除合约目录问题
+- 优化应用管理中合约同步速度过慢问题
+- 修复交易审计中异常数据总数错误问题
+- 修复导出SDK证书目录问题
+
+**兼容性**
+- 支持FISCO-BCOS v2.4.x 及以上版本
+- WeBASE-Web v1.5.1+
+- WeBASE-Front v1.5.1+
+- WeBASE-Sign v1.5.0+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
 ### v1.5.0(2021-04-06)
 
 **Add**

build.gradle

@@ -1,5 +1,5 @@
 group = 'com.webank.webase.node.mgr'
-version = '0.0.1-SNAPSHOT'
+version = '1.0.0-SNAPSHOT'
 
 apply plugin: 'maven'
 apply plugin: 'java'
@@ -15,12 +15,10 @@ targetCompatibility = 1.8
 // In this section you declare where to find the dependencies of your project
 repositories {
     maven {url "http://maven.aliyun.com/nexus/content/groups/public/"}
-
-    maven { url 'https://dl.bintray.com/ethereum/maven/' }
+    mavenCentral()
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-
+    maven { url 'https://dl.bintray.com/ethereum/maven/' }
     mavenLocal()
-    mavenCentral()
 }
 
 def springboot_version="2.1.15.RELEASE"
@@ -78,8 +76,14 @@ List mbg = [
     'com.github.yuanmomo:mybatis-generator-plugin:1.0.9'
 ]
 
+List scaffold = [
+    'com.webank.webase:solscaffold:1.0.0',
+    'com.webank:SmartDev-Scaffold:1.0.0-SNAPSHOT',
+    'com.webank:solc-gradle-plugin:1.0.1-SNAPSHOT'
+]
+
 dependencies {
-    compile springboot,spring,jaxb,jackson,log4j
+    compile springboot,spring,jaxb,jackson,log4j,scaffold
     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"
@@ -100,6 +104,7 @@ dependencies {
     compile 'org.thymeleaf:thymeleaf:3.0.11.RELEASE'
     compile 'ognl:ognl:3.2.14'
     compile 'org.apache.commons:commons-collections4:4.4'
+
     testCompile test,mbg
 
     compileOnly lombok
@@ -149,6 +154,10 @@ jar {
             from file('src/main/resources/')
             into 'dist/conf_template'
         }
+        copy {
+            from file('gradle')
+            into 'dist/gradle'
+        }
         copy {
             from file('script/')
             into 'dist/script'

release_note.txt

@@ -1 +1 @@
- v1.5.0
+ v1.5.1

script/webase-ddl.sql

@@ -416,6 +416,7 @@ CREATE TABLE IF NOT EXISTS tb_contract_path (
   id int(11) NOT NULL AUTO_INCREMENT COMMENT '合约路径编号',
   contract_path varchar(128) binary NOT NULL COMMENT '合约所在目录',
   group_id int(11) NOT NULL COMMENT '所属群组编号',
+  account varchar(50) binary DEFAULT 'admin' COMMENT '关联账号',
   create_time datetime DEFAULT NULL COMMENT '创建时间',
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (id),
@@ -489,7 +490,7 @@ CREATE TABLE IF NOT EXISTS tb_external_contract (
   deploy_time datetime NOT NULL COMMENT '部署时间',
   contract_bin mediumtext DEFAULT NULL COMMENT '合约链上binary',
   contract_status int(1) DEFAULT '1' COMMENT '部署状态（1：未部署，2：部署成功，3：部署失败）',
-  contract_type tinyint(4) DEFAULT '0' COMMENT '合约类型(0-普通合约，1-系统合约)',
+  contract_type tinyint(4) DEFAULT '0' COMMENT '合约类型(0-普通合约，1-系统合约，2-APP合约)',
   contract_name varchar(120) binary DEFAULT NULL COMMENT '合约名称',
   contract_version varchar(120) DEFAULT NULL COMMENT '合约版本',
   contract_abi mediumtext COMMENT '编译合约生成的abi文件内容',
@@ -527,6 +528,7 @@ CREATE TABLE IF NOT EXISTS tb_app_info (
 
 -- ----------------------------
 -- Table structure for tb_contract_store
+-- contract from application manage
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS tb_contract_store (
   id int(11) NOT NULL AUTO_INCREMENT COMMENT '自增编号',
@@ -541,6 +543,54 @@ CREATE TABLE IF NOT EXISTS tb_contract_store (
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (id),
   UNIQUE KEY uk_version (app_key,contract_name,contract_version)
-) ENGINE=InnoDB AUTO_INCREMENT=300001 DEFAULT CHARSET=utf8 COMMENT='应用合约仓库';
+) ENGINE=InnoDB AUTO_INCREMENT=300001 DEFAULT CHARSET=utf8 COMMENT='应用合约信息';
+
+-- ----------------------------
+-- Table structure for tb_contract_store
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS tb_warehouse (
+  id int(11) NOT NULL COMMENT '自增编号',
+  warehouse_name varchar(255) binary NOT NULL COMMENT '合约仓库名',
+  warehouse_name_en varchar(255) binary NOT NULL COMMENT '仓库名（英文）',
+  type  int(11) NOT NULL COMMENT '仓库类型',
+  warehouse_icon     mediumtext COMMENT '仓库图标（Base64）',
+  description     mediumtext COMMENT '仓库描述(Base64)',
+  description_en  mediumtext COMMENT '仓库描述（英文）(Base64)',
+  warehouse_detail   mediumtext COMMENT '仓库详情',
+  warehouse_detail_en   mediumtext COMMENT '仓库详情（英文）',
+  create_time datetime DEFAULT NULL COMMENT '创建时间',
+  modify_time datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_name(warehouse_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='合约仓库';
+
+CREATE TABLE IF NOT EXISTS tb_contract_folder (
+  id int(11) NOT NULL COMMENT '自增编号',
+  folder_name      varchar(255) binary NOT NULL COMMENT '合约目录名',
+  description     mediumtext COMMENT '目录描述(Base64)',
+  description_en  mediumtext COMMENT '目录描述（英文）(Base64)',
+  folder_detail   mediumtext COMMENT '目录详情',
+  folder_detail_en   mediumtext COMMENT '目录详情（英文）',
+  create_time datetime DEFAULT NULL COMMENT '创建时间',
+  modify_time datetime DEFAULT NULL COMMENT '修改时间',
+  warehouse_id  int(11) NOT NULL COMMENT '合约仓库编号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_name(warehouse_id,folder_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='合约仓库目录';
+
+CREATE TABLE IF NOT EXISTS tb_contract_item (
+  id int(11) NOT NULL COMMENT '自增编号',
+  contract_name varchar(255) binary NOT NULL COMMENT '合约名称',
+  contract_source mediumtext COMMENT '合约源码(Base64)',
+  description     mediumtext COMMENT '合约描述(Base64)',
+  description_en  mediumtext COMMENT '合约描述（英文）(Base64)',
+  create_time datetime DEFAULT NULL COMMENT '创建时间',
+  modify_time datetime DEFAULT NULL COMMENT '修改时间',  
+  warehouse_id  int(11) NOT NULL COMMENT '合约仓库编号',
+  contract_folder_id  int(11) NOT NULL COMMENT '合约目录编号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_name(warehouse_id,contract_folder_id,contract_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='合约仓库合约信息';
+
 
 SET FOREIGN_KEY_CHECKS = 1;