From f383d6c636f205dceaf56a7891bf5e787347857f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 20 Jul 2022 21:26:52 +0800 Subject: [PATCH] rename --- cmd/open_im_api/main.go | 2 +- config/config.yaml | 4 ++-- internal/api/manage/management_chat.go | 2 +- internal/api/{chat => msg}/del_msg.go | 10 +++++----- internal/api/{chat => msg}/get_max_min_seq.go | 6 +++--- internal/api/{chat => msg}/pull_msg.go | 2 +- internal/api/{chat => msg}/send_msg.go | 8 ++++---- internal/msg_transfer/logic/db.go | 2 +- .../msg_transfer/logic/online_history_msg_handler.go | 2 +- .../msg_transfer/logic/online_msg_to_mongo_handler.go | 2 +- internal/msg_transfer/logic/persistent_msg_handler.go | 2 +- internal/rpc/group/group.go | 4 ++-- internal/rpc/user/user.go | 2 +- .../mysql_model/im_mysql_msg_model/chat_log_model.go | 2 +- .../multi_terminal_login/multi_terminal_login.go | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) rename internal/api/{chat => msg}/del_msg.go (98%) rename internal/api/{chat => msg}/get_max_min_seq.go (94%) rename internal/api/{chat => msg}/pull_msg.go (99%) rename internal/api/{chat => msg}/send_msg.go (96%) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index efc9523cc..63be3a496 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -3,11 +3,11 @@ package main import ( _ "Open_IM/cmd/open_im_api/docs" apiAuth "Open_IM/internal/api/auth" - apiChat "Open_IM/internal/api/chat" "Open_IM/internal/api/conversation" "Open_IM/internal/api/friend" "Open_IM/internal/api/group" "Open_IM/internal/api/manage" + apiChat "Open_IM/internal/api/msg" "Open_IM/internal/api/office" "Open_IM/internal/api/organization" apiThird "Open_IM/internal/api/third" diff --git a/config/config.yaml b/config/config.yaml index c552a954d..f72448287 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -230,7 +230,7 @@ secret: tuoyun # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线 multiloginpolicy: 1 -#chat log insert to db +#msg log insert to db chatpersistencemysql: true #可靠性存储 reliablestorage: false @@ -344,7 +344,7 @@ notification: desc: "memberQuit desc" ext: "memberQuit ext" defaultTips: - tips: "quit group chat" # group info changed by xx + tips: "quit group msg" # group info changed by xx groupApplicationAccepted: conversation: diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index a70cbacf2..650c5bbc5 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -13,7 +13,7 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" - pbChat "Open_IM/pkg/proto/chat" + pbChat "Open_IM/pkg/proto/msg" "Open_IM/pkg/proto/sdk_ws" open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" diff --git a/internal/api/chat/del_msg.go b/internal/api/msg/del_msg.go similarity index 98% rename from internal/api/chat/del_msg.go rename to internal/api/msg/del_msg.go index 99b70a0bd..ff3ca19c3 100644 --- a/internal/api/chat/del_msg.go +++ b/internal/api/msg/del_msg.go @@ -1,4 +1,4 @@ -package apiChat +package msg import ( api "Open_IM/pkg/base_info" @@ -61,7 +61,7 @@ func DelMsg(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - msgClient := rpc.NewChatClient(grpcConn) + msgClient := rpc.NewMsgClient(grpcConn) respPb, err := msgClient.DelMsgList(context.Background(), &reqPb) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "DelMsgList failed", err.Error(), reqPb) @@ -134,7 +134,7 @@ func DelSuperGroupMsg(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - client := rpc.NewChatClient(etcdConn) + client := rpc.NewMsgClient(etcdConn) log.Info(req.OperationID, "", "api DelSuperGroupMsg call, api call rpc...") @@ -193,7 +193,7 @@ func ClearMsg(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - client := rpc.NewChatClient(etcdConn) + client := rpc.NewMsgClient(etcdConn) RpcResp, err := client.ClearMsg(context.Background(), req) if err != nil { log.NewError(req.OperationID, " CleanUpMsg failed ", err.Error(), req.String(), RpcResp.ErrMsg) @@ -241,7 +241,7 @@ func SetMsgMinSeq(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - client := rpc.NewChatClient(etcdConn) + client := rpc.NewMsgClient(etcdConn) RpcResp, err := client.SetMsgMinSeq(context.Background(), req) if err != nil { log.NewError(req.OperationID, " SetMsgMinSeq failed ", err.Error(), req.String(), RpcResp.ErrMsg) diff --git a/internal/api/chat/get_max_min_seq.go b/internal/api/msg/get_max_min_seq.go similarity index 94% rename from internal/api/chat/get_max_min_seq.go rename to internal/api/msg/get_max_min_seq.go index 5dd339690..193fc9322 100644 --- a/internal/api/chat/get_max_min_seq.go +++ b/internal/api/msg/get_max_min_seq.go @@ -1,4 +1,4 @@ -package apiChat +package msg import ( "Open_IM/pkg/common/config" @@ -35,7 +35,7 @@ func GetSeq(c *gin.Context) { pbData := sdk_ws.GetMaxAndMinSeqReq{} pbData.UserID = params.SendID pbData.OperationID = params.OperationID - grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, pbData.OperationID) + grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID) if grpcConn == nil { errMsg := pbData.OperationID + " getcdv3.GetConn == nil" log.NewError(pbData.OperationID, errMsg) @@ -43,7 +43,7 @@ func GetSeq(c *gin.Context) { return } - msgClient := pbChat.NewChatClient(grpcConn) + msgClient := pbChat.NewMsgClient(grpcConn) reply, err := msgClient.GetMaxAndMinSeq(context.Background(), &pbData) if err != nil { log.NewError(params.OperationID, "UserGetSeq rpc failed, ", params, err.Error()) diff --git a/internal/api/chat/pull_msg.go b/internal/api/msg/pull_msg.go similarity index 99% rename from internal/api/chat/pull_msg.go rename to internal/api/msg/pull_msg.go index b6e3a8803..418c3b708 100644 --- a/internal/api/chat/pull_msg.go +++ b/internal/api/msg/pull_msg.go @@ -1,4 +1,4 @@ -package apiChat +package msg import ( "Open_IM/pkg/common/config" diff --git a/internal/api/chat/send_msg.go b/internal/api/msg/send_msg.go similarity index 96% rename from internal/api/chat/send_msg.go rename to internal/api/msg/send_msg.go index af5bf5d7b..7b41d0866 100644 --- a/internal/api/chat/send_msg.go +++ b/internal/api/msg/send_msg.go @@ -1,9 +1,9 @@ -package apiChat +package msg import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" - pbChat "Open_IM/pkg/proto/chat" + pbChat "Open_IM/pkg/proto/msg" open_im_sdk "Open_IM/pkg/proto/sdk_ws" "context" @@ -71,14 +71,14 @@ func SendMsg(c *gin.Context) { pbData := newUserSendMsgReq(token, ¶ms) log.Info(params.OperationID, "", "api SendMsg call start..., [data: %s]", pbData.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName, params.OperationID) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID) if etcdConn == nil { errMsg := params.OperationID + "getcdv3.GetConn == nil" log.NewError(params.OperationID, errMsg) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - client := pbChat.NewChatClient(etcdConn) + client := pbChat.NewMsgClient(etcdConn) log.Info("", "", "api SendMsg call, api call rpc...") diff --git a/internal/msg_transfer/logic/db.go b/internal/msg_transfer/logic/db.go index 579cdedf3..ee6e5ea2c 100644 --- a/internal/msg_transfer/logic/db.go +++ b/internal/msg_transfer/logic/db.go @@ -3,7 +3,7 @@ package logic import ( "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - pbMsg "Open_IM/pkg/proto/chat" + pbMsg "Open_IM/pkg/proto/msg" "Open_IM/pkg/utils" ) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 908d28b27..35cb2a0e8 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -7,7 +7,7 @@ import ( kfk "Open_IM/pkg/common/kafka" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" - pbMsg "Open_IM/pkg/proto/chat" + pbMsg "Open_IM/pkg/proto/msg" pbPush "Open_IM/pkg/proto/push" "Open_IM/pkg/utils" "context" diff --git a/internal/msg_transfer/logic/online_msg_to_mongo_handler.go b/internal/msg_transfer/logic/online_msg_to_mongo_handler.go index dae6571f8..42efdc428 100644 --- a/internal/msg_transfer/logic/online_msg_to_mongo_handler.go +++ b/internal/msg_transfer/logic/online_msg_to_mongo_handler.go @@ -6,7 +6,7 @@ import ( "Open_IM/pkg/common/db" kfk "Open_IM/pkg/common/kafka" "Open_IM/pkg/common/log" - pbMsg "Open_IM/pkg/proto/chat" + pbMsg "Open_IM/pkg/proto/msg" server_api_params "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "github.com/Shopify/sarama" diff --git a/internal/msg_transfer/logic/persistent_msg_handler.go b/internal/msg_transfer/logic/persistent_msg_handler.go index 4a313d1ad..4aa004edc 100644 --- a/internal/msg_transfer/logic/persistent_msg_handler.go +++ b/internal/msg_transfer/logic/persistent_msg_handler.go @@ -12,7 +12,7 @@ import ( "Open_IM/pkg/common/db/mysql_model/im_mysql_msg_model" kfk "Open_IM/pkg/common/kafka" "Open_IM/pkg/common/log" - pbMsg "Open_IM/pkg/proto/chat" + pbMsg "Open_IM/pkg/proto/msg" "Open_IM/pkg/utils" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 80ff7545f..cb0a36592 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1909,10 +1909,10 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr if req.RoleLevel != nil { switch req.RoleLevel.Value { case constant.GroupOrdinaryUsers: - //chat.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToOrdinaryUserNotification) + //msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToOrdinaryUserNotification) chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID) case constant.GroupAdmin, constant.GroupOwner: - //chat.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToAdminNotification) + //msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToAdminNotification) chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID) } } else { diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 3d56a527a..072fc7a8c 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -151,7 +151,7 @@ func (s *userServer) BatchSetConversations(ctx context.Context, req *pbUser.Batc continue } resp.Success = append(resp.Success, v.ConversationID) - // if is set private chat operation，then peer user need to sync and set tips\ + // if is set private msg operation，then peer user need to sync and set tips\ if v.ConversationType == constant.SingleChatType && req.NotificationType == constant.ConversationPrivateChatNotification { if err := syncPeerUserConversation(v, req.OperationID); err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "syncPeerUserConversation", err.Error()) diff --git a/pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go b/pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go index 5f7ef59f7..a2d2f3963 100644 --- a/pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go +++ b/pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go @@ -10,7 +10,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - pbMsg "Open_IM/pkg/proto/chat" + pbMsg "Open_IM/pkg/proto/msg" "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "github.com/golang/protobuf/jsonpb" diff --git a/pkg/common/multi_terminal_login/multi_terminal_login.go b/pkg/common/multi_terminal_login/multi_terminal_login.go index 3c3245e63..817ab1b9d 100644 --- a/pkg/common/multi_terminal_login/multi_terminal_login.go +++ b/pkg/common/multi_terminal_login/multi_terminal_login.go @@ -7,7 +7,7 @@ package multi_terminal_login // "Open_IM/pkg/common/config" // "Open_IM/pkg/common/constant" // "Open_IM/pkg/common/db" -// pbChat "Open_IM/pkg/proto/chat" +// pbChat "Open_IM/pkg/proto/msg" // "Open_IM/pkg/utils" //) //