Merge pull request #645 from ArtisanCloud/develop

Develop

Author: Matrix-X

src/officialAccount/user/tag/client.go

@@ -123,7 +123,7 @@ func (comp *Client) TagUsers(ctx context.Context, openIDs []string, tagID int) (
 
 // 批量为用户取消标签
 // https://developers.weixin.qq.com/doc/offiaccount/User_Management/User_Tag_Management.html
-func (comp *Client) UntagUsers(ctx context.Context, openIDs []string, tagID string) (*response.ResponseUntagUsers, error) {
+func (comp *Client) UntagUsers(ctx context.Context, openIDs []string, tagID int) (*response.ResponseUntagUsers, error) {
 	result := &response.ResponseUntagUsers{}
 
 	params := &object.HashMap{

src/payment/notify/costom/handler.go

@@ -0,0 +1,171 @@
+package costom
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify"
+	"io"
+	"net/http"
+
+	"github.com/ArtisanCloud/PowerLibs/v3/object"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/support"
+	base2 "github.com/ArtisanCloud/PowerWeChat/v3/src/payment/base"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
+)
+
+type CustomHandler struct {
+	App        kernel.ApplicationPaymentInterface
+	Message    *request.RequestNotify
+	fail       string
+	Attributes *object.StringMap
+	Check      bool
+	Sign       bool
+
+	ExternalBody io.Reader
+
+	// Handle func(closure func(message *request.RequestNotify, transaction *models.Transaction, fail func(groupWelcomeTemplate string)) interface{}) *http.Response
+}
+
+func NewCustomHandler(app kernel.ApplicationPaymentInterface, body io.Reader) *CustomHandler {
+
+	// -------------- external request --------------
+	var req io.Reader = &bytes.Buffer{}
+	if body != nil {
+		req = body
+	}
+
+	return &CustomHandler{
+		App:          app,
+		Check:        true,
+		Sign:         false,
+		ExternalBody: req,
+	}
+}
+
+func (handler *CustomHandler) Fail(message string) {
+	handler.fail = message
+}
+
+func (handler *CustomHandler) RespondWith(attributes *object.StringMap, sign bool) *CustomHandler {
+
+	handler.Attributes = attributes
+	handler.Sign = sign
+
+	return handler
+}
+func (handler *CustomHandler) ToResponse() (response *http.Response, err error) {
+
+	returnCode := notify.SUCCESS
+	returnMsg := "成功"
+	if handler.fail != "" {
+		returnCode = notify.FAIL
+		returnMsg = handler.fail
+		err = errors.New(handler.fail)
+	}
+	base := &object.StringMap{
+		"code":           returnCode,
+		"uniformMessage": returnMsg,
+	}
+
+	attributes := object.MergeStringMap(base, handler.Attributes)
+	baseClient := (handler.App).GetComponent("Base").(*base2.Client)
+	if handler.Sign {
+		(*attributes)["sign"], err = baseClient.BaseClient.Signer.GenerateSign("")
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	bodyBuffer, _ := json.Marshal(attributes)
+	rs := &http.Response{
+		StatusCode: http.StatusOK,
+	}
+	rs.Body = io.NopCloser(bytes.NewBuffer(bodyBuffer))
+
+	return rs, err
+}
+
+func (handler *CustomHandler) GetMessage() (notify *request.RequestNotify, err error) {
+
+	if handler.Message != nil {
+		return handler.Message, nil
+	}
+
+	body := handler.ExternalBody
+
+	requestBody, err := io.ReadAll(body)
+	if err != nil {
+		return nil, err
+	}
+	handler.Message = &request.RequestNotify{}
+	err = object.JsonDecode(requestBody, handler.Message)
+	if err != nil {
+		return nil, err
+	}
+
+	// note: 自定义的不保存 http request
+	// handler.Message.RawRequest = body
+
+	return handler.Message, nil
+}
+
+func (handler *CustomHandler) DecryptMessage() (string, error) {
+	message, err := handler.GetMessage()
+	if err != nil {
+		return "", err
+	}
+	if message.Resource == nil {
+		return "", errors.New("uniformMessage doesn't have the key value")
+	}
+
+	config := (handler.App).GetConfig()
+	wxKey := config.GetString("mch_api_v3_key", "")
+	nonce := message.Resource.Nonce
+	associatedData := message.Resource.AssociatedData
+	cipherText := message.Resource.Ciphertext
+	return support.DecryptAES256GCM(
+		wxKey,
+		associatedData,
+		nonce,
+		cipherText,
+	)
+
+}
+
+func (handler *CustomHandler) Strict(result interface{}) {
+
+	bResult := true
+	strResult := ""
+	switch result.(type) {
+	case bool:
+		bResult = result.(bool)
+		strResult = fmt.Sprintf("%t", result)
+	case string:
+		strResult = result.(string)
+		if strResult != "" {
+			bResult = false
+		}
+	default:
+		return
+	}
+
+	if bResult != true && handler.fail == "" {
+		handler.Fail(strResult)
+	}
+}
+
+func (handler *CustomHandler) reqInfo() (content string, err error) {
+
+	content, err = handler.DecryptMessage()
+	if err != nil {
+		return "", err
+	}
+
+	// save the decoded content to message resource
+	handler.Message.Resource.Plaintext = content
+
+	return content, nil
+}

src/payment/notify/costom/notify.go

@@ -0,0 +1,45 @@
+package costom
+
+import (
+	"io"
+	"net/http"
+
+	"github.com/ArtisanCloud/PowerLibs/v3/object"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
+)
+
+// CustomNotify 框架内没有实现的，可以使用这个自己实现
+type CustomNotify[T any] struct {
+	*CustomHandler
+}
+
+func NewCustomNotify[T any](app kernel.ApplicationPaymentInterface, body io.Reader) *CustomNotify[T] {
+	return &CustomNotify[T]{
+		NewCustomHandler(app, body),
+	}
+}
+
+func (comp *CustomNotify[T]) Handle(closure func(message *request.RequestNotify, transaction *T, fail func(message string)) interface{}) (*http.Response, error) {
+	message, err := comp.GetMessage()
+	if err != nil {
+		return nil, err
+	}
+
+	reqInfo, err := comp.reqInfo()
+	if err != nil {
+		return nil, err
+	}
+
+	// struct the content
+	var transaction = new(T)
+	err = object.JsonDecode([]byte(reqInfo), transaction)
+	if err != nil {
+		return nil, err
+	}
+
+	result := closure(message, transaction, comp.Fail)
+	comp.Strict(result)
+
+	return comp.ToResponse()
+}

src/payment/notify/handler.go

@@ -5,13 +5,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/support"
 	base2 "github.com/ArtisanCloud/PowerWeChat/v3/src/payment/base"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
-	"io"
-	"net/http"
 )
 
 type Handler struct {
@@ -24,25 +25,25 @@ type Handler struct {
 
 	ExternalRequest *http.Request
 
-	//Handle func(closure func(message *request.RequestNotify, transaction *models.Transaction, fail func(groupWelcomeTemplate string)) interface{}) *http.Response
+	// Handle func(closure func(message *request.RequestNotify, transaction *models.Transaction, fail func(groupWelcomeTemplate string)) interface{}) *http.Response
 }
 
 const SUCCESS = "SUCCESS"
 const FAIL = "FAIL"
 
 func NewHandler(app kernel.ApplicationPaymentInterface, r *http.Request) *Handler {
 
-	//-------------- external request --------------
-	request := &http.Request{}
+	// -------------- external request --------------
+	req := &http.Request{}
 	if r != nil {
-		request = r
+		req = r
 	}
 
 	return &Handler{
 		App:             app,
 		Check:           true,
 		Sign:            false,
-		ExternalRequest: request,
+		ExternalRequest: req,
 	}
 }
 

src/payment/notify/paid.go

@@ -1,11 +1,12 @@
 package notify
 
 import (
+	"net/http"
+
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/models"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
-	"net/http"
 )
 
 type Paid struct {

src/payment/notify/refund.go

@@ -1,11 +1,12 @@
 package notify
 
 import (
+	"net/http"
+
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/models"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
-	"net/http"
 )
 
 type Refund struct {

src/payment/notify/scanned.go

@@ -1,11 +1,12 @@
 package notify
 
 import (
+	"net/http"
+	"reflect"
+
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
-	"net/http"
-	"reflect"
 )
 
 type Scanned struct {