Browse Source

Merge branch 'ht_mini_response_decode' into debug

kobe6258 4 ngày trước cách đây
mục cha
commit
83d72e3b54

+ 2 - 0
facade/instance/ht_mini_facade.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_chart_lib/models"
 	"eta/eta_chart_lib/models"
 	"eta/eta_chart_lib/utils"
 	"eta/eta_chart_lib/utils"
 	"fmt"
 	"fmt"
+	"strings"
 )
 )
 
 
 const (
 const (
@@ -58,6 +59,7 @@ func dealChartInfo(baseReq facade.BaseRequest) (request HTRequest, err error) {
 func parseResult(resp string) (response HTResponse, err error) {
 func parseResult(resp string) (response HTResponse, err error) {
 	var respBytes []byte
 	var respBytes []byte
 	if utils.RunMode != "debug" {
 	if utils.RunMode != "debug" {
+		resp = strings.Trim(resp, `"`)
 		respBytes = utils.DesBase64Decrypt([]byte(resp), utils.ETA_MINI_DES_KEY)
 		respBytes = utils.DesBase64Decrypt([]byte(resp), utils.ETA_MINI_DES_KEY)
 	} else {
 	} else {
 		respBytes = []byte(resp)
 		respBytes = []byte(resp)

+ 1 - 1
utils/des3.go

@@ -21,7 +21,7 @@ func DesBase64Encrypt(origData []byte, desKey string) []byte {
 }
 }
 
 
 func DesBase64Decrypt(crypted []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
 	remain := len(result) % 8
 	if remain > 0 {
 	if remain > 0 {
 		mod := 8 - remain
 		mod := 8 - remain