Merge branch 'ht_3.3_payment' into debug

domian/order/trade_order.go

@@ -73,8 +73,8 @@ func GenerateTradeOrderNo() string {
 }
 func generateMessage(data interface{}, tmpl string) (message string, err error) {
 	urlParams := data.(PayOrderDTO)
-	urlParams.ProductTitle = base64.StdEncoding.EncodeToString([]byte(urlParams.ProductTitle))
-	urlParams.ProductDescription = base64.StdEncoding.EncodeToString([]byte(urlParams.ProductDescription))
+	urlParams.ProductTitle = base64.URLEncoding.EncodeToString([]byte(urlParams.ProductTitle))
+	urlParams.ProductDescription = base64.URLEncoding.EncodeToString([]byte(urlParams.ProductDescription))
 	t := template.Must(template.New("messageTemplate").Parse(tmpl))
 	var buffer bytes.Buffer
 	err = t.Execute(&buffer, urlParams)