Merge pull request #873 from WeBankBlockchain/lab-dev

3.1.1 update version
WeBankBlockchain · Jan 19, 2024 · 76a1f00 · 76a1f00
2 parents 26b9003 + a89e97d
commit 76a1f00
Show file tree

Hide file tree

Showing 10 changed files with 276 additions and 241 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,19 @@
+### v3.1.1(2024-01-19)
+
+**Add**
+- 系统配置中增加`auth_check_status`配置，用于启用权限控制功能
+
+**Fix**
+- 修复预编译合约中报错权限不足的bug，如修改共识类型
+
+**兼容性**
+- 支持FISCO-BCOS v3.0.0 及以上版本
+- WeBASE-Web v3.1.1及以上版本
+- WeBASE-Node-Manager v3.1.0
+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/lab/)。
+
+
 ### v3.1.0(2023-07-20)
 
 **Add**
@@ -10,7 +26,7 @@
 
 **兼容性**
 - 支持FISCO-BCOS v3.0.0 及以上版本
-- WeBASE-Node-Manager v3.0.2及以上版本
+- WeBASE-Node-Manager v3.1.0及以上版本
 - WeBASE-Sign v3.0.2
 
 详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/lab/)。

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v3.1.0
+v3.1.1
diff --git a/src/main/java/com/webank/webase/front/base/config/Web3Config.java b/src/main/java/com/webank/webase/front/base/config/Web3Config.java
@@ -42,6 +42,7 @@ public class Web3Config {
     private String threadPoolSize;
     private String certPath;
     private String useSmSsl;
+    private String disableSsl;
     private List<String> peers;
 
 
@@ -50,6 +51,7 @@ public ConfigOption getConfigOptionFromFile() throws ConfigException {
         log.info("start init ConfigProperty");
         // cert config, encrypt type
         Map<String, Object> cryptoMaterial = new HashMap<>();
+        cryptoMaterial.put("disableSsl", disableSsl);
         cryptoMaterial.put("certPath", certPath);
         cryptoMaterial.put("useSMCrypto", useSmSsl);
         log.info("init cert cryptoMaterial:{}, (using conf as cert path)", JsonUtils.objToString(cryptoMaterial));

diff --git a/src/main/java/com/webank/webase/front/configapi/ConfigController.java b/src/main/java/com/webank/webase/front/configapi/ConfigController.java
@@ -16,28 +16,18 @@
 
 package com.webank.webase.front.configapi;
 
-import com.webank.webase.front.base.code.ConstantCode;
 import com.webank.webase.front.base.config.Web3Config;
 import com.webank.webase.front.base.properties.VersionProperties;
-import com.webank.webase.front.base.response.BaseResponse;
-import com.webank.webase.front.configapi.entity.ConfigInfo;
-import com.webank.webase.front.configapi.entity.ReqSdkConfig;
 import com.webank.webase.front.version.VersionService;
 import com.webank.webase.front.web3api.Web3ApiService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Map;
-import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * get or update config local
@@ -57,7 +47,8 @@ public class ConfigController {
     private VersionService versionService;
     @Autowired
     private ConfigService configService;
-
+    @Autowired
+    private RestTemplate restTemplate;
 
     @GetMapping("encrypt/{groupId}")
     public Integer getEncryptType(@PathVariable("groupId") String groupId) {
@@ -116,4 +107,6 @@ public String getSignVersion() {
         return versionService.getSignServerVersion();
     }
 
+
+
 }