Merge branch 'main' into v2.3.0release

config/config.yaml

@@ -239,6 +239,12 @@ push:
   fcm:  #firebase cloud message 消息推送
     serviceAccount: "openim-5c6c0-firebase-adminsdk-ppwol-8765884a78.json" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
     enable: false
+  mob:  #袤博推送
+    appKey: "3377f689a25" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下
+    pushUrl: "https://api.push.mob.com/v3/push/createPush"
+    scheme: "dianzhijiaunilinks://dianzhijia.com?page=rent"
+    appSecret: "77b4e20e94db3a776b87d8693be23e"
+    enable: false
 
 
 

docker-compose.yaml

@@ -115,7 +115,7 @@ services:
 
 
   open_im_server:
-    image: openim/open_im_server:v2.3.2
+    image: openim/open_im_server:v2.3.3
     container_name: open_im_server
     volumes:
       - ./logs:/Open-IM-Server/logs

internal/demo/register/set_password.go

@@ -27,7 +27,7 @@ type ParamsSetPassword struct {
 	PhoneNumber      string `json:"phoneNumber"`
 	Password         string `json:"password" binding:"required"`
 	VerificationCode string `json:"verificationCode"`
-	Platform         int32  `json:"platform" binding:"required,min=1,max=7"`
+	Platform         int32  `json:"platform" binding:"required,min=1,max=12"`
 	Ex               string `json:"ex"`
 	FaceURL          string `json:"faceURL"`
 	OperationID      string `json:"operationID" binding:"required"`

internal/push/logic/init.go

@@ -11,6 +11,7 @@ import (
 	fcm "Open_IM/internal/push/fcm"
 	"Open_IM/internal/push/getui"
 	jpush "Open_IM/internal/push/jpush"
+	"Open_IM/internal/push/mobpush"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/kafka"
@@ -45,6 +46,10 @@ func init() {
 	if config.Config.Push.Fcm.Enable {
 		offlinePusher = fcm.NewFcm()
 	}
+
+	if config.Config.Push.Mob.Enable {
+		offlinePusher = mobpush.MobPushClient
+	}
 }
 
 func initPrometheus() {

internal/push/mobpush/common/getSign.go

@@ -0,0 +1,18 @@
+package common
+
+import (
+	"Open_IM/pkg/common/config"
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+)
+
+func GetSign(paramsStr string) string {
+	h := md5.New()
+	io.WriteString(h, paramsStr)
+	io.WriteString(h, config.Config.Push.Mob.AppSecret)
+	fmt.Printf("%x", h.Sum(nil))
+
+	return hex.EncodeToString(h.Sum(nil))
+}

internal/push/mobpush/push.go

@@ -0,0 +1,75 @@
+package mobpush
+
+import (
+	"Open_IM/internal/push"
+	"Open_IM/internal/push/mobpush/common"
+	"Open_IM/internal/push/mobpush/requestParams"
+	"Open_IM/pkg/common/config"
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"strings"
+)
+
+var (
+	MobPushClient *MobPush
+)
+
+func init() {
+	MobPushClient = newGetuiClient()
+}
+
+type MobPush struct{}
+
+func newGetuiClient() *MobPush {
+	return &MobPush{}
+}
+
+func (j *MobPush) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) {
+
+	var target requestParams.PushTarget
+
+	target.SetAlias(accounts)
+	target.SetTarget(2)
+
+	var no requestParams.PushNotify
+	no.SetType(1)
+	no.SetIosProduction(1)
+	no.SetPlats([]int{1, 2})
+	no.SetContent(alert)
+
+	var forward requestParams.PushForward
+	forward.SetNextType(2)
+	forward.SetScheme(config.Config.Push.Mob.Scheme)
+
+	var po requestParams.PushObj
+	po.SetSource("webapi")
+	po.SetAppkey(config.Config.Push.Mob.AppKey)
+	po.SetPushTarget(&target)
+	po.SetPushNotify(&no)
+	po.SetPushForward(&forward)
+
+	con, err := json.Marshal(po)
+	if err != nil {
+		return "", err
+	}
+	client := &http.Client{}
+	req, err := http.NewRequest("POST", config.Config.Push.Mob.PushUrl, strings.NewReader(string(con)))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("key", config.Config.Push.Mob.AppKey)
+	req.Header.Set("sign", common.GetSign(string(con)))
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	result, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	return string(result), nil
+}

internal/push/mobpush/requestParams/pushForward.go

@@ -0,0 +1,14 @@
+package requestParams
+
+type PushForward struct {
+	NextType int    `json:"nextType"`
+	Scheme   string `json:"scheme,omitempty"`
+}
+
+func (m *PushForward) SetNextType(c int) {
+	m.NextType = c
+}
+
+func (m *PushForward) SetScheme(t string) {
+	m.Scheme = t
+}

internal/push/mobpush/requestParams/pushNotify.go

@@ -0,0 +1,26 @@
+package requestParams
+
+type PushNotify struct {
+	Plats         []int  `json:"plats,omitempty"`
+	IosProduction int    `json:"iosProduction,omitempty"`
+	Content       string `json:"content,omitempty"`
+	Type          int    `json:"type,omitempty"`
+}
+
+func (n *PushNotify) SetPlats(plats []int) {
+	n.Plats = plats
+
+}
+
+func (n *PushNotify) SetIosProduction(iosProduction int) {
+	n.IosProduction = iosProduction
+
+}
+
+func (n *PushNotify) SetContent(content string) {
+	n.Content = content
+}
+
+func (n *PushNotify) SetType(Type int) {
+	n.Type = Type
+}

internal/push/mobpush/requestParams/pushObj.go

@@ -0,0 +1,28 @@
+package requestParams
+
+type PushObj struct {
+	Source      interface{} `json:"source"`
+	Appkey      interface{} `json:"appkey"`
+	PushTarget  interface{} `json:"pushTarget,omitempty"`
+	PushNotify  interface{} `json:"pushNotify,omitempty"`
+	PushForward interface{} `json:"pushForward,omitempty"`
+}
+
+func (p *PushObj) SetSource(source string) {
+	p.Source = source
+}
+
+func (p *PushObj) SetAppkey(appkey string) {
+	p.Appkey = appkey
+}
+
+func (p *PushObj) SetPushTarget(no *PushTarget) {
+	p.PushTarget = no
+}
+
+func (p *PushObj) SetPushNotify(m *PushNotify) {
+	p.PushNotify = m
+}
+func (p *PushObj) SetPushForward(o *PushForward) {
+	p.PushForward = o
+}

internal/push/mobpush/requestParams/pushTarget.go

@@ -0,0 +1,13 @@
+package requestParams
+
+type PushTarget struct {
+	Target interface{} `json:"target,omitempty"`
+	Alias  []string    `json:"alias,omitempty"`
+}
+
+func (p *PushTarget) SetTarget(target int) {
+	p.Target = target
+}
+func (p *PushTarget) SetAlias(alias []string) {
+	p.Alias = alias
+}

pkg/base_info/auth_api_struct.go

@@ -11,7 +11,7 @@ package base_info
 
 type UserRegisterReq struct {
 	Secret   string `json:"secret" binding:"required,max=32"`
-	Platform int32  `json:"platform" binding:"required,min=1,max=7"`
+	Platform int32  `json:"platform" binding:"required,min=1,max=12"`
 	ApiUserInfo
 	OperationID string `json:"operationID" binding:"required"`
 }
@@ -28,7 +28,7 @@ type UserRegisterResp struct {
 
 type UserTokenReq struct {
 	Secret      string `json:"secret" binding:"required,max=32"`
-	Platform    int32  `json:"platform" binding:"required,min=1,max=9"`
+	Platform    int32  `json:"platform" binding:"required,min=1,max=12"`
 	UserID      string `json:"userID" binding:"required,min=1,max=64"`
 	LoginIp     string `json:"loginIp"`
 	OperationID string `json:"operationID" binding:"required"`
@@ -40,7 +40,7 @@ type UserTokenResp struct {
 }
 
 type ForceLogoutReq struct {
-	Platform    int32  `json:"platform" binding:"required,min=1,max=9"`
+	Platform    int32  `json:"platform" binding:"required,min=1,max=12"`
 	FromUserID  string `json:"fromUserID" binding:"required,min=1,max=64"`
 	OperationID string `json:"operationID" binding:"required"`
 }

pkg/common/config/config.go

@@ -215,6 +215,13 @@ type config struct {
 			ServiceAccount string `yaml:"serviceAccount"`
 			Enable         bool   `yaml:"enable"`
 		}
+		Mob struct {
+			AppKey    string `yaml:"appKey"`
+			PushUrl   string `yaml:"pushUrl"`
+			Scheme    string `yaml:"scheme"`
+			AppSecret string `yaml:"appSecret"`
+			Enable    bool   `yaml:"enable"`
+		}
 	}
 	Manager struct {
 		AppManagerUid          []string `yaml:"appManagerUid"`