diff --git a/Changelog.md b/Changelog.md index 5a47f24ea..43290fecc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,28 @@ +### v1.5.3(2021-09-27) + +**Add** +- 新增节点管理服务Docker镜像,`webasepro/webase-node-mgr:v1.5.3` +- 合约仓库新增代理合约模板、溯源合约模板 +- 新增公钥用户绑定私钥功能 +- 新增导出私钥功能,导出格式为带密码的P12文件 +- 新增节点备注城市、IP与机构功能,新增群组备注群组信息功能,用于监控大屏展示 + +**Fix** +- 优化冻结/解冻合约获取合约管理员获取 +- 优化观察节点同步区块状态显示 +- 修复游离节点设为共识节点失败问题 +- 修复重复编译合约提示“合约已存在”问题 +- 修复对v2.6.0节点的兼容问题 + + +**兼容性** +- 支持FISCO-BCOS v2.4.x 及以上版本 +- WeBASE-Web v1.5.3+ +- WeBASE-Front v1.5.1+ +- WeBASE-Sign v1.5.0+ +详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。 + ### v1.5.2(2021-07-16) **Add** diff --git a/release_note.txt b/release_note.txt index a503124bd..f1a2e631d 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.5.2 +v1.5.3 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 index 8610acbb3..a921cfec1 100644 --- a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java +++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java @@ -72,6 +72,7 @@ public class ContractService { private static final int CONTRACT_ADDRESS_LENGTH = 42; + public static final String PERMISSION_TYPE_PERMISSION = "permission"; private static final String PERMISSION_TYPE_DEPLOY_AND_CREATE = "deployAndCreate"; public static final String STATE_MUTABILITY_VIEW = "view"; public static final String STATE_MUTABILITY_PURE = "pure"; @@ -800,10 +801,12 @@ public List getContractManager(int groupId, String contractAddress) { if (contract != null) { deployAddress = contract.getDeployAddress(); } else { - log.warn("getContractManager get contract's deploy user address fail"); + log.warn("getContractManager get contract's deploy user address fail, contractAddress not exist"); return resultUserList; } } + log.debug("getContractManager deployAddress:{},groupId:{},contractAddress:{}", + deployAddress, groupId, contractAddress); // check if address has private key TbUser deployUser = userService.checkUserHasPk(groupId, deployAddress); if (deployUser != null) { @@ -811,8 +814,9 @@ public List getContractManager(int groupId, String contractAddress) { } // get from permission list or chain governance List deployUserList = new ArrayList<>(); + // check committee BasePageResponse response = permissionManageService.listPermissionFull(groupId, - PERMISSION_TYPE_DEPLOY_AND_CREATE, null); + PERMISSION_TYPE_PERMISSION, null); if (response.getCode() != 0) { log.error("checkDeployPermission get permission list error"); } else { @@ -831,7 +835,7 @@ public List getContractManager(int groupId, String contractAddress) { // check resultUserList if empty if (resultUserList.isEmpty()) { log.warn("getContractManager has no private key of contractAddress:{}", contractAddress); - throw new NodeMgrException(ConstantCode.NO_PRIVATE_KEY_OF_CONTRACT_MANAGER.attach(contractAddress)); + throw new NodeMgrException(ConstantCode.NO_PRIVATE_KEY_OF_CONTRACT_MANAGER.attach(contractAddress)); } return resultUserList; } diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java index 94868b213..f701ca6ad 100644 --- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java +++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java @@ -95,7 +95,7 @@ public BaseResponse addUserInfo(@RequestBody @Valid NewUserInputParam user, } /** - * bind user info. + * bind user info. (add public key user, different from bind private key) */ @PostMapping(value = "/bind") @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN_OR_DEVELOPER)