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

fix bug

Browse Source
This commit is contained in:
wangchuxiao 2022-06-22 19:48:35 +08:00
parent b5c20f5be9
commit 6b78b75638
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/demo/register/onboarding_process.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
) )
func onboardingProcess(operationID, userID, userName string) { func onboardingProcess(operationID, userID, userName, faceURL string) {
if err := createOrganizationUser(operationID, userID, userName); err != nil { if err := createOrganizationUser(operationID, userID, userName); err != nil {
log.NewError(operationID, utils.GetSelfFuncName(), "createOrganizationUser failed", err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), "createOrganizationUser failed", err.Error())
} }
@ -40,7 +40,7 @@ func onboardingProcess(operationID, userID, userName string) {
log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
} }
log.NewInfo(operationID, utils.GetSelfFuncName(), groupIDList) log.NewInfo(operationID, utils.GetSelfFuncName(), groupIDList)
joinGroups(operationID, userID, userName, groupIDList) joinGroups(operationID, userID, userName, faceURL, groupIDList)
log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed") log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed")
oaNotification(operationID, userID) oaNotification(operationID, userID)
} }
@ -157,7 +157,7 @@ func GetDepartmentGroupIDList(operationID, departmentID string) ([]string, error
return getDepartmentParentIDListResp.GroupIDList, nil return getDepartmentParentIDListResp.GroupIDList, nil
} }
func joinGroups(operationID, userID, userName string, groupIDList []string) { func joinGroups(operationID, userID, userName, faceURL string, groupIDList []string) {
defer func() { defer func() {
log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupIDList) log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupIDList)
}() }()
@ -185,12 +185,12 @@ func joinGroups(operationID, userID, userName string, groupIDList []string) {
log.NewError(req.OperationID, utils.GetSelfFuncName(), resp) log.NewError(req.OperationID, utils.GetSelfFuncName(), resp)
continue continue
} }
onboardingProcessNotification(operationID, userID, groupID, userName) onboardingProcessNotification(operationID, userID, groupID, userName, faceURL)
} }
} }
// welcome user join department notification // welcome user join department notification
func onboardingProcessNotification(operationID, userID, groupID, userName string) { func onboardingProcessNotification(operationID, userID, groupID, userName, faceURL string) {
defer func() { defer func() {
log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupID) log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupID)
}() }()
@ -211,6 +211,8 @@ func onboardingProcessNotification(operationID, userID, groupID, userName string
ContentType: constant.Text, ContentType: constant.Text,
SessionType: constant.GroupChatType, SessionType: constant.GroupChatType,
OperationID: operationID, OperationID: operationID,
SenderNickname: userName,
SenderFaceURL: faceURL,
} }
// notification user join group // notification user join group

2
internal/demo/register/set_password.go
View File

@ -96,7 +96,7 @@ func SetPassword(c *gin.Context) {
} }
log.Info(params.OperationID, "end setPassword", account, params.Password) log.Info(params.OperationID, "end setPassword", account, params.Password)
// demo onboarding // demo onboarding
onboardingProcess(params.OperationID, userID, params.Nickname) onboardingProcess(params.OperationID, userID, params.Nickname, params.FaceURL)
c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken}) c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken})
return return
} }

4
internal/rpc/msg/send_msg.go
View File

@ -560,6 +560,8 @@ type NotificationMsg struct {
ContentType int32 ContentType int32
SessionType int32 SessionType int32
OperationID string OperationID string
SenderNickname string
SenderFaceURL string
} }
func Notification(n *NotificationMsg) { func Notification(n *NotificationMsg) {
@ -579,6 +581,8 @@ func Notification(n *NotificationMsg) {
msg.CreateTime = utils.GetCurrentTimestampByMill() msg.CreateTime = utils.GetCurrentTimestampByMill()
msg.ClientMsgID = utils.GetMsgID(n.SendID) msg.ClientMsgID = utils.GetMsgID(n.SendID)
msg.Options = make(map[string]bool, 7) msg.Options = make(map[string]bool, 7)
msg.SenderNickname = n.SenderNickname
msg.SenderFaceURL = n.SenderFaceURL
switch n.SessionType { switch n.SessionType {
case constant.GroupChatType, constant.SuperGroupChatType: case constant.GroupChatType, constant.SuperGroupChatType:
msg.RecvID = "" msg.RecvID = ""

2
internal/rpc/user/user.go
View File

@ -284,7 +284,7 @@ func (s *userServer) SetRecvMsgOpt(ctx context.Context, req *pbUser.SetRecvMsgOp
stringList := strings.Split(req.ConversationID, "_") stringList := strings.Split(req.ConversationID, "_")
if len(stringList) > 1 { if len(stringList) > 1 {
switch stringList[0] { switch stringList[0] {
case "single_": case "single":
conversation.UserID = stringList[1] conversation.UserID = stringList[1]
conversation.ConversationType = constant.SingleChatType conversation.ConversationType = constant.SingleChatType
case "group": case "group":