Merge pull request #322 from ArtisanCloud/develop

Develop

src/kernel/baseClient.go

@@ -10,6 +10,7 @@ import (
 	contract2 "github.com/ArtisanCloud/PowerLibs/v3/logger/contract"
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerLibs/v3/os"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/power"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/support"
 	"io"
 	"io/ioutil"
@@ -125,6 +126,20 @@ func (client *BaseClient) HttpPostJson(ctx context.Context, url string, data int
 		outBody,
 	)
 }
+func (client *BaseClient) HttpPostJsonByEncode(ctx context.Context, url string, data interface{}, query *object.StringMap, outHeader interface{}, outBody interface{}) (interface{}, error) {
+	return client.RequestByEncodedData(
+		ctx,
+		url,
+		http.MethodPost,
+		&object.HashMap{
+			"query":       query,
+			"form_params": data,
+		},
+		false,
+		outHeader,
+		outBody,
+	)
+}
 
 func (client *BaseClient) HttpUpload(ctx context.Context, url string, files *object.HashMap, form *UploadForm, query interface{}, outHeader interface{}, outBody interface{}) (interface{}, error) {
 
@@ -265,6 +280,81 @@ func (client *BaseClient) Request(ctx context.Context, url string, method string
 
 }
 
+func (client *BaseClient) RequestByEncodedData(ctx context.Context, url string, method string, options *object.HashMap,
+	returnRaw bool, outHeader interface{}, outBody interface{},
+) (*http.Response, error) {
+
+	// http client request
+	client.QueryRaw = returnRaw
+	df := client.HttpHelper.Df().WithContext(ctx).Uri(url).Method(method)
+
+	// 检查是否需要有请求参数配置
+	if options != nil {
+		// set query key values
+		if (*options)["query"] != nil {
+			queries := (*options)["query"].(*object.StringMap)
+			if queries != nil {
+				for k, v := range *queries {
+					df.Query(k, v)
+				}
+			}
+		}
+
+		config := (*client.App).GetConfig()
+		// 微信如果需要传debug模式
+		debug := config.GetBool("debug", false)
+		if debug {
+			df.Query("debug", "1")
+		}
+
+		// set body json
+		if (*options)["form_params"] != nil {
+			body := &power.JsonEncoder{
+				Data: (*options)["form_params"],
+			}
+			df.Any(body)
+		}
+	}
+
+	ctxQuery := ctx.Value("query")
+	if ctxQuery != nil {
+		queries := ctxQuery.(*object.StringMap)
+		if queries != nil {
+			for k, v := range *queries {
+				df.Query(k, v)
+			}
+		}
+	}
+
+	response, err := df.Request()
+	if err != nil {
+		return response, err
+	}
+
+	// decode response body to outBody
+	if outBody != nil {
+		err = client.HttpHelper.ParseResponseBodyContent(response, outBody)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// decode response header to outHeader
+	if outHeader != nil {
+		strHeader, err := object.JsonEncode(response.Header)
+		if err != nil {
+			return nil, err
+		}
+		err = object.JsonDecode([]byte(strHeader), outHeader)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return response, err
+
+}
+
 func (client *BaseClient) RequestRaw(ctx context.Context, url string, method string, options *object.HashMap, outHeader interface{}, outBody interface{}) (*http.Response, error) {
 	return client.Request(ctx, url, method, options, true, outHeader, outBody)
 }

src/kernel/power/encoder.go

@@ -0,0 +1,25 @@
+package power
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+)
+
+type JsonEncoder struct {
+	json.Encoder
+	Data interface{}
+}
+
+func (e *JsonEncoder) Encode() (io.Reader, error) {
+	var buf bytes.Buffer
+	encoder := json.NewEncoder(&buf)
+	encoder.SetEscapeHTML(false)
+
+	if err := encoder.Encode(e.Data); err != nil {
+		return nil, err
+	}
+
+	reader := bytes.NewReader(buf.Bytes())
+	return reader, nil
+}

src/miniProgram/application.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/express"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/image"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/immediateDelivery"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/industry/miniDrama/vod"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/internet"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/liveBroadcast"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram/nearbyPoi"
@@ -88,6 +89,8 @@ type MiniProgram struct {
 
 	RiskControl *riskControl.Client
 
+	MiniDramaVOD *vod.Client
+
 	Config *kernel.Config
 
 	Logger *logger.Logger
@@ -339,6 +342,12 @@ func NewMiniProgram(config *UserConfig, extraInfos ...*kernel.ExtraInfo) (*MiniP
 		return nil, err
 	}
 
+	//-------------- miniDrama Vod --------------
+	app.MiniDramaVOD, err = vod.RegisterProvider(app)
+	if err != nil {
+		return nil, err
+	}
+
 	return app, err
 }
 
@@ -433,6 +442,9 @@ func (app *MiniProgram) GetComponent(name string) interface{} {
 	case "RiskControl":
 		return app.RiskControl
 
+	case "MiniDramaVDO":
+		return app.MiniDramaVOD
+
 	case "Logger":
 		return app.Logger
 

src/miniProgram/industry/miniDrama/request/request.go

@@ -0,0 +1 @@
+package request

src/miniProgram/industry/miniDrama/response/response.go

@@ -0,0 +1 @@
+package response

src/miniProgram/industry/miniDrama/vod/client.go

@@ -0,0 +1,7 @@
+package vod
+
+import "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
+
+type Client struct {
+	BaseClient *kernel.BaseClient
+}

src/miniProgram/industry/miniDrama/vod/provider.go

@@ -0,0 +1,14 @@
+package vod
+
+import "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
+
+func RegisterProvider(app kernel.ApplicationInterface) (*Client, error) {
+	baseClient, err := kernel.NewBaseClient(&app, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &Client{
+		baseClient,
+	}, nil
+
+}

src/officialAccount/menu/client.go

@@ -50,7 +50,7 @@ func (comp *Client) Create(ctx context.Context, buttons []*request.Button) (*res
 
 	result := &response.ResponseMenuCreate{}
 
-	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/menu/create", &object.HashMap{
+	_, err := comp.BaseClient.HttpPostJsonByEncode(ctx, "cgi-bin/menu/create", &object.HashMap{
 		"button": buttons,
 	}, nil, nil, result)
 

src/openPlatform/component/client.go

@@ -28,7 +28,11 @@ func (comp *Client) RegisterMiniProgram(ctx context.Context, params *request.Req
 
 	result := &response2.ResponseOpenPlatform{}
 
-	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/component/fastregisterweapp", params, nil, nil, result)
+	query := &object.StringMap{
+		"action": "create",
+	}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/component/fastregisterweapp", params, query, nil, result)
 
 	return result, err
 

src/openWork/auth/accessToken.go

@@ -6,6 +6,7 @@ import (
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerLibs/v3/security"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
+	"net/http"
 )
 
 type AccessToken struct {