update

Author: Matrix-X

src/basicService/jssdk/client.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ArtisanCloud/go-libs/object"
-	"github.com/ArtisanCloud/go-libs/str"
 	kernel2 "github.com/ArtisanCloud/power-wechat/src/kernel"
 	"github.com/ArtisanCloud/power-wechat/src/payment/kernel"
 	"net/http"
@@ -96,7 +95,7 @@ func (comp *Client) ConfigSignature(url string, nonce string, timestamp time.Tim
 		url = comp.GetUrl()
 	}
 	if nonce != "" {
-		nonce = str.QuickRandom(10)
+		nonce = object.QuickRandom(10)
 	}
 	if timestamp.IsZero() {
 		timestamp = time.Now()

src/kernel/support/helper.go

@@ -3,7 +3,7 @@ package support
 import (
 	"context"
 	"fmt"
-	"github.com/ArtisanCloud/go-libs/str"
+	"github.com/ArtisanCloud/go-libs/object"
 	"time"
 )
 
@@ -18,7 +18,7 @@ type GenerateSigner struct {
 func GenerateSign(signer *SHA256WithRSASigner, gs GenerateSigner) (authorization string, err error) {
 
 	timestamp := time.Now().Unix()
-	nonce := str.QuickRandom(32)
+	nonce := object.QuickRandom(32)
 
 	// Under ci mode, go fixed value
 	// 在ci模式下面，走固定值

src/kernel/support/signer.go

@@ -9,7 +9,7 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"fmt"
-	"github.com/ArtisanCloud/go-libs/str"
+	"github.com/ArtisanCloud/go-libs/object"
 	"io/ioutil"
 	"strings"
 	"time"
@@ -48,7 +48,7 @@ type RequestSignChain struct {
 
 func (s *SHA256WithRSASigner) GenerateRequestSign(signChain *RequestSignChain) (authorization string, err error) {
 	timestamp := time.Now().Unix()
-	nonce := str.QuickRandom(32)
+	nonce := object.QuickRandom(32)
 
 	// Under ci mode, go fixed value
 	// 在ci模式下面，走固定值

src/payment/application.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ArtisanCloud/go-libs/object"
-	"github.com/ArtisanCloud/go-libs/str"
 	"github.com/ArtisanCloud/power-wechat/src/kernel"
 	"github.com/ArtisanCloud/power-wechat/src/kernel/providers"
 	"github.com/ArtisanCloud/power-wechat/src/payment/base"
@@ -116,7 +115,7 @@ func (app *Payment) Scheme(productID string) string {
 		"appid":      appID,
 		"mch_id":     mchID,
 		"time_stamp": fmt.Sprintf("%d", time.Now().Nanosecond()),
-		"nonce_str":  str.UniqueID(""),
+		"nonce_str":  object.UniqueID(""),
 		"product_id": productID,
 	}
 

src/payment/jssdk/client.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/ArtisanCloud/go-libs/object"
-	"github.com/ArtisanCloud/go-libs/str"
 	"github.com/ArtisanCloud/power-wechat/src/basicService/jssdk"
 	"github.com/ArtisanCloud/power-wechat/src/payment/kernel"
 	"net/url"
@@ -32,7 +31,7 @@ func (comp *Client) BridgeConfig(prepayId string, isJson bool) (interface{}, err
 	options := &object.StringMap{
 		"appId":     appID,
 		"timeStamp": fmt.Sprintf("%d", time.Now().Unix()),
-		"nonceStr":  str.QuickRandom(32),
+		"nonceStr":  object.QuickRandom(32),
 		"package":   fmt.Sprintf("prepay_id=%s", prepayId),
 		"signType":  "RSA",
 	}
@@ -77,7 +76,7 @@ func (comp *Client) AppConfig(prepayId string) (*object.StringMap, error) {
 		"appid":     appID,
 		"partnerid": mchID,
 		"prepayid":  prepayId,
-		"noncestr":  str.UniqueID(""),
+		"noncestr":  object.UniqueID(""),
 		"timestamp": fmt.Sprintf("%d", time.Now().Unix()),
 		"package":   "Sign=WXPay",
 	}
@@ -96,7 +95,7 @@ func (comp *Client) ShareAddressConfig(accessToken string, isJson bool) (interfa
 		"appId":     appID,
 		"scope":     "jsapi_address",
 		"timeStamp": fmt.Sprintf("%d", time.Now().Unix()),
-		"nonceStr":  str.UniqueID(""),
+		"nonceStr":  object.UniqueID(""),
 		"signType":  "SHA1",
 	}
 

src/payment/kernel/baseClient.go

@@ -4,7 +4,6 @@ import (
 	"github.com/ArtisanCloud/go-libs/http/request"
 	"github.com/ArtisanCloud/go-libs/http/response"
 	"github.com/ArtisanCloud/go-libs/object"
-	str2 "github.com/ArtisanCloud/go-libs/str"
 	"github.com/ArtisanCloud/power-wechat/src/kernel/support"
 
 	http2 "net/http"
@@ -69,7 +68,7 @@ func (client *BaseClient) Request(endpoint string, params *object.StringMap, met
 
 	// check need sign body or not
 	signBody := ""
-	if "get" != str2.Lower(method){
+	if "get" != object.Lower(method){
 		signBody, err = object.JsonEncode(options)
 		if err != nil {
 			return nil, err

src/payment/notify/scanned.go

@@ -2,7 +2,6 @@ package notify
 
 import (
 	"github.com/ArtisanCloud/go-libs/object"
-	"github.com/ArtisanCloud/go-libs/str"
 	"github.com/ArtisanCloud/power-wechat/src/payment/kernel"
 	"net/http"
 	"reflect"
@@ -48,7 +47,7 @@ func (comp *Scanned) Handle(closure func(message *object.HashMap, content *objec
 		config := (*comp.App).GetConfig()
 		(*attributes)["appid"] = config.GetString("app_id", "")
 		(*attributes)["mch_id"] = config.GetString("mch_id", "")
-		(*attributes)["nonce_str"] = str.UniqueID("")
+		(*attributes)["nonce_str"] = object.UniqueID("")
 		(*attributes)["prepay_id"] = result.(string)
 	}