浏览代码

Merge branch 'ht_mini_response_decode' of eta_server/eta_chart_lib into master

chenhan 3 天之前
父节点
当前提交
862fdcb8ff
共有 2 个文件被更改,包括 10 次插入2 次删除
  1. 9 1
      facade/instance/ht_mini_facade.go
  2. 1 1
      utils/des3.go

+ 9 - 1
facade/instance/ht_mini_facade.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_chart_lib/models"
 	"eta/eta_chart_lib/utils"
 	"fmt"
+	"strings"
 )
 
 const (
@@ -56,7 +57,14 @@ func dealChartInfo(baseReq facade.BaseRequest) (request HTRequest, err error) {
 	return
 }
 func parseResult(resp string) (response HTResponse, err error) {
-	err = json.Unmarshal([]byte(resp), &response)
+	var respBytes []byte
+	if utils.RunMode != "debug" {
+		resp = strings.Trim(resp, `"`)
+		respBytes = utils.DesBase64Decrypt([]byte(resp), utils.ETA_MINI_DES_KEY)
+	} else {
+		respBytes = []byte(resp)
+	}
+	err = json.Unmarshal(respBytes, &response)
 	if err != nil {
 		utils.FileLog.Error("收藏失败,解析应答失败:%v,应答结果:%s", err.Error(), resp)
 	}

+ 1 - 1
utils/des3.go

@@ -21,7 +21,7 @@ func DesBase64Encrypt(origData []byte, desKey string) []byte {
 }
 
 func DesBase64Decrypt(crypted []byte, desKey string) []byte {
-	result, _ := base64.StdEncoding.DecodeString(string(crypted))
+	result, err := base64.StdEncoding.DecodeString(string(crypted))
 	remain := len(result) % 8
 	if remain > 0 {
 		mod := 8 - remain