From ef4d0c3c42d4e905543db8f84d80543ffebc36d0 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Wed, 6 Apr 2022 15:33:16 +0800 Subject: [PATCH 1/3] log --- cmd/open_im_api/main.go | 7 ++++++- cmd/open_im_cms_api/main.go | 2 ++ cmd/open_im_demo/main.go | 7 ++++++- cmd/open_im_msg_gateway/main.go | 2 ++ cmd/open_im_msg_transfer/main.go | 2 ++ cmd/open_im_push/main.go | 2 ++ cmd/rpc/open_im_admin_cms/main.go | 3 ++- cmd/rpc/open_im_auth/main.go | 2 ++ cmd/rpc/open_im_friend/main.go | 2 ++ cmd/rpc/open_im_group/main.go | 2 ++ cmd/rpc/open_im_message_cms/main.go | 2 ++ cmd/rpc/open_im_msg/main.go | 2 ++ cmd/rpc/open_im_office/main.go | 2 ++ cmd/rpc/open_im_statistics/main.go | 2 ++ cmd/rpc/open_im_user/main.go | 2 ++ 15 files changed, 38 insertions(+), 3 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 342d4a03a..6bbb43dbc 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -14,6 +14,7 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/utils" "flag" + "fmt" "io" "os" "strconv" @@ -138,5 +139,9 @@ func main() { go apiThird.MinioInit() ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port") flag.Parse() - r.Run(":" + strconv.Itoa(*ginPort)) + fmt.Println("start api server, port: ", *ginPort) + err := r.Run(":" + strconv.Itoa(*ginPort)) + if err != nil { + log.Error("", "run failed ", *ginPort, err.Error()) + } } diff --git a/cmd/open_im_cms_api/main.go b/cmd/open_im_cms_api/main.go index df39c4672..262020fea 100644 --- a/cmd/open_im_cms_api/main.go +++ b/cmd/open_im_cms_api/main.go @@ -3,6 +3,7 @@ package main import ( "Open_IM/internal/cms_api" "Open_IM/pkg/utils" + "fmt" "github.com/gin-gonic/gin" ) @@ -11,5 +12,6 @@ func main() { gin.SetMode(gin.ReleaseMode) router := cms_api.NewGinRouter() router.Use(utils.CorsHandler()) + fmt.Println("start cms api server, port: ", 8000) router.Run(":" + "8000") } diff --git a/cmd/open_im_demo/main.go b/cmd/open_im_demo/main.go index c35675e20..af7809547 100644 --- a/cmd/open_im_demo/main.go +++ b/cmd/open_im_demo/main.go @@ -4,6 +4,7 @@ import ( "Open_IM/internal/demo/register" "Open_IM/pkg/utils" "flag" + "fmt" "io" "os" "strconv" @@ -33,5 +34,9 @@ func main() { ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port") flag.Parse() - r.Run(":" + strconv.Itoa(*ginPort)) + fmt.Println("start demo api server, port: ", *ginPort) + err := r.Run(":" + strconv.Itoa(*ginPort)) + if err != nil { + log.Error("", "run failed ", *ginPort, err.Error()) + } } diff --git a/cmd/open_im_msg_gateway/main.go b/cmd/open_im_msg_gateway/main.go index 5296c9bcf..283f831b8 100644 --- a/cmd/open_im_msg_gateway/main.go +++ b/cmd/open_im_msg_gateway/main.go @@ -5,6 +5,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "flag" + "fmt" "sync" ) @@ -15,6 +16,7 @@ func main() { flag.Parse() var wg sync.WaitGroup wg.Add(1) + fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort) gate.Init(*rpcPort, *wsPort) gate.Run() wg.Wait() diff --git a/cmd/open_im_msg_transfer/main.go b/cmd/open_im_msg_transfer/main.go index 2a54ac1d8..9dfabecda 100644 --- a/cmd/open_im_msg_transfer/main.go +++ b/cmd/open_im_msg_transfer/main.go @@ -4,6 +4,7 @@ import ( "Open_IM/internal/msg_transfer/logic" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" + "fmt" "sync" ) @@ -12,6 +13,7 @@ func main() { wg.Add(1) log.NewPrivateLog(constant.LogFileName) logic.Init() + fmt.Println("start msg_transfer server") logic.Run() wg.Wait() } diff --git a/cmd/open_im_push/main.go b/cmd/open_im_push/main.go index ba8dc65c1..95e8521dd 100644 --- a/cmd/open_im_push/main.go +++ b/cmd/open_im_push/main.go @@ -5,6 +5,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "flag" + "fmt" "sync" ) @@ -14,6 +15,7 @@ func main() { var wg sync.WaitGroup wg.Add(1) log.NewPrivateLog(constant.LogFileName) + fmt.Println("start push rpc server, port: ", *rpcPort) logic.Init(*rpcPort) logic.Run() wg.Wait() diff --git a/cmd/rpc/open_im_admin_cms/main.go b/cmd/rpc/open_im_admin_cms/main.go index eae1a4505..c69135645 100644 --- a/cmd/rpc/open_im_admin_cms/main.go +++ b/cmd/rpc/open_im_admin_cms/main.go @@ -3,12 +3,13 @@ package main import ( rpcMessageCMS "Open_IM/internal/rpc/admin_cms" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 11000, "rpc listening port") flag.Parse() + fmt.Println("start cms rpc server, port: ", *rpcPort) rpcServer := rpcMessageCMS.NewAdminCMSServer(*rpcPort) rpcServer.Run() } - diff --git a/cmd/rpc/open_im_auth/main.go b/cmd/rpc/open_im_auth/main.go index 110ea05c6..53b0f9de5 100644 --- a/cmd/rpc/open_im_auth/main.go +++ b/cmd/rpc/open_im_auth/main.go @@ -3,11 +3,13 @@ package main import ( rpcAuth "Open_IM/internal/rpc/auth" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800") flag.Parse() + fmt.Println("start auth rpc server, port: ", *rpcPort) rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort) rpcServer.Run() diff --git a/cmd/rpc/open_im_friend/main.go b/cmd/rpc/open_im_friend/main.go index 0847699c5..85d05e39c 100644 --- a/cmd/rpc/open_im_friend/main.go +++ b/cmd/rpc/open_im_friend/main.go @@ -3,12 +3,14 @@ package main import ( "Open_IM/internal/rpc/friend" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10200, "get RpcFriendPort from cmd,default 12000 as port") flag.Parse() + fmt.Println("start friend rpc server, port: ", *rpcPort) rpcServer := friend.NewFriendServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_group/main.go b/cmd/rpc/open_im_group/main.go index 8a3f886cb..7afc7ec57 100644 --- a/cmd/rpc/open_im_group/main.go +++ b/cmd/rpc/open_im_group/main.go @@ -3,11 +3,13 @@ package main import ( "Open_IM/internal/rpc/group" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10500, "get RpcGroupPort from cmd,default 16000 as port") flag.Parse() + fmt.Println("start group rpc server, port: ", *rpcPort) rpcServer := group.NewGroupServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_message_cms/main.go b/cmd/rpc/open_im_message_cms/main.go index 0980d3629..16151a2ed 100644 --- a/cmd/rpc/open_im_message_cms/main.go +++ b/cmd/rpc/open_im_message_cms/main.go @@ -3,11 +3,13 @@ package main import ( rpcMessageCMS "Open_IM/internal/rpc/message_cms" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10900, "rpc listening port") flag.Parse() + fmt.Println("start msg cms rpc server, port: ", *rpcPort) rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_msg/main.go b/cmd/rpc/open_im_msg/main.go index 7344facf4..95908f48a 100644 --- a/cmd/rpc/open_im_msg/main.go +++ b/cmd/rpc/open_im_msg/main.go @@ -3,11 +3,13 @@ package main import ( rpcChat "Open_IM/internal/rpc/msg" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10300, "rpc listening port") flag.Parse() + fmt.Println("start msg rpc server, port: ", *rpcPort) rpcServer := rpcChat.NewRpcChatServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_office/main.go b/cmd/rpc/open_im_office/main.go index c4d80cf68..c9a05c791 100644 --- a/cmd/rpc/open_im_office/main.go +++ b/cmd/rpc/open_im_office/main.go @@ -3,11 +3,13 @@ package main import ( rpc "Open_IM/internal/rpc/office" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 11100, "rpc listening port") flag.Parse() + fmt.Println("start office rpc server, port: ", *rpcPort) rpcServer := rpc.NewOfficeServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_statistics/main.go b/cmd/rpc/open_im_statistics/main.go index f1f950288..b87440abf 100644 --- a/cmd/rpc/open_im_statistics/main.go +++ b/cmd/rpc/open_im_statistics/main.go @@ -3,11 +3,13 @@ package main import ( "Open_IM/internal/rpc/statistics" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10800, "rpc listening port") flag.Parse() + fmt.Println("start statistics rpc server, port: ", *rpcPort) rpcServer := statistics.NewStatisticsServer(*rpcPort) rpcServer.Run() } diff --git a/cmd/rpc/open_im_user/main.go b/cmd/rpc/open_im_user/main.go index 91b6e55b5..d8644d028 100644 --- a/cmd/rpc/open_im_user/main.go +++ b/cmd/rpc/open_im_user/main.go @@ -3,11 +3,13 @@ package main import ( "Open_IM/internal/rpc/user" "flag" + "fmt" ) func main() { rpcPort := flag.Int("port", 10100, "rpc listening port") flag.Parse() + fmt.Println("start user rpc server, port: ", *rpcPort) rpcServer := user.NewUserServer(*rpcPort) rpcServer.Run() } From 42225dd35e682b99df450a072eb6baf131dfd7c8 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Wed, 6 Apr 2022 15:54:59 +0800 Subject: [PATCH 2/3] log --- .../mysql_model/im_mysql_model/demo_model.go | 2 +- .../im_mysql_model/group_member_model.go | 4 ++-- .../im_mysql_model/group_request_model.go | 2 +- .../mysql_model/im_mysql_model/message_cms.go | 6 ++--- .../im_mysql_model/statistics_model.go | 22 ++++++++--------- .../mysql_model/im_mysql_model/user_model.go | 24 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go index 897e5e212..eff3050be 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go @@ -33,7 +33,7 @@ func ResetPassword(account, password string) error { Password: password, } dbConn, err := db.DB.MysqlDB.DefaultGormDB() - dbConn.LogMode(true) + dbConn.LogMode(false) if err != nil { return err } diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index b0ffbd4ee..289a157fc 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -71,7 +71,7 @@ func GetGroupMemberIDListByGroupID(groupID string) ([]string, error) { if err != nil { return nil, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var groupMembers []db.GroupMember err = dbConn.Table("group_members").Select("user_id").Where("group_id=?", groupID).Find(&groupMembers).Error if err != nil { @@ -279,7 +279,7 @@ func GetGroupMembersCount(groupId, userName string) (int32, error) { if err != nil { return count, err } - dbConn.LogMode(true) + dbConn.LogMode(false) if err := dbConn.Table("group_members").Where("group_id=?", groupId).Where(fmt.Sprintf(" nickname like '%%%s%%' ", userName)).Count(&count).Error; err != nil { return count, err } diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go index 836f3f0bf..5e27cc3d2 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_request_model.go @@ -123,7 +123,7 @@ func GetUserReqGroupByUserID(userID string) ([]db.GroupRequest, error) { if err != nil { return nil, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("group_requests").Where("user_id=?", userID).Find(&groupRequestList).Error return groupRequestList, err } diff --git a/pkg/common/db/mysql_model/im_mysql_model/message_cms.go b/pkg/common/db/mysql_model/im_mysql_model/message_cms.go index eb4b0cc52..29fb650cf 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/message_cms.go +++ b/pkg/common/db/mysql_model/im_mysql_model/message_cms.go @@ -13,7 +13,7 @@ func GetChatLog(chatLog db.ChatLog, pageNumber, showNumber int32) ([]db.ChatLog, if err != nil { return chatLogs, err } - dbConn.LogMode(true) + dbConn.LogMode(false) db := dbConn.Table("chat_logs"). Where(fmt.Sprintf(" content like '%%%s%%'", chatLog.Content)). Limit(showNumber).Offset(showNumber * (pageNumber - 1)) @@ -43,7 +43,7 @@ func GetChatLogCount(chatLog db.ChatLog) (int64, error) { if err != nil { return count, err } - dbConn.LogMode(true) + dbConn.LogMode(false) db := dbConn.Table("chat_logs"). Where(fmt.Sprintf(" content like '%%%s%%'", chatLog.Content)) if chatLog.SessionType != 0 { @@ -65,4 +65,4 @@ func GetChatLogCount(chatLog db.ChatLog) (int64, error) { err = db.Find(&chatLogs).Count(&count).Error return count, err -} \ No newline at end of file +} diff --git a/pkg/common/db/mysql_model/im_mysql_model/statistics_model.go b/pkg/common/db/mysql_model/im_mysql_model/statistics_model.go index 097c83185..aa07c1688 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/statistics_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/statistics_model.go @@ -10,7 +10,7 @@ func GetActiveUserNum(from, to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("chat_logs").Select("count(distinct(send_id))").Where("create_time >= ? and create_time <= ?", from, to).Count(&num).Error return num, err @@ -21,7 +21,7 @@ func GetIncreaseUserNum(from, to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("users").Where("create_time >= ? and create_time <= ?", from, to).Count(&num).Error return num, err @@ -32,7 +32,7 @@ func GetTotalUserNum() (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("users").Count(&num).Error return num, err @@ -43,7 +43,7 @@ func GetTotalUserNumByDate(to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("users").Where("create_time <= ?", to).Count(&num).Error return num, err @@ -54,7 +54,7 @@ func GetPrivateMessageNum(from, to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("chat_logs").Where("create_time >= ? and create_time <= ? and session_type = ?", from, to, 1).Count(&num).Error return num, err @@ -65,7 +65,7 @@ func GetGroupMessageNum(from, to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("chat_logs").Where("create_time >= ? and create_time <= ? and session_type = ?", from, to, 2).Count(&num).Error return num, err @@ -76,7 +76,7 @@ func GetIncreaseGroupNum(from, to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("groups").Where("create_time >= ? and create_time <= ?", from, to).Count(&num).Error return num, err @@ -87,7 +87,7 @@ func GetTotalGroupNum() (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("groups").Count(&num).Error return num, err @@ -98,7 +98,7 @@ func GetGroupNum(to time.Time) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var num int32 err = dbConn.Table("groups").Where("create_time <= ?", to).Count(&num).Error return num, err @@ -116,7 +116,7 @@ func GetActiveGroups(from, to time.Time, limit int) ([]*activeGroup, error) { if err != nil { return activeGroups, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("chat_logs").Select("recv_id, count(*) as message_num").Where("create_time >= ? and create_time <= ? and session_type = ?", from, to, 2).Group("recv_id").Limit(limit).Order("message_num DESC").Find(&activeGroups).Error for _, activeGroup := range activeGroups { group := db.Group{ @@ -140,7 +140,7 @@ func GetActiveUsers(from, to time.Time, limit int) ([]*activeUser, error) { if err != nil { return activeUsers, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("chat_logs").Select("send_id, count(*) as message_num").Where("create_time >= ? and create_time <= ? and session_type = ?", from, to, 1).Group("send_id").Limit(limit).Order("message_num DESC").Find(&activeUsers).Error for _, activeUser := range activeUsers { user := db.User{ diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index 5719371c5..003b7afa7 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -92,7 +92,7 @@ func UpdateUserInfo(user db.User) error { if err != nil { return err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("users").Where("user_id=?", user.UserID).Update(&user).Error return err } @@ -112,7 +112,7 @@ func SelectAllUserID() ([]string, error) { func SelectSomeUserID(userIDList []string) ([]string, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() - dbConn.LogMode(true) + dbConn.LogMode(false) if err != nil { return nil, err } @@ -131,7 +131,7 @@ func GetUsers(showNumber, pageNumber int32) ([]db.User, error) { if err != nil { return users, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("users").Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&users).Error if err != nil { return users, err @@ -204,7 +204,7 @@ func UnBlockUser(userId string) error { if err != nil { return err } - dbConn.LogMode(true) + dbConn.LogMode(false) result := dbConn.Where("uid=?", userId).Delete(&db.BlackList{}) return result.Error } @@ -248,7 +248,7 @@ func GetBlockUsers(showNumber, pageNumber int32) ([]BlockUserInfo, error) { if err != nil { return blockUserInfos, err } - dbConn.LogMode(true) + dbConn.LogMode(false) if err = dbConn.Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&blockUsers).Error; err != nil { return blockUserInfos, err } @@ -275,7 +275,7 @@ func GetUserByName(userName string, showNumber, pageNumber int32) ([]db.User, er if err != nil { return users, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Table("users").Where(fmt.Sprintf(" name like '%%%s%%' ", userName)).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&users).Error return users, err } @@ -285,7 +285,7 @@ func GetUsersCount(user db.User) (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var count int32 if err := dbConn.Table("users").Where(fmt.Sprintf(" name like '%%%s%%' ", user.Nickname)).Count(&count).Error; err != nil { return 0, err @@ -298,7 +298,7 @@ func GetBlockUsersNumCount() (int32, error) { if err != nil { return 0, err } - dbConn.LogMode(true) + dbConn.LogMode(false) var count int32 if err := dbConn.Model(&db.BlackList{}).Count(&count).Error; err != nil { return 0, err @@ -311,7 +311,7 @@ func SetConversation(conversation db.Conversation) error { if err != nil { return err } - dbConn.LogMode(true) + dbConn.LogMode(false) newConversation := conversation if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 { log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create") @@ -330,7 +330,7 @@ func PeerUserSetConversation(conversation db.Conversation) error { if err != nil { return err } - dbConn.LogMode(true) + dbConn.LogMode(false) newConversation := conversation if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 { log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create") @@ -349,7 +349,7 @@ func SetRecvMsgOpt(conversation db.Conversation) error { if err != nil { return err } - dbConn.LogMode(true) + dbConn.LogMode(false) newConversation := conversation if dbConn.Model(&db.Conversation{}).Find(&newConversation).RowsAffected == 0 { log.NewDebug("", utils.GetSelfFuncName(), "conversation", conversation, "not exist in db, create") @@ -369,7 +369,7 @@ func GetUserAllConversations(ownerUserID string) ([]db.Conversation, error) { if err != nil { return conversations, err } - dbConn.LogMode(true) + dbConn.LogMode(false) err = dbConn.Model(&db.Conversation{}).Where("owner_user_id=?", ownerUserID).Find(&conversations).Error return conversations, err } From 69aba02c9a60a052c8fbbfabe6536b1e79b786fa Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 6 Apr 2022 16:47:22 +0800 Subject: [PATCH 3/3] send tag modify --- internal/rpc/msg/tag_send_msg.go | 11 +++++++---- internal/rpc/office/office.go | 7 ++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/rpc/msg/tag_send_msg.go b/internal/rpc/msg/tag_send_msg.go index 7f0550d62..195640498 100644 --- a/internal/rpc/msg/tag_send_msg.go +++ b/internal/rpc/msg/tag_send_msg.go @@ -3,6 +3,7 @@ package msg import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbChat "Open_IM/pkg/proto/chat" @@ -12,20 +13,22 @@ import ( "strings" ) -func TagSendMessage(operationID, sendID, recvID, content string, senderPlatformID int32) { - log.NewInfo(operationID, utils.GetSelfFuncName(), "args: ", sendID, recvID, content) +func TagSendMessage(operationID string, user *db.User, recvID, content string, senderPlatformID int32) { + log.NewInfo(operationID, utils.GetSelfFuncName(), "args: ", user.UserID, recvID, content) var req pbChat.SendMsgReq var msgData pbCommon.MsgData - msgData.SendID = sendID + msgData.SendID = user.UserID msgData.RecvID = recvID msgData.ContentType = constant.Custom msgData.SessionType = constant.SingleChatType msgData.MsgFrom = constant.UserMsgType msgData.Content = []byte(content) + msgData.SenderFaceURL = user.FaceURL + msgData.SenderNickname = user.Nickname msgData.Options = map[string]bool{} msgData.Options[constant.IsSenderConversationUpdate] = false msgData.CreateTime = utils.GetCurrentTimestampByMill() - msgData.ClientMsgID = utils.GetMsgID(sendID) + msgData.ClientMsgID = utils.GetMsgID(user.UserID) msgData.SenderPlatformID = senderPlatformID req.MsgData = &msgData req.OperationID = operationID diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index b390b99bc..43e757497 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -6,6 +6,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" "Open_IM/pkg/common/db/mysql_model/im_mysql_model" + imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbOffice "Open_IM/pkg/proto/office" @@ -179,8 +180,12 @@ func (s *officeServer) SendMsg2Tag(_ context.Context, req *pbOffice.SendMsg2TagR } } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "total userIDList result: ", userIDList) + us, err := imdb.GetUserByUserID(req.SendID) + if err != nil { + log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.SendID) + } for _, userID := range userIDList { - msg.TagSendMessage(req.OperationID, req.SendID, userID, req.Content, req.SenderPlatformID) + msg.TagSendMessage(req.OperationID, us, userID, req.Content, req.SenderPlatformID) } var tagSendLogs db.TagSendLog for _, userID := range userIDList {