proto modify

internal/push/offlinepush/jpush/body/audience.go

@@ -0,0 +1,50 @@
+package body
+
+const (
+	TAG            = "tag"
+	TAGAND         = "tag_and"
+	TAGNOT         = "tag_not"
+	ALIAS          = "alias"
+	REGISTRATIONID = "registration_id"
+)
+
+type Audience struct {
+	Object   interface{}
+	audience map[string][]string
+}
+
+func (a *Audience) set(key string, v []string) {
+	if a.audience == nil {
+		a.audience = make(map[string][]string)
+		a.Object = a.audience
+	}
+	//v, ok = this.audience[key]
+	//if ok {
+	//	return
+	//}
+	a.audience[key] = v
+}
+
+func (a *Audience) SetTag(tags []string) {
+	a.set(TAG, tags)
+}
+
+func (a *Audience) SetTagAnd(tags []string) {
+	a.set(TAGAND, tags)
+}
+
+func (a *Audience) SetTagNot(tags []string) {
+	a.set(TAGNOT, tags)
+}
+
+func (a *Audience) SetAlias(alias []string) {
+	a.set(ALIAS, alias)
+}
+
+func (a *Audience) SetRegistrationId(ids []string) {
+	a.set(REGISTRATIONID, ids)
+}
+
+func (a *Audience) SetAll() {
+	a.Object = "all"
+}

internal/push/offlinepush/jpush/body/message.go

@@ -0,0 +1,27 @@
+package body
+
+type Message struct {
+	MsgContent  string                 `json:"msg_content"`
+	Title       string                 `json:"title,omitempty"`
+	ContentType string                 `json:"content_type,omitempty"`
+	Extras      map[string]interface{} `json:"extras,omitempty"`
+}
+
+func (m *Message) SetMsgContent(c string) {
+	m.MsgContent = c
+}
+
+func (m *Message) SetTitle(t string) {
+	m.Title = t
+}
+
+func (m *Message) SetContentType(c string) {
+	m.ContentType = c
+}
+
+func (m *Message) SetExtras(key string, value interface{}) {
+	if m.Extras == nil {
+		m.Extras = make(map[string]interface{})
+	}
+	m.Extras[key] = value
+}

internal/push/offlinepush/jpush/body/notification.go

@@ -0,0 +1,52 @@
+package body
+
+import (
+	"OpenIM/pkg/common/config"
+)
+
+type Notification struct {
+	Alert   string  `json:"alert,omitempty"`
+	Android Android `json:"android,omitempty"`
+	IOS     Ios     `json:"ios,omitempty"`
+}
+
+type Android struct {
+	Alert  string `json:"alert,omitempty"`
+	Intent struct {
+		URL string `json:"url,omitempty"`
+	} `json:"intent,omitempty"`
+	Extras Extras `json:"extras"`
+}
+type Ios struct {
+	Alert          string `json:"alert,omitempty"`
+	Sound          string `json:"sound,omitempty"`
+	Badge          string `json:"badge,omitempty"`
+	Extras         Extras `json:"extras"`
+	MutableContent bool   `json:"mutable-content"`
+}
+
+type Extras struct {
+	ClientMsgID string `json:"clientMsgID"`
+}
+
+func (n *Notification) SetAlert(alert string) {
+	n.Alert = alert
+	n.Android.Alert = alert
+	n.SetAndroidIntent()
+	n.IOS.Alert = alert
+	n.IOS.Sound = "default"
+	n.IOS.Badge = "+1"
+}
+
+func (n *Notification) SetExtras(extras Extras) {
+	n.IOS.Extras = extras
+	n.Android.Extras = extras
+}
+
+func (n *Notification) SetAndroidIntent() {
+	n.Android.Intent.URL = config.Config.Push.Jpns.PushIntent
+}
+
+func (n *Notification) IOSEnableMutableContent() {
+	n.IOS.MutableContent = true
+}

internal/push/offlinepush/jpush/body/options.go

@@ -0,0 +1,9 @@
+package body
+
+type Options struct {
+	ApnsProduction bool `json:"apns_production"`
+}
+
+func (o *Options) SetApnsProduction(c bool) {
+	o.ApnsProduction = c
+}

internal/push/offlinepush/jpush/body/platform.go

