blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

add push and fix name and faceurl

Browse Source
This commit is contained in:
Gordon 2021-10-28 15:56:36 +08:00
parent 30be5c2c48
commit fe80b7da5c
7 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.yaml
View File

@ -122,6 +122,7 @@ push:
jpns: jpns:
appKey: 2783339cee4de379cc798fe1 appKey: 2783339cee4de379cc798fe1
masterSecret: 66e5f309e032c68cc668c28a masterSecret: 66e5f309e032c68cc668c28a
pushUrl: "https://api.jpush.cn/v3/push"
manager: manager:
appManagerUid: ["openIM123456","openIM654321"] appManagerUid: ["openIM123456","openIM654321"]
secrets: ["openIM1","openIM2"] secrets: ["openIM1","openIM2"]

1
src/common/config/config.go
View File

@ -113,6 +113,7 @@ type config struct {
Jpns struct { Jpns struct {
AppKey string `yaml:"appKey"` AppKey string `yaml:"appKey"`
MasterSecret string `yaml:"masterSecret"` MasterSecret string `yaml:"masterSecret"`
PushUrl string `yaml:"pushUrl"`
} }
} }
Manager struct { Manager struct {

7
src/msg_gateway/gate/logic.go
View File

@ -213,7 +213,7 @@ func (ws *WServer) sendMsgResp(conn *UserConn, m *Req, pb *pbChat.UserSendMsgRes
} }
func (ws *WServer) sendMsgReq(conn *UserConn, m *Req, sendTime int64) { func (ws *WServer) sendMsgReq(conn *UserConn, m *Req, sendTime int64) {
log.InfoByKv("Ws call success to sendMsgReq", m.OperationID, "Parameters", m) log.InfoByKv("Ws call success to sendMsgReq start", m.OperationID, "Parameters")
reply := new(pbChat.UserSendMsgResp) reply := new(pbChat.UserSendMsgResp)
isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendMsg) isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendMsg)
if isPass { if isPass {
@ -229,11 +229,14 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req, sendTime int64) {
ContentType: data.ContentType, ContentType: data.ContentType,
RecvID: data.RecvID, RecvID: data.RecvID,
ForceList: data.ForceList, ForceList: data.ForceList,
SenderNickName: data.SenderNickName,
SenderFaceURL: data.SenderFaceURL,
Content: data.Content, Content: data.Content,
Options: utils.MapIntToJsonString(data.Options), Options: utils.MapIntToJsonString(data.Options),
ClientMsgID: data.ClientMsgID, ClientMsgID: data.ClientMsgID,
SendTime: sendTime, SendTime: sendTime,
} }
log.NewInfo(m.OperationID, "Ws call success to sendMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, data)
time := utils.GetCurrentTimestampBySecond() time := utils.GetCurrentTimestampBySecond()
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName)
client := pbChat.NewChatClient(etcdConn) client := pbChat.NewChatClient(etcdConn)
@ -265,7 +268,7 @@ func (ws *WServer) sendMsg(conn *UserConn, mReply interface{}) {
} }
err = ws.writeMsg(conn, websocket.BinaryMessage, b.Bytes()) err = ws.writeMsg(conn, websocket.BinaryMessage, b.Bytes())
if err != nil { if err != nil {
log.ErrorByKv("WS WriteMsg error", "", "userIP", conn.RemoteAddr().String(), "userUid", ws.getUserUid(conn), "error", err, "mReply", mReply) log.NewError(mReply.(Resp).OperationID, mReply.(Resp).ReqIdentifier, mReply.(Resp).ErrCode, mReply.(Resp).ErrMsg, "WS WriteMsg error", conn.RemoteAddr().String(), ws.getUserUid(conn), err.Error())
} }
} }
func (ws *WServer) sendErrMsg(conn *UserConn, errCode int32, errMsg string, reqIdentifier int32, msgIncr string, operationID string) { func (ws *WServer) sendErrMsg(conn *UserConn, errCode int32, errMsg string, reqIdentifier int32, msgIncr string, operationID string) {

4
src/push/jpush/common/JGPlatform.go
View File

@ -5,10 +5,6 @@ import (
"fmt" "fmt"
) )
const (
PushUrl = "https://api.jpush.cn/v3/push"
)
func GetAuthorization(Appkey string, MasterSecret string) string { func GetAuthorization(Appkey string, MasterSecret string) string {
str := fmt.Sprintf("%s:%s", Appkey, MasterSecret) str := fmt.Sprintf("%s:%s", Appkey, MasterSecret)
buf := []byte(str) buf := []byte(str)

9
src/push/jpush/push.go
View File

@ -9,10 +9,13 @@ import (
"net/http" "net/http"
) )
func JGAccountListPush(accounts []string, jsonCustomContent string, Platform string) (*http.Response, error) { type JPushResp struct {
}
func JGAccountListPush(accounts []string, jsonCustomContent string, platform string) (*http.Response, error) {
var pf requestBody.Platform var pf requestBody.Platform
_ = pf.SetAndroid() _ = pf.SetPlatform(platform)
var au requestBody.Audience var au requestBody.Audience
au.SetAlias(accounts) au.SetAlias(accounts)
var no requestBody.Notification var no requestBody.Notification
@ -32,7 +35,7 @@ func JGAccountListPush(accounts []string, jsonCustomContent string, Platform str
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("POST", common.PushUrl, bytes.NewBuffer(con)) req, err := http.NewRequest("POST", config.Config.Push.Jpns.PushUrl, bytes.NewBuffer(con))
if err != nil { if err != nil {
return nil, err return nil, err
} }

15
src/push/jpush/requestBody/platform.go
View File

@ -1,6 +1,9 @@
package requestBody package requestBody
import "errors" import (
"Open_IM/src/utils"
"errors"
)
const ( const (
ANDROID = "android" ANDROID = "android"
@ -48,10 +51,14 @@ func (p *Platform) Set(os string) error {
return nil return nil
} }
func (p *Platform) setPlatform(platform string) { func (p *Platform) SetPlatform(platform string) error {
switch platform { switch platform {
case ANDROID: case utils.AndroidPlatformStr:
p.SetAndroid() return p.SetAndroid()
case utils.IOSPlatformStr:
return p.SetIOS()
default:
return errors.New("platform err")
} }
} }

52
src/push/logic/push_to_client.go
View File

@ -17,7 +17,6 @@ import (
rpcChat "Open_IM/src/rpc/chat/chat" rpcChat "Open_IM/src/rpc/chat/chat"
"Open_IM/src/utils" "Open_IM/src/utils"
"context" "context"
"encoding/json"
"strings" "strings"
) )
@ -60,31 +59,32 @@ func MsgToUser(sendPbData *pbRelay.MsgToUserReq, OfflineInfo, Options string) {
} }
if isShouldOfflinePush { if isShouldOfflinePush {
//Use offline push messaging //Use offline push messaging
var UIDList []string //var UIDList []string
UIDList = append(UIDList, sendPbData.RecvID) //UIDList = append(UIDList, sendPbData.RecvID)
customContent := EChatContent{ //customContent := EChatContent{
SessionType: int(sendPbData.SessionType), // SessionType: int(sendPbData.SessionType),
From: sendPbData.SendID, // From: sendPbData.SendID,
To: sendPbData.RecvID, // To: sendPbData.RecvID,
Seq: sendPbData.RecvSeq, // Seq: sendPbData.RecvSeq,
} //}
bCustomContent, _ := json.Marshal(customContent) //bCustomContent, _ := json.Marshal(customContent)
//
jsonCustomContent := string(bCustomContent) //jsonCustomContent := string(bCustomContent)
switch sendPbData.ContentType { //switch sendPbData.ContentType {
case constant.Text: //case constant.Text:
IOSAccountListPush(UIDList, sendPbData.SenderNickName, sendPbData.Content, jsonCustomContent) // IOSAccountListPush(UIDList, sendPbData.SenderNickName, sendPbData.Content, jsonCustomContent)
case constant.Picture: //case constant.Picture:
IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Picture], jsonCustomContent) // IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Picture], jsonCustomContent)
case constant.Voice: //case constant.Voice:
IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Voice], jsonCustomContent) // IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Voice], jsonCustomContent)
case constant.Video: //case constant.Video:
IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Video], jsonCustomContent) // IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.Video], jsonCustomContent)
case constant.File: //case constant.File:
IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.File], jsonCustomContent) // IOSAccountListPush(UIDList, sendPbData.SenderNickName, constant.ContentType2PushContent[constant.File], jsonCustomContent)
default: //default:
//
} //}
//push.JGAccountListPush(UIDList,jsonCustomContent,utils.PlatformIDToName(t))
} else { } else {
isShouldOfflinePush = true isShouldOfflinePush = true