add jpush offline notification

config/config.yaml

@@ -1,7 +1,7 @@
 # The class cannot be named by Pascal or camel case.
 # If it is not used, the corresponding structure will not be set,
 # and it will not be read naturally.
-
+serverversion: 1.0.0
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openIM
@@ -119,6 +119,9 @@ push:
     android:
       accessID: 111
       secretKey: 111
+  jpns:
+    appKey: 2783339cee4de379cc798fe1
+    masterSecret: 66e5f309e032c68cc668c28a
 manager:
   appManagerUid: ["openIM123456","openIM654321"]
   secrets: ["openIM1","openIM2"]

src/common/config/config.go

@@ -8,9 +8,9 @@ import (
 var Config config
 
 type config struct {
-	ServerIP string `yaml:"serverip"`
+	ServerIP      string `yaml:"serverip"`
-
+	ServerVersion string `yaml:"serverversion"`
-	Api struct {
+	Api           struct {
 		GinPort []int `yaml:"openImApiPort"`
 	}
 	Sdk struct {
@@ -110,6 +110,10 @@ type config struct {
 				SecretKey string `yaml:"secretKey"`
 			}
 		}
+		Jpns struct {
+			AppKey       string `yaml:"appKey"`
+			MasterSecret string `yaml:"masterSecret"`
+		}
 	}
 	Manager struct {
 		AppManagerUid []string `yaml:"appManagerUid"`

src/msg_gateway/gate/rpc_server.go

@@ -109,66 +109,6 @@ func (r *RPCServer) MsgToUser(_ context.Context, in *pbRelay.MsgToUserReq) (*pbR
 	if !tag {
 		log.NewError(in.OperationID, "push err ,ws conn not in map", in.String())
 	}
-	//for key, conn := range ws.wsUserToConn {
-	//	UIDAndPID := strings.Split(key, " ")
-	//	if UIDAndPID[0] == RecvID {
-	//		tag = true
-	//		resultCode := sendMsgToUser(conn, bMsg, in, UIDAndPID[1], UIDAndPID[0])
-	//		temp := &pbRelay.SingleMsgToUser{
-	//			ResultCode:     resultCode,
-	//			RecvID:         UIDAndPID[0],
-	//			RecvPlatFormID: utils.PlatformNameToID(UIDAndPID[1]),
-	//		}
-	//		resp = append(resp, temp)
-	//	}
-	//}
-	//if !tag {
-	//	log.NewError(in.OperationID, "push err ,ws conn not in map", in.String())
-	//}
-	//switch in.GetContentType() {
-	//case constant.SyncSenderMsg:
-	//	log.InfoByKv("come sync", in.OperationID, "args", in.String())
-	//	RecvID = in.GetSendID()
-	//	if in.MsgFrom != constant.SysMsgType {
-	//		for key, conn := range ws.wsUserToConn {
-	//			UIDAndPID := strings.Split(key, " ")
-	//			if UIDAndPID[0] == RecvID && utils.PlatformIDToName(in.GetPlatformID()) != UIDAndPID[1] {
-	//				resultCode := sendMsgToUser(conn, bMsg, in, UIDAndPID[1], UIDAndPID[0])
-	//				temp := &pbRelay.SingleMsgToUser{
-	//					ResultCode:     resultCode,
-	//					RecvID:         UIDAndPID[0],
-	//					RecvPlatFormID: utils.PlatformNameToID(UIDAndPID[1]),
-	//				}
-	//				resp = append(resp, temp)
-	//			}
-	//
-	//		}
-	//	}
-	//default:
-	//	log.InfoByKv("not come sync", in.OperationID, "args", in.String())
-	//	switch in.SessionType {
-	//	case constant.SingleChatType:
-	//		log.InfoByKv("come single", in.OperationID, "args", in.String())
-	//		RecvID = in.GetRecvID()
-	//	case constant.GroupChatType:
-	//		RecvID = strings.Split(in.GetRecvID(), " ")[0]
-	//	default:
-	//	}
-	//	log.InfoByKv("come for range", in.OperationID, "args", in.String())
-	//
-	//	for key, conn := range ws.wsUserToConn {
-	//		UIDAndPID := strings.Split(key, " ")
-	//		if UIDAndPID[0] == RecvID {
-	//			resultCode := sendMsgToUser(conn, bMsg, in, UIDAndPID[1], UIDAndPID[0])
-	//			temp := &pbRelay.SingleMsgToUser{
-	//				ResultCode:     resultCode,
-	//				RecvID:         UIDAndPID[0],
-	//				RecvPlatFormID: utils.PlatformNameToID(UIDAndPID[1]),
-	//			}
-	//			resp = append(resp, temp)
-	//		}
-	//	}
-	//}
 	return &pbRelay.MsgToUserResp{
 		Resp: resp,
 	}, nil
@@ -182,7 +122,7 @@ func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.MsgToUserReq, RecvPl
 		ResultCode = -2
 		return ResultCode
 	} else {
-		log.InfoByKv("PushMsgToUser is success By Ws", in.OperationID, "args", in.String())
+		log.InfoByKv("PushMsgToUser is success By Ws", in.OperationID, "args", in.String(), "recvPlatForm", RecvPlatForm, "recvID", RecvID)
 		ResultCode = 0
 		return ResultCode
 	}

src/push/jpush/common/JGPlatform.go

@@ -0,0 +1,17 @@
+package common
+
+import (
+	"encoding/base64"
+	"fmt"
+)
+
+const (
+	PushUrl = "https://api.jpush.cn/v3/push"
+)
+
+func 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
+}

src/push/jpush/push.go

@@ -0,0 +1,47 @@
+package push
+
+import (
+	"Open_IM/src/common/config"
+	"Open_IM/src/push/jpush/common"
+	"Open_IM/src/push/jpush/requestBody"
+	"bytes"
+	"encoding/json"
+	"net/http"
+)
+
+func JGAccountListPush(accounts []string, jsonCustomContent string, Platform string) (*http.Response, error) {
+
+	var pf requestBody.Platform
+	_ = pf.SetAndroid()
+	var au requestBody.Audience
+	au.SetAlias(accounts)
+	var no requestBody.Notification
+	no.SetAlert(jsonCustomContent)
+	var me requestBody.Message
+	me.SetMsgContent(jsonCustomContent)
+	var po requestBody.PushObj
+	po.SetPlatform(&pf)
+	po.SetAudience(&au)
+	po.SetNotification(&no)
+	po.SetMessage(&me)
+
+	con, err := json.Marshal(po)
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{}
+
+	req, err := http.NewRequest("POST", common.PushUrl, bytes.NewBuffer(con))
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Authorization", common.GetAuthorization(config.Config.Push.Jpns.AppKey, config.Config.Push.Jpns.MasterSecret))
+
+	resp, err := client.Do(req)
+	defer resp.Body.Close()
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

src/push/jpush/requestBody/audience.go

@@ -0,0 +1,53 @@
+package requestBody
+
+const (
+	TAG             = "tag"
+	TAG_AND         = "tag_and"
+	TAG_NOT         = "tag_not"
+	ALIAS           = "alias"
+	REGISTRATION_ID = "registration_id"
+	SEGMENT         = "segment"
+	ABTEST          = "abtest"
+)
+
+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(TAG_AND, tags)
+}
+
+func (a *Audience) SetTagNot(tags []string) {
+	a.set(TAG_NOT, tags)
+}
+
+func (a *Audience) SetAlias(alias []string) {
+	a.set(ALIAS, alias)
+}
+
+func (a *Audience) SetRegistrationId(ids []string) {
+	a.set(REGISTRATION_ID, ids)
+}
+
+func (a *Audience) SetAll() {
+	a.Object = "all"
+}

src/push/jpush/requestBody/message.go

@@ -0,0 +1,27 @@
+package requestBody
+
+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
+}

src/push/jpush/requestBody/notification.go

@@ -0,0 +1,17 @@
+package requestBody
+
+type Notification struct {
+	Alert   string   `json:"alert,omitempty"`
+	Android *Android `json:"android,omitempty"`
+	IOS     *Ios     `json:"ios,omitempty"`
+}
+
+type Android struct {
+}
+
+type Ios struct {
+}
+
+func (n *Notification) SetAlert(alert string) {
+	n.Alert = alert
+}

src/push/jpush/requestBody/platform.go

@@ -0,0 +1,76 @@
+package requestBody
+
+import "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) {
+	switch platform {
+	case ANDROID:
+		p.SetAndroid()
+	}
+
+}
+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
+}

