推送服务 增加透传模板

@@ -13,4 +13,5 @@ const (
 */
 */
 const (
 const (
 	SystemNotification = iota + 1 //系统消息
 	SystemNotification = iota + 1 //系统消息
+	Transmission
 )
 )

@@ -154,6 +154,14 @@ func (notify *GetuiNotification) Message(method string) interface{} {
 		}
 		}
 		m = t
 		m = t
 		break
 		break
+	case push.Transmission:
+		t := NewTransmissionTemplate(notify.Options)
+		if method == saveListBody {
+			t.ClientId = ""
+			t.RequestId = ""
+		}
+		m = t
+		break
 	default:
 	default:
 		m = NewNotificationTemplate(notify.Options)
 		m = NewNotificationTemplate(notify.Options)
 		break
 		break

@@ -2,6 +2,7 @@ package getui
 
 
 import (
 import (
 	"openapi/internal/push"
 	"openapi/internal/push"
+	"openapi/internal/utils"
 	"testing"
 	"testing"
 )
 )
 
 
@@ -9,7 +10,7 @@ func TestGetui(t *testing.T) {
 	var param = make(map[string]interface{})
 	var param = make(map[string]interface{})
 	param["A"] = "A1"
 	param["A"] = "A1"
 	param["B"] = 2
 	param["B"] = 2
-	param["C"] = struct{ Id int }{Id: 10}
+	param["transData"] = struct{ Id int }{Id: 10}
 	notification := &GetuiNotification{}
 	notification := &GetuiNotification{}
 	err := notification.Init(
 	err := notification.Init(
 		push.DebugModule(true),
 		push.DebugModule(true),
@@ -24,11 +25,48 @@ func TestGetui(t *testing.T) {
 		//push.PushType(push.PushToList),
 		//push.PushType(push.PushToList),
 		//push.ClientIds([]string{"b5fff5f6b0af551da5f381fa47991828"}),
 		//push.ClientIds([]string{"b5fff5f6b0af551da5f381fa47991828"}),
 
 
-		push.MsgType(1),
+		push.MsgType(push.Transmission), //push.SystemNotification
 		push.Title("测试 hello"),
 		push.Title("测试 hello"),
 		push.Content("hello content"),
 		push.Content("hello content"),
 
 
-		push.TransmissionContent("扩展1111"),
+		push.TransmissionContent(utils.JsonAssertString(param["transData"])),
+		push.Extra(param),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = notification.Send(param)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestGetuiPrd(t *testing.T) {
+	var param = make(map[string]interface{})
+	param["A"] = "A1"
+	param["B"] = 2
+	param["transData"] = struct {
+		Id int `json:"id"`
+	}{Id: 1}
+	notification := &GetuiNotification{}
+	err := notification.Init(
+		push.DebugModule(true),
+
+		push.AppId("WgrbaaStTk7JElrXOCgUg6"),
+		push.AppKey("FG5lbqVrHa5rS9NVfxNP7"),
+		push.AppMasterSecret("FW3jMNLJrRARYKv2iqA5H5"),
+		//单推
+		//push.PushType(push.PushToSingle),
+		//push.ClientId("502f4fd7ba5df15ac6b3d5c561efd9ca"),
+		//群推
+		push.PushType(push.PushToList),
+		push.ClientIds([]string{"502f4fd7ba5df15ac6b3d5c561efd9ca"}),
+
+		push.MsgType(push.Transmission),
+		push.Title("hello"),
+		push.Content("hello content"),
+
+		push.TransmissionContent(utils.JsonAssertString(param["transData"])),
 		push.Extra(param),
 		push.Extra(param),
 	)
 	)
 	if err != nil {
 	if err != nil {

@@ -5,21 +5,44 @@ import (
 	"openapi/internal/push"
 	"openapi/internal/push"
 )
 )
 
 
-type Template struct {
-	ClientId  string   `json:"cid,omitempty"`
-	RequestId string   `json:"requestid,omitempty"`
-	Message   *Message `json:"message"`
-}
-
 //1.消息模板
 //1.消息模板
 type NotificationTemplate struct {
 type NotificationTemplate struct {
 	*Template
 	*Template
 	Notification *Notification `json:"notification"`
 	Notification *Notification `json:"notification"`
 }
 }
 
 
+//1.新建通知模板
+func NewNotificationTemplate(options *push.Options) *NotificationTemplate {
+	return &NotificationTemplate{
+		Template: NewTemplate(options),
+		Notification: &Notification{
+			Style:        (&Style{}).SetStyle0(options),
+			Transmission: NewTransmission(options),
+		},
+	}
+}
+
 //2.透传模板
 //2.透传模板
-type TransmissionTemplate struct{}
+type TransmissionTemplate struct {
+	*Template
+	Transmission *Transmission `json:"transmission"`
+	PushInfo     *PushInfo     `json:"push_info"`
+}
 
 
+//2.新建透传模板
+func NewTransmissionTemplate(options *push.Options) *TransmissionTemplate {
+	return &TransmissionTemplate{
+		Template:     NewTemplate(options),
+		Transmission: NewTransmission(options),
+		PushInfo:     NewPushInfo(options),
+	}
+}
+
+type Template struct {
+	ClientId  string   `json:"cid,omitempty"`
+	RequestId string   `json:"requestid,omitempty"`
+	Message   *Message `json:"message"`
+}
 type Notification struct {
 type Notification struct {
 	Style *Style `json:"style"`
 	Style *Style `json:"style"`
 	*Transmission
 	*Transmission
@@ -29,9 +52,11 @@ type Message struct {
 	IsOffline bool   `json:"is_offline"`
 	IsOffline bool   `json:"is_offline"`
 	MsgType   string `json:"msgtype"`
 	MsgType   string `json:"msgtype"`
 }
 }
+
+//透传
 type Transmission struct {
 type Transmission struct {
-	TransmissionType    bool   `json:"transmission_type"`
-	TransmissionContent string `json:"transmission_content,omitempty"`
+	TransmissionType    bool   `json:"transmission_type"`              //收到消息是否立即启动应用，true为立即启动，false则广播等待启动，默认是否
+	TransmissionContent string `json:"transmission_content,omitempty"` //透传内容
 	DurationBegin       string `json:"duration_begin,omitempty"`
 	DurationBegin       string `json:"duration_begin,omitempty"`
 	DurationEnd         string `json:"duration_end,omitempty"`
 	DurationEnd         string `json:"duration_end,omitempty"`
 }
 }
@@ -47,16 +72,6 @@ func (o *Transmission) SetDuration(begin, end string) {
 	o.DurationEnd = end
 	o.DurationEnd = end
 }
 }
 
 
-//1.新建单推
-func NewNotificationTemplate(options *push.Options) *NotificationTemplate {
-	return &NotificationTemplate{
-		Template: NewTemplate(options),
-		Notification: &Notification{
-			Style:        (&Style{}).SetStyle0(options),
-			Transmission: NewTransmission(options),
-		},
-	}
-}
 func NewTemplate(options *push.Options) *Template {
 func NewTemplate(options *push.Options) *Template {
 	return &Template{
 	return &Template{
 		Message:   NewMessage(options),
 		Message:   NewMessage(options),
@@ -67,10 +82,10 @@ func NewTemplate(options *push.Options) *Template {
 func NewTransmission(options *push.Options) *Transmission {
 func NewTransmission(options *push.Options) *Transmission {
 	t := &Transmission{}
 	t := &Transmission{}
 	if len(options.TransmissionContent) == 0 {
 	if len(options.TransmissionContent) == 0 {
-		t.SetTransmissionType(false)
+		//t.SetTransmissionType(false)
 		return t
 		return t
 	}
 	}
-	t.SetTransmissionType(true)
+	t.SetTransmissionType(false)
 	t.SetTransmissionContent(options.TransmissionContent)
 	t.SetTransmissionContent(options.TransmissionContent)
 	return t
 	return t
 }
 }
@@ -89,7 +104,8 @@ func resolveMsgType(msgType int) string {
 	switch msgType {
 	switch msgType {
 	case push.SystemNotification:
 	case push.SystemNotification:
 		return "notification"
 		return "notification"
-
+	case push.Transmission:
+		return "transmission"
 	}
 	}
 	return "notification"
 	return "notification"
 }
 }
@@ -105,13 +121,16 @@ type Style struct {
 	Logo  string `json:"logo,omitempty"` //通知的图标名称，包含后缀名（需要在客户端开发时嵌入），如“push.png”
 	Logo  string `json:"logo,omitempty"` //通知的图标名称，包含后缀名（需要在客户端开发时嵌入），如“push.png”
 	//IsRing bool `json:"is_ring"`  //收到通知是否响铃：true响铃，false不响铃。默认响铃
 	//IsRing bool `json:"is_ring"`  //收到通知是否响铃：true响铃，false不响铃。默认响铃
 	//IsVibrate bool `json:"is_vibrate"`  //收到通知是否振动：true振动，false不振动。默认振动
 	//IsVibrate bool `json:"is_vibrate"`  //收到通知是否振动：true振动，false不振动。默认振动
+	NotifyId int `json:"notify_id"` //需要被覆盖的消息已经增加了notifyId字段，用于实现下发消息的覆盖。新的消息使用相同的notifyId下发。
 }
 }
 
 
+//设置默认样式 0
 func (s *Style) SetStyle0(options *push.Options) *Style {
 func (s *Style) SetStyle0(options *push.Options) *Style {
 	s.Type = 0
 	s.Type = 0
 	s.Title = options.Title
 	s.Title = options.Title
 	s.Text = options.Content
 	s.Text = options.Content
 	s.Logo = "push.png" //TODO：设置Logo地址
 	s.Logo = "push.png" //TODO：设置Logo地址
+	s.NotifyId = 1
 	return s
 	return s
 }
 }
 
 
@@ -126,9 +145,47 @@ type AuthSignResponse struct {
 	AuthToken string `json:"auth_token"`
 	AuthToken string `json:"auth_token"`
 }
 }
 
 
+//应答结果
 type Result struct {
 type Result struct {
 	Result string `json:"result"`
 	Result string `json:"result"`
 	TaskId string `json:"taskid"`
 	TaskId string `json:"taskid"`
 	Status string `json:"status"`
 	Status string `json:"status"`
 	Desc   string `json:"desc"`
 	Desc   string `json:"desc"`
 }
 }
+
+//透传附加的推送信息
+func NewPushInfo(options *push.Options) (v *PushInfo) {
+	v = &PushInfo{
+		Aps: NewAps(options),
+	}
+	return
+}
+func NewAps(options *push.Options) (v *Aps) {
+	v = &Aps{
+		Alert:            NewAlert(options),
+		AutoBadge:        "+1",
+		ContentAvailable: 1,
+	}
+	return
+}
+func NewAlert(options *push.Options) (v *Alert) {
+	v = &Alert{
+		Title: options.Title,
+		Body:  options.Content,
+	}
+	return
+}
+
+type PushInfo struct {
+	Aps *Aps `json:"aps"`
+}
+type Aps struct {
+	Alert            *Alert `json:"alert"`
+	AutoBadge        string `json:"autoBadge"`         //用于计算应用上面未读数字
+	ContentAvailable int    `json:"content-available"` //推送直接带有透传数据 0：有通知栏消息 1：无通知栏消息
+	Payload          string `json:"payload,omitempty"`
+}
+type Alert struct {
+	Title string `json:"title"`
+	Body  string `json:"body"`
+}