Verified Commit 614bd255 authored by Cui's avatar Cui

fix issue with json.Marshal no html encode

parent d27d247c
...@@ -57,7 +57,7 @@ func CustomerMessageSender(accessToken string, cmi CustomerMessageInterface) (in ...@@ -57,7 +57,7 @@ func CustomerMessageSender(accessToken string, cmi CustomerMessageInterface) (in
uri := sendUri + "?access_token=" + accessToken uri := sendUri + "?access_token=" + accessToken
data, _ := json.Marshal(cmi) data, _ := JSONMarshal(cmi)
body, _, err := FasthttpPost(uri, data) body, _, err := FasthttpPost(uri, data)
...@@ -90,7 +90,7 @@ func TemplateMessageSender(accessToken string, tm TemplateMessage) (int, string) ...@@ -90,7 +90,7 @@ func TemplateMessageSender(accessToken string, tm TemplateMessage) (int, string)
uri := TEMPLATEURI + "?access_token=" + accessToken uri := TEMPLATEURI + "?access_token=" + accessToken
data, _ := json.Marshal(tm) data, _ := JSONMarshal(tm)
body, _, err := FasthttpPost(uri, data) body, _, err := FasthttpPost(uri, data)
...@@ -122,7 +122,7 @@ func SubscribeMessageSender(accessToken string, sm SubscribeMessage) (int, strin ...@@ -122,7 +122,7 @@ func SubscribeMessageSender(accessToken string, sm SubscribeMessage) (int, strin
}) })
uri := SUBSCRIBEURI + "?access_token=" + accessToken uri := SUBSCRIBEURI + "?access_token=" + accessToken
data, _ := json.Marshal(sm) data, _ := JSONMarshal(sm)
body, _, err := FasthttpPost(uri, data) body, _, err := FasthttpPost(uri, data)
......
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
package utils package utils
import ( import (
"bytes"
"crypto/sha256" "crypto/sha256"
"database/sql" "database/sql"
"encoding/hex" "encoding/hex"
"encoding/json"
"errors" "errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"io" "io"
...@@ -53,6 +55,14 @@ func SmsDoSign(appKey string, tels []string, time int64, rand int) string { ...@@ -53,6 +55,14 @@ func SmsDoSign(appKey string, tels []string, time int64, rand int) string {
return hex.EncodeToString(h.Sum(nil)) return hex.EncodeToString(h.Sum(nil))
} }
func JSONMarshal(t interface{}) ([]byte, error) {
buffer := &bytes.Buffer{}
encoder := json.NewEncoder(buffer)
encoder.SetEscapeHTML(false)
err := encoder.Encode(t)
return buffer.Bytes(), err
}
// Deep Copy // Deep Copy
func Copy(toValue interface{}, fromValue interface{}) (err error) { func Copy(toValue interface{}, fromValue interface{}) (err error) {
var ( var (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment