Merge pull request #245 from WeBankFinTech/dev

v1.4.1
WeBankBlockchain · Oct 10, 2020 · 2a78ca6 · 2a78ca6
2 parents a93f6d9 + 99bb905
commit 2a78ca6
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 5 deletions.
diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
@@ -113,6 +113,8 @@ CREATE TABLE IF NOT EXISTS tb_contract (
   description text COMMENT '描述',
   create_time datetime DEFAULT NULL COMMENT '创建时间',
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
+  deploy_address varchar(64) DEFAULT NULL COMMENT '合约部署者地址',
+  deploy_user_name varchar(64) DEFAULT NULL COMMENT '合约部署者用戶名',
   PRIMARY KEY (contract_id),
   UNIQUE KEY uk_group_path_name (group_id,contract_path,contract_name,account)
 ) ENGINE=InnoDB AUTO_INCREMENT=200001 DEFAULT CHARSET=utf8 COMMENT='合约表';

diff --git a/script/webase-dml.sql b/script/webase-dml.sql
@@ -99,5 +99,5 @@ INSERT INTO `tb_mail_server_config`(`server_name`,`host`,`port`,`username`,`pass
 -- ----------------------------
 -- 8、init tb_config
 -- ----------------------------
-INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('docker 镜像版本', 1, 'v2.5.0', '2020-07-22 17:14:23', '2020-07-22 17:14:23');
-INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('docker 镜像版本', 1, 'v2.5.0-gm', '2020-07-22 17:14:23', '2020-07-22 17:14:23');
+INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('docker 镜像版本', 1, 'v2.6.0', '2020-09-22 17:14:23', '2020-09-22 17:14:23');
+INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('docker 镜像版本', 1, 'v2.6.0-gm', '2020-09-22 17:14:23', '2020-09-22 17:14:23');
diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -13,6 +13,7 @@
  */
 package com.webank.webase.node.mgr.contract;
 
+import com.webank.webase.node.mgr.user.entity.TbUser;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -253,9 +254,13 @@ public TbContract deployContract(DeployInputParam inputParam) throws NodeMgrExce
             throw new NodeMgrException(ConstantCode.CONTRACT_DEPLOY_FAIL);
         }
 
+        // get deploy user name
+        String userName = userService.getUserNameByAddress(groupId, inputParam.getUser());
         //save contract
         TbContract tbContract = new TbContract();
         BeanUtils.copyProperties(inputParam, tbContract);
+        tbContract.setDeployAddress(inputParam.getUser());
+        tbContract.setDeployUserName(userName);
         tbContract.setContractAddress(contractAddress);
         tbContract.setContractStatus(ContractStatus.DEPLOYED.getValue());
         //tbContract.setContractVersion(version);

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/entity/ContractParam.java b/src/main/java/com/webank/webase/node/mgr/contract/entity/ContractParam.java
@@ -36,6 +36,7 @@ public class ContractParam extends BaseQueryParam {
     private Integer contractStatus;
     private Integer contractType;
     private String partOfBytecodeBin;
+    private String deployAddress;
 
     /**
      * init by contractId.

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/entity/TbContract.java b/src/main/java/com/webank/webase/node/mgr/contract/entity/TbContract.java
@@ -43,7 +43,8 @@ public class TbContract {
     private String description;
     private LocalDateTime createTime;
     private LocalDateTime modifyTime;
-
+    private String deployAddress;
+    private String deployUserName;
     /**
      * init by contractId、contractName、groupId、contractPath.
      */

diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserService.java b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
@@ -282,6 +282,14 @@ public String getSignUserIdByAddress(int groupId, String address) throws NodeMgr
         return user.getSignUserId();
     }
 
+    public String getUserNameByAddress(int groupId, String address) throws NodeMgrException {
+        TbUser user = queryUser(null, groupId, null, address, null);
+        if (user == null) {
+            throw new NodeMgrException(ConstantCode.USER_NOT_EXIST);
+        }
+        return user.getUserName();
+    }
+
     /**
      * update user info.
      */

diff --git a/src/main/resources/mapper/ContractMapper.xml b/src/main/resources/mapper/ContractMapper.xml
@@ -38,13 +38,17 @@
       property="createTime"/>
     <result column="modify_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
       property="modifyTime"/>
+    <result column="deploy_address" javaType="java.lang.String" jdbcType="VARCHAR"
+      property="deployAddress"/>
+    <result column="deploy_user_name" javaType="java.lang.String" jdbcType="VARCHAR"
+      property="deployUserName"/>
   </resultMap>
 
 
   <insert id="add" parameterType="com.webank.webase.node.mgr.contract.entity.TbContract">
     insert into
-    tb_contract(group_id,contract_path,contract_version,contract_name,account,contract_source,contract_abi,contract_bin,bytecodeBin,contract_address,description,deploy_time,create_time,modify_time)
-    values(#{groupId},#{contractPath},#{contractVersion},#{contractName},#{account},#{contractSource},#{contractAbi},#{contractBin},#{bytecodeBin},#{contractAddress},#{description},#{deployTime},NOW(),NOW())
+    tb_contract(group_id,contract_path,contract_version,contract_name,account,contract_source,contract_abi,contract_bin,bytecodeBin,contract_address,description,deploy_time,create_time,modify_time,deploy_address,deploy_user_name)
+    values(#{groupId},#{contractPath},#{contractVersion},#{contractName},#{account},#{contractSource},#{contractAbi},#{contractBin},#{bytecodeBin},#{contractAddress},#{description},#{deployTime},NOW(),NOW(),#{deployAddress},#{deployUserName})
     <selectKey keyProperty="contractId" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -91,6 +95,12 @@
     <if test="description != null and description != ''">
       ,description = #{description}
     </if>
+    <if test="deployAddress != null and deployAddress != ''">
+      ,deploy_address = #{deployAddress}
+    </if>
+    <if test="deployUserName != null and deployUserName != ''">
+      ,deploy_user_name = #{deployUserName}
+    </if>
     where contract_id = #{contractId}
   </update>
 
@@ -133,6 +143,9 @@
     <if test="contractStatus != null and contractStatus != ''">
       and contract_status = #{contractStatus}
     </if>
+    <if test="deployAddress != null and deployAddress != ''">
+      and deploy_address = #{deployAddress}
+    </if>
   </select>
 
 
@@ -160,6 +173,9 @@
     <if test="contractAddress != null and contractAddress != ''">
       and contract_address = #{contractAddress}
     </if>
+    <if test="deployAddress != null and deployAddress != ''">
+      and deploy_address = #{deployAddress}
+    </if>
     <if test="flagSortedByTime != null and flagSortedByTime != ''">
       order by modify_time ${flagSortedByTime}
     </if>
@@ -193,6 +209,9 @@
     <if test="contractAddress != null and contractAddress != ''">
       and contract_address = #{contractAddress}
     </if>
+    <if test="deployAddress != null and deployAddress != ''">
+      and deploy_address = #{deployAddress}
+    </if>
     <if test="contractStatus != null and contractStatus != ''">
       and contract_status = #{contractStatus}
     </if>

diff --git a/src/test/java/node/mgr/test/contract/ContractServiceTest.java b/src/test/java/node/mgr/test/contract/ContractServiceTest.java
@@ -16,6 +16,7 @@
 package node.mgr.test.contract;
 
 
+import com.webank.webase.node.mgr.contract.entity.ContractParam;
 import java.util.Arrays;
 import java.util.List;
 
@@ -79,4 +80,10 @@ public void sendTransactionTest(){
         assert (transRsp!=null);
     }
 
+    @Test
+    public void testGetContractList() {
+        List<TbContract> resList = contractService.qureyContractList(new ContractParam());
+        System.out.println("list:");
+        System.out.println(resList);
+    }
 }