Merge pull request #607 from ArtisanCloud/develop

Develop

Author: Matrix-X

main.go

@@ -7,12 +7,14 @@ import (
 	"strconv"
 
 	fmt2 "github.com/ArtisanCloud/PowerLibs/v3/fmt"
+
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/power"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/miniProgram"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount/templateMessage/request"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/openPlatform"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/openWork"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/work"
 	"go.opentelemetry.io/otel"
@@ -29,6 +31,8 @@ func GetOfficialConfig() *officialAccount.UserConfig {
 		Log: officialAccount.Log{
 			Level:  "debug",
 			Stdout: false,
+			File:   "/Users/michaelhu/wechat/official-account/info.log",
+			Error:  "/Users/michaelhu/wechat/official-account/error.log",
 		},
 		Http: officialAccount.Http{
 			ProxyURI: "",
@@ -40,7 +44,7 @@ func GetOfficialConfig() *officialAccount.UserConfig {
 			Password: "",
 			DB:       1,
 		}),
-		HttpDebug: false,
+		HttpDebug: true,
 		Debug:     false,
 	}
 }
@@ -55,8 +59,10 @@ func GetWorkConfig() *work.UserConfig {
 		ResponseType: os.Getenv("array"),
 		Log: work.Log{
 			Level: "debug",
-			File:  "./wechat/info.log",
-			Error: "./wechat/error.log",
+			//File:  "./wechat/info.log",
+			//Error: "./wechat/error.log",
+			File:  "/Users/michaelhu/wechat/work/info.log",
+			Error: "/Users/michaelhu/wechat/work/error.log",
 			ENV:   os.Getenv("work.env"),
 		},
 
@@ -101,8 +107,10 @@ func GetPaymentConfig() *payment.UserConfig {
 		ResponseType: os.Getenv("array"),
 		Log: payment.Log{
 			Level: "debug",
-			File:  "./wechat/info.log",
-			Error: "./wechat/error.log",
+			//File:  "./wechat/info.log",
+			//Error: "./wechat/error.log",
+			File:  "/Users/michaelhu/wechat/payment/info.log",
+			Error: "/Users/michaelhu/wechat/payment/error.log",
 		},
 		Http: payment.Http{
 			Timeout:  30.0,
@@ -135,8 +143,8 @@ func GetMiniProgramConfig() *miniProgram.UserConfig {
 		ResponseType: os.Getenv("array"),
 		Log: miniProgram.Log{
 			Level: "debug",
-			File:  "./wechat/info.log",
-			Error: "./wechat/error.log",
+			File:  "/Users/michaelhu/wechat/mini-program/info.log",
+			Error: "/Users/michaelhu/wechat/mini-program/error.log",
 		},
 		Cache: kernel.NewRedisClient(&kernel.UniversalOptions{
 			Addrs:    []string{"127.0.0.1:6379"},
@@ -162,8 +170,10 @@ func GetOpenPlatformConfig() *openPlatform.UserConfig {
 		ResponseType: os.Getenv("array"),
 		Log: openPlatform.Log{
 			Level: "debug",
-			File:  "./wechat/info.log",
-			Error: "./wechat/error.log",
+			//File:  "./wechat/info.log",
+			//Error: "./wechat/error.log",
+			File:  "/Users/michaelhu/wechat/platform/info.log",
+			Error: "/Users/michaelhu/wechat/platform/error.log",
 		},
 		Cache: kernel.NewRedisClient(&kernel.UniversalOptions{
 			Addrs:    []string{"127.0.0.1:6379"},
@@ -181,6 +191,28 @@ func GetOpenPlatformConfig() *openPlatform.UserConfig {
 	}
 }
 
+func GetOpenWorkConfig() *openWork.UserConfig {
+	return &openWork.UserConfig{
+		AppID:        "123",
+		Secret:       "321",
+		AuthCode:     "123",
+		AESKey:       "321",
+		ResponseType: os.Getenv("array"),
+
+		Cache: kernel.NewRedisClient(&kernel.UniversalOptions{
+			Addrs:    []string{"127.0.0.1:6379"},
+			Password: "",
+			DB:       1,
+		}),
+
+		// OAuth:        "",
+		// HttpDebug:    "",
+		// Debug:        "",
+		// NotifyURL:    "",
+		// Sandbox:      "",
+	}
+}
+
 func initTracer() {
 	tp := trace.NewTracerProvider()
 	// Set Global Tracer Provider
@@ -252,11 +284,20 @@ func main() {
 	}
 	fmt2.Dump("miniprogram config:", miniProgramApp.GetConfig().All())
 
-	// init miniProgram app
+	// init openplatform app
 	configOpenPlatform := GetOpenPlatformConfig()
 	openPlatform, err := openPlatform.NewOpenPlatform(configOpenPlatform)
 	if err != nil {
 		fmt.Println(err.Error())
 	}
 	fmt2.Dump("openPlatform config:", openPlatform.GetConfig().All())
+
+	// init openwork app
+	configOpenWork := GetOpenWorkConfig()
+	openWork, err := openWork.NewOpenWork(configOpenWork)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt2.Dump("openPlatform config:", openWork.GetConfig().All())
+
 }

src/work/externalContact/messageTemplate/client.go

@@ -92,6 +92,28 @@ func (comp *Client) SendWelcomeMsg(ctx context.Context, options *request.Request
 	return result, err
 }
 
+// 提醒成员群发
+// https://developer.work.weixin.qq.com/document/path/97618
+func (comp *Client) RemindGroupMsgSend(ctx context.Context, options *request.RequestRemindGroupMsgSend) (*response2.ResponseWork, error) {
+
+	result := &response2.ResponseWork{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/remind_groupmsg_send", options, nil, nil, result)
+
+	return result, err
+}
+
+// 停止企业群发
+// https://developer.work.weixin.qq.com/document/path/97619
+func (comp *Client) CancelGroupMsgSend(ctx context.Context, options *request.RequestCancelGroupMsgSend) (*response2.ResponseWork, error) {
+
+	result := &response2.ResponseWork{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/cancel_groupmsg_send", options, nil, nil, result)
+
+	return result, err
+}
+
 func (comp *Client) formatMessage(ctx context.Context, data *object.HashMap) (*object.HashMap, error) {
 	params := *data
 

src/work/externalContact/messageTemplate/request/requestCancelGroupMsgSend.go

@@ -0,0 +1,5 @@
+package request
+
+type RequestCancelGroupMsgSend struct {
+	MsgID string `json:"msgid"`
+}

src/work/externalContact/messageTemplate/request/requestRemindGroupMsgSend.go

@@ -0,0 +1,5 @@
+package request
+
+type RequestRemindGroupMsgSend struct {
+	MsgID string `json:"msgid"`
+}

src/work/server/handlers/models/event.go

@@ -23,6 +23,7 @@ const (
 	CALLBACK_EVENT_LOCATION_SELECT          = "location_select"
 	CALLBACK_EVENT_OPEN_APPROVAL_CHANGE     = "open_approval_change"
 	CALLBACK_EVENT_SHARE_AGENT_CHANGE       = "share_agent_change"
+	CALLBACK_EVENT_TEMPLATE_CARD_EVENT      = "template_card_event"
 	CALLBACK_EVENT_TEMPLATE_CARD_MENU_EVENT = "template_card_menu_event"
 	CALLBACK_EVENT_SYS_APPROVAL_CHANGE      = "sys_approval_change"
 	CALLBACK_EVENT_KF_MSG_OR_EVENT          = "kf_msg_or_event"