Merge branch 'v2.3.1_qc' of git.code.tencent.com:ChainMaker/management-backend into v2.3.1_qc

3fddf4c5 · taifu yuan · cc74dc8c · 940bace6 · 3fddf4c5 · 3fddf4c5
Commit 3fddf4c5 authored 1 year ago by taifu yuan
4 changed files
--- a/dependence/bin/chainmaker
+++ b/dependence/bin/chainmaker
--- a/dependence/lib/libwasmer.so
+++ b/dependence/lib/libwasmer.so
--- a/src/ctrl/chain_management/download_chain_config.go
+++ b/src/ctrl/chain_management/download_chain_config.go
@@ -11,6 +11,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"management_backend/src/global"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -113,7 +114,7 @@ func (downloadChainConfigHandler *DownloadChainConfigHandler) Handle(user *entit
 		}
 	}

-	common.ConvergeDataResponse(ctx, utils.Base64Encode([]byte(chainName)), nil)
+	common.ConvergeDataResponse(ctx, url.QueryEscape(chainName), nil)

 }

@@ -680,7 +681,11 @@ func createBinAndLib(orgId, nodeName, confYml string, dockerVm int) error {
 			log.Error("create and copy stop.sh file err :", err.Error())
 			return err
 		}
-		err = utils.RePlace("release/"+orgId+"-"+nodeName+"/bin/docker_start", "{org_id}", orgId)
+		dockerReplace := map[string]string{
+			"{org_id}":    orgId,
+			"{node_addr}": orgId,
+		}
+		err = utils.RePlaceMore("release/"+orgId+"-"+nodeName+"/bin/docker_start", dockerReplace)
 		if err != nil {
 			log.Error("rePlace bin/stop.sh err : " + err.Error())
 		}

--- a/src/ctrl/dispatcher.go
+++ b/src/ctrl/dispatcher.go
@@ -8,6 +8,7 @@ package ctrl
 import (
 	"fmt"
 	"management_backend/src/session"
+	"net/url"
 	"os"

 	"github.com/emirpasic/gods/maps/hashmap"
@@ -198,7 +199,10 @@ func Dispatcher(ctx *gin.Context) {

 // Download download
 func Download(ctx *gin.Context) {
-	name := string(utils.Base64Decode(ctx.Query("name")))
+	name, err := url.QueryUnescape(ctx.Query("name"))
+	if err != nil {
+		log.Error("decode zip err :", err.Error())
+	}
 	path := fmt.Sprintf("./chain_config/%v.zip", name)
 	defer func() {
 		err := os.RemoveAll(path)