src/push/jpush/requestBody/pushObj.go

@@ -0,0 +1,24 @@
+package requestBody
+
+type PushObj struct {
+	Platform     interface{} `json:"platform"`
+	Audience     interface{} `json:"audience"`
+	Notification interface{} `json:"notification,omitempty"`
+	Message      interface{} `json:"message,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
+}

src/push/logic/init.go

@@ -24,7 +24,7 @@ func Init(rpcPort int) {
 	log.NewPrivateLog(config.Config.ModuleName.PushName)
 	rpcServer.Init(rpcPort)
 	pushCh.Init()
-	pushTerminal = []int32{utils.IOSPlatformID}
+	pushTerminal = []int32{utils.IOSPlatformID, utils.AndroidPlatformID}
 }
 func init() {
 	producer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)

src/push/logic/push_to_client.go

@@ -14,13 +14,10 @@ import (
 	pbChat "Open_IM/src/proto/chat"
 	pbGroup "Open_IM/src/proto/group"
 	pbRelay "Open_IM/src/proto/relay"
-	pbGetInfo "Open_IM/src/proto/user"
 	rpcChat "Open_IM/src/rpc/chat/chat"
-	"Open_IM/src/rpc/user/internal_service"
 	"Open_IM/src/utils"
 	"context"
 	"encoding/json"
-	"fmt"
 	"strings"
 )
 
@@ -65,14 +62,6 @@ func MsgToUser(sendPbData *pbRelay.MsgToUserReq, OfflineInfo, Options string) {
 				//Use offline push messaging
 				var UIDList []string
 				UIDList = append(UIDList, sendPbData.RecvID)
-				var sendUIDList []string
-				sendUIDList = append(sendUIDList, sendPbData.SendID)
-				userInfo, err := internal_service.GetUserInfoClient(&pbGetInfo.GetUserInfoReq{UserIDList: sendUIDList, OperationID: sendPbData.OperationID})
-				if err != nil {
-					log.ErrorByArgs(fmt.Sprintf("err=%v,call GetUserInfoClient rpc server failed", err))
-					return
-				}
-
 				customContent := EChatContent{
 					SessionType: int(sendPbData.SessionType),
 					From:        sendPbData.SendID,
@@ -84,15 +73,15 @@ func MsgToUser(sendPbData *pbRelay.MsgToUserReq, OfflineInfo, Options string) {
 				jsonCustomContent := string(bCustomContent)
 				switch sendPbData.ContentType {
 				case constant.Text:
-					IOSAccountListPush(UIDList, userInfo.Data[0].Name, sendPbData.Content, jsonCustomContent)
+					IOSAccountListPush(UIDList, sendPbData.SenderNickName, sendPbData.Content, jsonCustomContent)
 				case constant.Picture:
-					IOSAccountListPush(UIDList, userInfo.Data[0].Name, constant.ContentType2PushContent[constant.Picture], jsonCustomContent)
+					IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Picture], jsonCustomContent)
 				case constant.Voice:
-					IOSAccountListPush(UIDList, userInfo.Data[0].Name, constant.ContentType2PushContent[constant.Voice], jsonCustomContent)
+					IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Voice], jsonCustomContent)
 				case constant.Video:
-					IOSAccountListPush(UIDList, userInfo.Data[0].Name, constant.ContentType2PushContent[constant.Video], jsonCustomContent)
+					IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Video], jsonCustomContent)
 				case constant.File:
-					IOSAccountListPush(UIDList, userInfo.Data[0].Name, constant.ContentType2PushContent[constant.File], jsonCustomContent)
+					IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.File], jsonCustomContent)
 				default:
 
 				}

src/rpc/group/group/group.go

@@ -163,13 +163,13 @@ func (c *inviteUserToGroupReq) ContentToString() string {
 }
 
 func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) {
-	claims, err := utils.ParseToken(req.Token)
+	//claims, err := utils.ParseToken(req.Token)
-	if err != nil {
+	//if err != nil {
-		log.Error(req.Token, req.OperationID, "err=%s,parse token failed", err.Error())
+	//	log.Error(req.Token, req.OperationID, "err=%s,parse token failed", err.Error())
-		if req.Token != config.Config.Secret {
+	//	if req.Token != config.Config.Secret {
-			return &pbGroup.GetGroupAllMemberResp{ErrorCode: config.ErrParseToken.ErrCode, ErrorMsg: config.ErrParseToken.ErrMsg}, nil
+	//		return &pbGroup.GetGroupAllMemberResp{ErrorCode: config.ErrParseToken.ErrCode, ErrorMsg: config.ErrParseToken.ErrMsg}, nil
-		}
+	//	}
-	}
+	//}
 
 	var resp pbGroup.GetGroupAllMemberResp
 	resp.ErrorCode = 0
@@ -177,7 +177,7 @@ func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGro
 	if err != nil {
 		resp.ErrorCode = config.ErrDb.ErrCode
 		resp.ErrorMsg = err.Error()
-		log.Error(claims.UID, req.OperationID, "FindGroupMemberListByGroupId failed, ", err.Error(), "params: ", req.GroupID)
+		log.NewError(req.OperationID, "FindGroupMemberListByGroupId failed,", err.Error(), req.GroupID)
 		return &resp, nil
 	}