@@ -0,0 +1,83 @@
+package body
+
+import (
+	"OpenIM/pkg/common/constant"
+	"errors"
+)
+
+const (
+	ANDROID      = "android"
+	IOS          = "ios"
+	QUICKAPP     = "quickapp"
+	WINDOWSPHONE = "winphone"
+	ALL          = "all"
+)
+
+type Platform struct {
+	Os     interface{}
+	osArry []string
+}
+
+func (p *Platform) Set(os string) error {
+	if p.Os == nil {
+		p.osArry = make([]string, 0, 4)
+	} else {
+		switch p.Os.(type) {
+		case string:
+			return errors.New("platform is all")
+		default:
+		}
+	}
+
+	for _, value := range p.osArry {
+		if os == value {
+			return nil
+		}
+	}
+
+	switch os {
+	case IOS:
+		fallthrough
+	case ANDROID:
+		fallthrough
+	case QUICKAPP:
+		fallthrough
+	case WINDOWSPHONE:
+		p.osArry = append(p.osArry, os)
+		p.Os = p.osArry
+	default:
+		return errors.New("unknow platform")
+	}
+
+	return nil
+}
+func (p *Platform) SetPlatform(platform string) error {
+	switch platform {
+	case constant.AndroidPlatformStr:
+		return p.SetAndroid()
+	case constant.IOSPlatformStr:
+		return p.SetIOS()
+	default:
+		return errors.New("platform err")
+	}
+
+}
+func (p *Platform) SetIOS() error {
+	return p.Set(IOS)
+}
+
+func (p *Platform) SetAndroid() error {
+	return p.Set(ANDROID)
+}
+
+func (p *Platform) SetQuickApp() error {
+	return p.Set(QUICKAPP)
+}
+
+func (p *Platform) SetWindowsPhone() error {
+	return p.Set(WINDOWSPHONE)
+}
+
+func (p *Platform) SetAll() {
+	p.Os = ALL
+}

internal/push/offlinepush/jpush/body/pushobj.go

@@ -0,0 +1,28 @@
+package body
+
+type PushObj struct {
+	Platform     interface{} `json:"platform"`
+	Audience     interface{} `json:"audience"`
+	Notification interface{} `json:"notification,omitempty"`
+	Message      interface{} `json:"message,omitempty"`
+	Options      interface{} `json:"options,omitempty"`
+}
+
+func (p *PushObj) SetPlatform(pf *Platform) {
+	p.Platform = pf.Os
+}
+
+func (p *PushObj) SetAudience(ad *Audience) {
+	p.Audience = ad.Object
+}
+
+func (p *PushObj) SetNotification(no *Notification) {
+	p.Notification = no
+}
+
+func (p *PushObj) SetMessage(m *Message) {
+	p.Message = m
+}
+func (p *PushObj) SetOptions(o *Options) {
+	p.Options = o
+}

internal/push/offlinepush/jpush/push.go

@@ -0,0 +1,63 @@
+package jpush
+
+import (
+	"OpenIM/internal/push/offlinepush"
+	"OpenIM/internal/push/offlinepush/jpush/body"
+	"OpenIM/pkg/common/config"
+	http2 "OpenIM/pkg/common/http"
+	"context"
+	"encoding/base64"
+	"fmt"
+)
+
+type JPush struct{}
+
+func NewClient() *JPush {
+	return &JPush{}
+}
+
+func (j *JPush) Auth(apiKey, secretKey string, timeStamp int64) (token string, err error) {
+	return token, nil
+}
+
+func (j *JPush) SetAlias(cid, alias string) (resp string, err error) {
+	return resp, nil
+}
+
+func (j *JPush) getAuthorization(appKey string, masterSecret string) string {
+	str := fmt.Sprintf("%s:%s", appKey, masterSecret)
+	buf := []byte(str)
+	Authorization := fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString(buf))
+	return Authorization
+}
+
+func (j *JPush) Push(ctx context.Context, userIDs []string, title, content string, opts *offlinepush.Opts) error {
+	var pf body.Platform
+	pf.SetAll()
+	var au body.Audience
+	au.SetAlias(userIDs)
+	var no body.Notification
+	var extras body.Extras
+	if opts.Signal.ClientMsgID != "" {
+		extras.ClientMsgID = opts.Signal.ClientMsgID
+	}
+	no.IOSEnableMutableContent()
+	no.SetExtras(extras)
+	no.SetAlert(title)
+	var msg body.Message
+	msg.SetMsgContent(content)
+	var opt body.Options
+	opt.SetApnsProduction(config.Config.IOSPush.Production)
+	var pushObj body.PushObj
+	pushObj.SetPlatform(&pf)
+	pushObj.SetAudience(&au)
+	pushObj.SetNotification(&no)
+	pushObj.SetMessage(&msg)
+	pushObj.SetOptions(&opt)
+	var resp interface{}
+	return j.request(pushObj, resp, 5)
+}
+
+func (j *JPush) request(po body.PushObj, resp interface{}, timeout int) error {
+	return http2.PostReturn(config.Config.Push.Jpns.PushUrl, map[string]string{"Authorization": j.getAuthorization(config.Config.Push.Jpns.AppKey, config.Config.Push.Jpns.MasterSecret)}, po, resp, timeout)
+}