From f586ab1ac2233b6fbca19fc9172f928d87d85fd1 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 23 Feb 2023 19:15:30 +0800 Subject: [PATCH] push --- cmd/api/main.go | 190 +------ cmd/cmdutils/main.go | 12 +- cmd/crontask/main.go | 2 +- cmd/msggateway/main.go | 8 +- cmd/msgtransfer/main.go | 8 +- cmd/push/main.go | 8 +- cmd/rpc/auth/main.go | 6 +- cmd/rpc/conversation/main.go | 6 +- cmd/rpc/friend/main.go | 6 +- cmd/rpc/group/main.go | 6 +- cmd/rpc/msg/main.go | 6 +- cmd/rpc/user/main.go | 6 +- cmdutils/mongo/cmd/main.go | 4 +- cmdutils/mongo/mongo_utils.go | 4 +- config/config.yaml | 28 +- config/usualConfig.yaml | 43 -- go.mod | 2 +- internal/api/auth/auth.go | 16 +- internal/api/conversation/conversation.go | 12 +- internal/api/friend/friend.go | 18 +- internal/api/friend/friend1.go | 8 +- internal/api/group/group.go | 22 +- internal/api/group/group_test.go | 4 +- internal/api/group/super_group.go | 16 +- internal/api/manage/management_chat.go | 16 +- internal/api/manage/management_user.go | 16 +- internal/api/msg/del_msg.go | 16 +- internal/api/msg/extend_msg.go | 14 +- internal/api/msg/get_max_min_seq.go | 10 +- internal/api/msg/pull_msg.go | 12 +- internal/api/msg/send_msg.go | 8 +- internal/api/route.go | 169 ++++++ internal/api/third/ali_oss_credential.go | 12 +- internal/api/third/aws_storage_credential.go | 14 +- internal/api/third/fcm_update_token.go | 10 +- internal/api/third/minio_init.go | 8 +- .../api/third/minio_storage_credential.go | 16 +- internal/api/third/rtc.go | 10 +- internal/api/third/set_app_badge.go | 10 +- .../third/tencent_cloud_storage_credential.go | 12 +- internal/api/user/user.go | 20 +- internal/api2rpc/api.go | 8 +- internal/common/check/access.go | 2 +- internal/common/check/black.go | 2 +- internal/common/check/conversation.go | 8 +- internal/common/check/friend.go | 10 +- internal/common/check/group.go | 12 +- internal/common/check/msg.go | 8 +- internal/common/check/user.go | 12 +- internal/common/convert/convert.go | 10 +- internal/common/notification/c.go | 17 +- internal/common/notification/conversation.go | 6 +- internal/common/notification/extend_msg.go | 12 +- internal/common/notification/friend.go | 8 +- internal/common/notification/group.go | 16 +- internal/common/notification/msg.go | 4 +- internal/common/notification/super_group.go | 2 +- internal/common/notification/user.go | 4 +- internal/common/rpcserver/register.go | 8 +- internal/msggateway/batch_push.go | 10 +- internal/msggateway/callback.go | 10 +- internal/msggateway/init.go | 8 +- internal/msggateway/logic.go | 18 +- internal/msggateway/new/client.go | 4 +- internal/msggateway/new/compressor.go | 2 +- internal/msggateway/new/context.go | 2 +- internal/msggateway/new/encoder.go | 2 +- internal/msggateway/new/http_error.go | 2 +- internal/msggateway/new/message_handler.go | 8 +- internal/msggateway/new/n_ws_server.go | 6 +- internal/msggateway/relay_rpc_server.go | 16 +- internal/msggateway/validate.go | 10 +- internal/msggateway/ws_server.go | 14 +- internal/msgtransfer/init.go | 4 +- internal/msgtransfer/modify_msg_handler.go | 24 +- .../msgtransfer/online_history_msg_handler.go | 22 +- .../online_msg_to_mongo_handler.go | 20 +- .../msgtransfer/persistent_msg_handler.go | 14 +- internal/push/callback.go | 14 +- internal/push/fcm/push.go | 8 +- internal/push/fcm/push_test.go | 4 +- internal/push/getui/body.go | 2 +- internal/push/getui/push.go | 16 +- internal/push/init.go | 16 +- internal/push/jpush/body/notification.go | 2 +- internal/push/jpush/body/platform.go | 2 +- internal/push/jpush/push.go | 8 +- internal/push/push_handler.go | 18 +- internal/push/push_rpc_server.go | 16 +- internal/push/push_to_client.go | 24 +- internal/rpc/auth/auth.go | 28 +- internal/rpc/conversation/conversaion.go | 20 +- internal/rpc/friend/black.go | 10 +- internal/rpc/friend/callback.go | 12 +- internal/rpc/friend/friend.go | 26 +- internal/rpc/group/callback.go | 18 +- internal/rpc/group/copy.go | 6 +- internal/rpc/group/db_map.go | 4 +- internal/rpc/group/group.go | 30 +- internal/rpc/group/super_group.go | 12 +- internal/rpc/msg/callback.go | 14 +- internal/rpc/msg/delete.go | 12 +- internal/rpc/msg/extend_msg.go | 12 +- internal/rpc/msg/extend_msg_callback.go | 12 +- internal/rpc/msg/msg_status.go | 6 +- internal/rpc/msg/send_msg.go | 12 +- internal/rpc/msg/send_pull.go | 12 +- internal/rpc/msg/server.go | 18 +- internal/rpc/msg/utils.go | 8 +- internal/rpc/user/user.go | 28 +- internal/startrpc/start.go | 12 +- internal/task/clear_msg.go | 20 +- internal/task/clear_msg_test.go | 4 +- internal/task/cron_task.go | 14 +- internal/tx/mongo.go | 2 +- pkg/apistruct/group.go | 2 +- pkg/apistruct/manage.go | 4 +- pkg/apistruct/msg.go | 4 +- pkg/apistruct/user.go | 2 +- pkg/callbackstruct/common.go | 2 +- pkg/callbackstruct/group.go | 4 +- pkg/callbackstruct/message.go | 4 +- pkg/callbackstruct/push.go | 2 +- pkg/common/config/config.go | 535 +++++++----------- pkg/common/db/cache/black.go | 6 +- pkg/common/db/cache/conversation.go | 8 +- pkg/common/db/cache/extend_msg_set.go | 6 +- pkg/common/db/cache/friend.go | 8 +- pkg/common/db/cache/group.go | 8 +- pkg/common/db/cache/redis.go | 12 +- pkg/common/db/cache/redis_test.go | 6 +- pkg/common/db/cache/rockscache.go | 2 +- pkg/common/db/cache/token.go | 6 +- pkg/common/db/cache/user.go | 8 +- pkg/common/db/controller/auth.go | 2 +- pkg/common/db/controller/black.go | 4 +- pkg/common/db/controller/chatlog.go | 6 +- pkg/common/db/controller/conversation.go | 12 +- pkg/common/db/controller/extend_msg.go | 4 +- pkg/common/db/controller/friend.go | 8 +- pkg/common/db/controller/group.go | 12 +- pkg/common/db/controller/msg.go | 21 +- pkg/common/db/controller/push.go | 2 +- pkg/common/db/controller/user.go | 6 +- pkg/common/db/localcache/conversation.go | 6 +- pkg/common/db/localcache/group.go | 8 +- pkg/common/db/relation/black_model.go | 6 +- pkg/common/db/relation/chat_log_model.go | 10 +- pkg/common/db/relation/conversation_model.go | 8 +- pkg/common/db/relation/friend_model.go | 6 +- .../db/relation/friend_request_model.go | 6 +- pkg/common/db/relation/group_member_model.go | 8 +- pkg/common/db/relation/group_model.go | 6 +- pkg/common/db/relation/group_request_model.go | 6 +- pkg/common/db/relation/mysql_init.go | 2 +- pkg/common/db/relation/user_model.go | 6 +- pkg/common/db/relation/utils.go | 2 +- pkg/common/db/table/relation/chatlog.go | 2 +- .../db/table/unrelation/extend_msg_set.go | 2 +- pkg/common/db/table/unrelation/msg.go | 4 +- pkg/common/db/unrelation/extend_msg.go | 6 +- pkg/common/db/unrelation/mongo.go | 6 +- pkg/common/db/unrelation/msg.go | 6 +- pkg/common/db/unrelation/super_group.go | 6 +- pkg/common/http/http_client.go | 6 +- pkg/common/kafka/consumer.go | 2 +- pkg/common/kafka/producer.go | 8 +- pkg/common/log/es_hk.go | 2 +- pkg/common/log/file_line_hk.go | 2 +- pkg/common/log/logrus.go | 4 +- pkg/common/middleware/rpc.go | 8 +- pkg/common/prome/grpc.go | 2 +- pkg/common/prome/prometheus.go | 2 +- pkg/common/tokenverify/jwt_token.go | 8 +- pkg/common/tracelog/ctx.go | 2 +- pkg/errs/coderr.go | 2 +- pkg/proto/auth/auth.pb.go | 4 +- pkg/proto/auth/auth.proto | 2 +- pkg/proto/auto_proto.sh | 8 +- pkg/proto/conversation/conversation.pb.go | 2 +- pkg/proto/conversation/conversation.proto | 2 +- pkg/proto/file/file.proto | 2 +- pkg/proto/friend/friend.pb.go | 4 +- pkg/proto/friend/friend.proto | 2 +- pkg/proto/group/group.pb.go | 4 +- pkg/proto/group/group.proto | 2 +- pkg/proto/msg/msg.pb.go | 4 +- pkg/proto/msg/msg.proto | 2 +- pkg/proto/msggateway/relay.pb.go | 4 +- pkg/proto/msggateway/relay.proto | 2 +- pkg/proto/push/push.pb.go | 4 +- pkg/proto/push/push.proto | 2 +- pkg/proto/rtc/rtc.pb.go | 2 +- pkg/proto/rtc/rtc.proto | 2 +- pkg/proto/sdk_ws/group.proto | 2 +- pkg/proto/sdkws/ws.pb.go | 2 +- pkg/proto/sdkws/ws.proto | 2 +- pkg/proto/user/user.pb.go | 6 +- pkg/proto/user/user.proto | 2 +- pkg/statistics/statistics.go | 2 +- pkg/utils/callback.go | 4 +- pkg/utils/file.go | 2 +- pkg/utils/jwt_token_test.go | 6 +- pkg/utils/platform_number_id_to_name_test.go | 2 +- pkg/utils/strings.go | 2 +- 205 files changed, 1216 insertions(+), 1377 deletions(-) delete mode 100644 config/usualConfig.yaml create mode 100644 internal/api/route.go diff --git a/cmd/api/main.go b/cmd/api/main.go index 1e590de68..fdc11912f 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -1,201 +1,31 @@ package main import ( - apiAuth "Open_IM/internal/api/auth" - "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" - apiThird "Open_IM/internal/api/third" - "Open_IM/internal/api/user" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/middleware" - "Open_IM/pkg/common/tokenverify" + "OpenIM/internal/api" + "OpenIM/internal/api/third" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" "flag" "fmt" - "io" - "os" "strconv" - swaggerFiles "github.com/swaggo/files" - ginSwagger "github.com/swaggo/gin-swagger" - - "github.com/gin-gonic/gin" - //"syscall" - "Open_IM/pkg/common/constant" - prome "Open_IM/pkg/common/prome" + "OpenIM/pkg/common/constant" ) -// @title open-IM-Server API -// @version 1.0 -// @description open-IM-Server 的API服务器文档, 文档中所有请求都有一个operationID字段用于链路追踪 - -// @license.name Apache 2.0 -// @license.url http://www.apache.org/licenses/LICENSE-2.0.html -// @BasePath / func main() { log.NewPrivateLog(constant.LogFileName) - gin.SetMode(gin.ReleaseMode) - f, _ := os.Create("../logs/api.log") - gin.DefaultWriter = io.MultiWriter(f) - // gin.SetMode(gin.DebugMode) - r := gin.New() - r.Use(gin.Recovery()) - r.Use(middleware.GinParseOperationID) - log.Info("load config: ", config.Config) - r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) - if config.Config.Prometheus.Enable { - prome.NewApiRequestCounter() - prome.NewApiRequestFailedCounter() - prome.NewApiRequestSuccessCounter() - r.Use(prome.PromeTheusMiddleware) - r.GET("/metrics", prome.PrometheusHandler()) - } - // user routing group, which handles user registration and login services - userRouterGroup := r.Group("/user") - { - userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1 - userRouterGroup.POST("/set_global_msg_recv_opt", user.SetGlobalRecvMessageOpt) - userRouterGroup.POST("/get_users_info", user.GetUsersPublicInfo) //1 - userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1 - userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1 - userRouterGroup.POST("/get_users_info_from_cache", user.GetUsersInfoFromCache) - userRouterGroup.POST("/get_user_friend_from_cache", user.GetFriendIDListFromCache) - userRouterGroup.POST("/get_black_list_from_cache", user.GetBlackIDListFromCache) - userRouterGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) //1 - userRouterGroup.POST("/account_check", manage.AccountCheck) //1 - // userRouterGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1 - userRouterGroup.POST("/get_users", user.GetUsers) - } - ////friend routing group - friendRouterGroup := r.Group("/friend") - { - // friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo) - friendRouterGroup.POST("/add_friend", friend.AddFriend) //1 - friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) //1 - friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1 - friendRouterGroup.POST("/get_self_friend_apply_list", friend.GetSelfApplyList) //1 - friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) //1 - friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1 - friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark) //1 - - friendRouterGroup.POST("/add_black", friend.AddBlack) //1 - friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1 - friendRouterGroup.POST("/remove_black", friend.RemoveBlacklist) //1 - - friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1 - friendRouterGroup.POST("/is_friend", friend.IsFriend) //1 - } - //group related routing group - groupRouterGroup := r.Group("/group") - groupRouterGroup.Use(func(c *gin.Context) { - userID, err := tokenverify.ParseUserIDFromToken(c.GetHeader("token"), c.GetString("operationID")) - if err != nil { - c.String(400, err.Error()) - c.Abort() - return - } - c.Set("opUserID", userID) - c.Next() - }) - { - groupRouterGroup.POST("/create_group", group.NewCreateGroup) //1 - groupRouterGroup.POST("/set_group_info", group.NewSetGroupInfo) //1 - groupRouterGroup.POST("/join_group", group.JoinGroup) //1 - groupRouterGroup.POST("/quit_group", group.QuitGroup) //1 - groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1 - groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) //1 - groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1 - groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList) - groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1 - groupRouterGroup.POST("/kick_group", group.KickGroupMember) //1 - // groupRouterGroup.POST("/get_group_member_list", group.FindGroupMemberAll) //no use - groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1 - groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo) //1 - groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1 - groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList) - groupRouterGroup.POST("/dismiss_group", group.DismissGroup) // - groupRouterGroup.POST("/mute_group_member", group.MuteGroupMember) - groupRouterGroup.POST("/cancel_mute_group_member", group.CancelMuteGroupMember) //MuteGroup - groupRouterGroup.POST("/mute_group", group.MuteGroup) - groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup) - groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname) - groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo) - groupRouterGroup.POST("/get_group_abstract_info", group.GetGroupAbstractInfo) - //groupRouterGroup.POST("/get_group_all_member_list_by_split", group.GetGroupAllMemberListBySplit) - } - superGroupRouterGroup := r.Group("/super_group") - { - superGroupRouterGroup.POST("/get_joined_group_list", group.GetJoinedSuperGroupList) - superGroupRouterGroup.POST("/get_groups_info", group.GetSuperGroupsInfo) - } - ////certificate - authRouterGroup := r.Group("/auth") - { - authRouterGroup.POST("/user_register", apiAuth.UserRegister) //1 - authRouterGroup.POST("/user_token", apiAuth.UserToken) //1 - authRouterGroup.POST("/parse_token", apiAuth.ParseToken) //1 - authRouterGroup.POST("/force_logout", apiAuth.ForceLogout) //1 - } - ////Third service - thirdGroup := r.Group("/third") - { - thirdGroup.POST("/tencent_cloud_storage_credential", apiThird.TencentCloudStorageCredential) - thirdGroup.POST("/ali_oss_credential", apiThird.AliOSSCredential) - thirdGroup.POST("/minio_storage_credential", apiThird.MinioStorageCredential) - thirdGroup.POST("/minio_upload", apiThird.MinioUploadFile) - thirdGroup.POST("/upload_update_app", apiThird.UploadUpdateApp) - thirdGroup.POST("/get_download_url", apiThird.GetDownloadURL) - thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo) - thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp) - thirdGroup.POST("/fcm_update_token", apiThird.FcmUpdateToken) - thirdGroup.POST("/aws_storage_credential", apiThird.AwsStorageCredential) - thirdGroup.POST("/set_app_badge", apiThird.SetAppBadge) - } - ////Message - chatGroup := r.Group("/msg") - { - chatGroup.POST("/newest_seq", apiChat.GetSeq) - chatGroup.POST("/send_msg", apiChat.SendMsg) - chatGroup.POST("/pull_msg_by_seq", apiChat.PullMsgBySeqList) - chatGroup.POST("/del_msg", apiChat.DelMsg) - chatGroup.POST("/del_super_group_msg", apiChat.DelSuperGroupMsg) - chatGroup.POST("/clear_msg", apiChat.ClearMsg) - chatGroup.POST("/manage_send_msg", manage.ManagementSendMsg) - chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg) - chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess) - chatGroup.POST("/set_msg_min_seq", apiChat.SetMsgMinSeq) - - chatGroup.POST("/set_message_reaction_extensions", apiChat.SetMessageReactionExtensions) - chatGroup.POST("/get_message_list_reaction_extensions", apiChat.GetMessageListReactionExtensions) - chatGroup.POST("/add_message_reaction_extensions", apiChat.AddMessageReactionExtensions) - chatGroup.POST("/delete_message_reaction_extensions", apiChat.DeleteMessageReactionExtensions) - } - ////Conversation - conversationGroup := r.Group("/conversation") - { //1 - conversationGroup.POST("/get_all_conversations", conversation.GetAllConversations) - conversationGroup.POST("/get_conversation", conversation.GetConversation) - conversationGroup.POST("/get_conversations", conversation.GetConversations) - conversationGroup.POST("/set_conversation", conversation.SetConversation) - conversationGroup.POST("/batch_set_conversation", conversation.BatchSetConversations) - conversationGroup.POST("/set_recv_msg_opt", conversation.SetRecvMsgOpt) - conversationGroup.POST("/modify_conversation_field", conversation.ModifyConversationField) - } - - go apiThird.MinioInit() - defaultPorts := config.Config.Api.GinPort - ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port") + router := api.NewGinRouter() + go third.MinioInit() + ginPort := flag.Int("port", config.Config.Api.GinPort[0], "get ginServerPort from cmd,default 10002 as port") flag.Parse() + config.InitConfig() address := "0.0.0.0:" + strconv.Itoa(*ginPort) if config.Config.Api.ListenIP != "" { address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort) } fmt.Println("start api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion) - err := r.Run(address) + err := router.Run(address) if err != nil { log.Error("", "api run failed ", address, err.Error()) panic("api start failed " + err.Error()) diff --git a/cmd/cmdutils/main.go b/cmd/cmdutils/main.go index ded252795..c05b85b5e 100644 --- a/cmd/cmdutils/main.go +++ b/cmd/cmdutils/main.go @@ -1,17 +1,17 @@ package main import ( - "Open_IM/internal/task" + "OpenIM/internal/task" "flag" "fmt" "time" ) func main() { - var userID = flag.String("userID", "", "userID to clear msg and reset seq") - var workingGroupID = flag.String("workingGroupID", "", "workingGroupID to clear msg and reset seq") - var fixAllSeq = flag.Bool("fixAllSeq", false, "fix seq") + var userID = flag.String("user_id", "", "userID to clear msg and reset seq") + var superGroupID = flag.String("super_group_id", "", "superGroupID to clear msg and reset seq") + var fixAllSeq = flag.Bool("fix_all_seq", false, "fix seq") flag.Parse() - fmt.Println(time.Now(), "start cronTask", *userID, *workingGroupID) - task.FixSeq(*userID, *workingGroupID, *fixAllSeq) + fmt.Println(time.Now(), "start cronTask", *userID, *superGroupID) + task.FixSeq(*userID, *superGroupID, *fixAllSeq) } diff --git a/cmd/crontask/main.go b/cmd/crontask/main.go index c4ca2aab9..0b25831cd 100644 --- a/cmd/crontask/main.go +++ b/cmd/crontask/main.go @@ -1,7 +1,7 @@ package main import ( - "Open_IM/internal/task" + "OpenIM/internal/task" "fmt" "time" ) diff --git a/cmd/msggateway/main.go b/cmd/msggateway/main.go index 86de2dcc9..677cb056b 100644 --- a/cmd/msggateway/main.go +++ b/cmd/msggateway/main.go @@ -1,10 +1,10 @@ package main import ( - "Open_IM/internal/msggateway" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" + "OpenIM/internal/msggateway" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" "flag" "fmt" "sync" diff --git a/cmd/msgtransfer/main.go b/cmd/msgtransfer/main.go index 9d5923aea..2cc17d388 100644 --- a/cmd/msgtransfer/main.go +++ b/cmd/msgtransfer/main.go @@ -1,10 +1,10 @@ package main import ( - "Open_IM/internal/msgtransfer" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" + "OpenIM/internal/msgtransfer" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" "flag" "fmt" "sync" diff --git a/cmd/push/main.go b/cmd/push/main.go index 40e774608..261fc5a92 100644 --- a/cmd/push/main.go +++ b/cmd/push/main.go @@ -1,10 +1,10 @@ package main import ( - "Open_IM/internal/push" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" + "OpenIM/internal/push" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" "flag" "fmt" "sync" diff --git a/cmd/rpc/auth/main.go b/cmd/rpc/auth/main.go index a89ff6845..9e94ba99c 100644 --- a/cmd/rpc/auth/main.go +++ b/cmd/rpc/auth/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/auth" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/auth" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmd/rpc/conversation/main.go b/cmd/rpc/conversation/main.go index 9f030c801..2c13332fe 100644 --- a/cmd/rpc/conversation/main.go +++ b/cmd/rpc/conversation/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/conversation" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/conversation" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmd/rpc/friend/main.go b/cmd/rpc/friend/main.go index 907ee7dbd..eb1042735 100644 --- a/cmd/rpc/friend/main.go +++ b/cmd/rpc/friend/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/friend" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/friend" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmd/rpc/group/main.go b/cmd/rpc/group/main.go index 89451b6ef..ba7325419 100644 --- a/cmd/rpc/group/main.go +++ b/cmd/rpc/group/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/group" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/group" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmd/rpc/msg/main.go b/cmd/rpc/msg/main.go index 7900b1d4e..6fafd0c33 100644 --- a/cmd/rpc/msg/main.go +++ b/cmd/rpc/msg/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/msg" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/msg" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmd/rpc/user/main.go b/cmd/rpc/user/main.go index 331daa8f4..b7436746a 100644 --- a/cmd/rpc/user/main.go +++ b/cmd/rpc/user/main.go @@ -1,9 +1,9 @@ package main import ( - "Open_IM/internal/rpc/user" - "Open_IM/internal/startrpc" - "Open_IM/pkg/common/config" + "OpenIM/internal/rpc/user" + "OpenIM/internal/startrpc" + "OpenIM/pkg/common/config" ) func main() { diff --git a/cmdutils/mongo/cmd/main.go b/cmdutils/mongo/cmd/main.go index 9644851d8..ffa5986f5 100644 --- a/cmdutils/mongo/cmd/main.go +++ b/cmdutils/mongo/cmd/main.go @@ -1,8 +1,8 @@ package main import ( - mongoUtils "Open_IM/cmdutils/mongo" - "Open_IM/pkg/common/config" + mongoUtils "OpenIM/cmdutils/mongo" + "OpenIM/pkg/common/config" "context" "flag" "fmt" diff --git a/cmdutils/mongo/mongo_utils.go b/cmdutils/mongo/mongo_utils.go index 21d9ea929..dd9497a1a 100644 --- a/cmdutils/mongo/mongo_utils.go +++ b/cmdutils/mongo/mongo_utils.go @@ -1,8 +1,8 @@ package mongo import ( - "Open_IM/pkg/common/config" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + sdkws "OpenIM/pkg/proto/sdkws" "context" "fmt" "github.com/golang/protobuf/proto" diff --git a/config/config.yaml b/config/config.yaml index 7f3f48e27..d4da27081 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -11,8 +11,8 @@ zookeeper: mysql: dbMysqlAddress: [ 127.0.0.1:13306 ] #mysql地址 目前仅支持单机，默认即可 - dbMysqlUserName: #mysql用户名，建议修改 - dbMysqlPassword: # mysql密码，建议修改 + dbMysqlUserName: root #mysql用户名，建议修改 + dbMysqlPassword: openIM123 # mysql密码，建议修改 dbMysqlDatabaseName: openIM_v2 #默认即可 dbTableName: eMsg #默认即可 dbMsgTableNum: 1 @@ -30,8 +30,8 @@ mongo: dbTimeout: 60 dbDatabase: openIM #mongo db 默认即可 dbSource: admin - dbUserName: #mongo用户名，建议先不设置 - dbPassword: #mongo密码，建议先不设置 + dbUserName: root #mongo用户名，建议先不设置 + dbPassword: openIM123 #mongo密码，建议先不设置 dbMaxPoolSize: 100 dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改 chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * * @@ -42,7 +42,7 @@ redis: dbMaxActive: 0 dbIdleTimeout: 120 dbUserName: #only redis version 6.0+ need username - dbPassWord: #redis密码 建议修改 + dbPassWord: openIM123 #redis密码 建议修改 enableCluster: false #如果外部redis以集群方式启动，需要打开此开关 kafka: @@ -113,11 +113,11 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申 bucket: openim # 存储内容桶 appBucket: app # 存储app的桶 location: us-east-1 - endpoint: #minio外网ip 这个ip是给客户端访问的 + endpoint: http://127.0.0.1:10005 #minio外网ip 这个ip是给客户端访问的 endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以 endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问 - accessKeyID: - secretAccessKey: + accessKeyID: root + secretAccessKey: openIM123 storageTime: 50 #文件在minio中保存的时间 isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false ali: # ali oss @@ -203,11 +203,11 @@ push: pushIntent: enable: false # true or false (bool) getui: #个推推送 - pushUrl: + pushUrl: "https://restapi.getui.com/v2/$appId" masterSecret: "" appKey: "" intent: "" - enable: # true or false (bool) + enable: false # true or false (bool) channelID: "" channelName: "" fcm: #firebase cloud message 消息推送 @@ -220,7 +220,7 @@ manager: secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"] appSysNotificationName: "系统通知" -secret: +secret: tuoyun # 多端互踢策略 # 1：多平台登录：Android、iOS、Windows、Mac 每种平台只能一个在线，web端可以多个同时在线 multiloginpolicy: 1 @@ -236,11 +236,11 @@ singleMessageHasReadReceiptEnable: true #token config tokenpolicy: - accessSecret: #token生成相关，默认即可 + accessSecret: "OpenIM_server" #token生成相关，默认即可 # Token effective time day as a unit - accessExpire: #token过期时间（天） 默认即可 + accessExpire: 90 #token过期时间（天） 默认即可 messageverify: - friendVerify: + friendVerify: false #ios系统推送声音以及标记计数 iospush: diff --git a/config/usualConfig.yaml b/config/usualConfig.yaml deleted file mode 100644 index 8558f4bf0..000000000 --- a/config/usualConfig.yaml +++ /dev/null @@ -1,43 +0,0 @@ -etcd: - userName: - password: - secret: openIM123 # etcd 配置密钥 - -mysql: - dbMysqlUserName: root #mysql用户名 - dbMysqlPassword: openIM123 # mysql密码 - -mongo: - dbUserName: root #mongo用户名 - dbPassword: openIM123 #mongo密码 - -redis: - dbUserName: - dbPassWord: openIM123 #redis密码 - -kafka: - SASLUserName: - SASLPassword: - -credential: - minio: - endpoint: http://127.0.0.1:10005 #发图片视频文件需要填写 - accessKeyID: root - secretAccessKey: openIM123 - -secret: tuoyun #建议修改 - -tokenpolicy: - accessSecret: "open_im_server" #token生成相关 建议修改 - accessExpire: 90 #token过期时间（天） 默认即可 - -messageverify: - friendVerify: false #发送消息是否验证好友关系 false表示不验证好友关系 - -push: - getui: - pushUrl: "https://restapi.getui.com/v2/$appId" - masterSecret: "" #需添加 - appKey: "" #需添加 - enable: false #true启动个推推送 - diff --git a/go.mod b/go.mod index 10bc1f60a..23a71e12f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module Open_IM +module OpenIM go 1.16 diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 94c805b48..cbc67fcde 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -1,14 +1,14 @@ package apiAuth import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - rpc "Open_IM/pkg/proto/auth" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + rpc "OpenIM/pkg/proto/auth" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "net/http" "strings" diff --git a/internal/api/conversation/conversation.go b/internal/api/conversation/conversation.go index 251de1994..a0bf954cd 100644 --- a/internal/api/conversation/conversation.go +++ b/internal/api/conversation/conversation.go @@ -1,12 +1,12 @@ package conversation import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - pbConversation "Open_IM/pkg/proto/conversation" - pbUser "Open_IM/pkg/proto/user" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + pbConversation "OpenIM/pkg/proto/conversation" + pbUser "OpenIM/pkg/proto/user" + "OpenIM/pkg/utils" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index 953ab9574..977c8eeb5 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -1,15 +1,15 @@ package friend //import ( -// jsonData "Open_IM/internal/utils" -// api "Open_IM/pkg/apistruct" -// "Open_IM/pkg/common/config" -// "Open_IM/pkg/common/log" -// "Open_IM/pkg/common/tokenverify" -// "Open_IM/pkg/getcdv3" -// rpc "Open_IM/pkg/proto/friend" -// sdkws "Open_IM/pkg/proto/sdkws" -// "Open_IM/pkg/utils" +// jsonData "OpenIM/internal/utils" +// api "OpenIM/pkg/apistruct" +// "OpenIM/pkg/common/config" +// "OpenIM/pkg/common/log" +// "OpenIM/pkg/common/tokenverify" +// "OpenIM/pkg/getcdv3" +// rpc "OpenIM/pkg/proto/friend" +// sdkws "OpenIM/pkg/proto/sdkws" +// "OpenIM/pkg/utils" // "context" // "github.com/gin-gonic/gin" // "net/http" diff --git a/internal/api/friend/friend1.go b/internal/api/friend/friend1.go index dc94aa210..abdabb44d 100644 --- a/internal/api/friend/friend1.go +++ b/internal/api/friend/friend1.go @@ -1,10 +1,10 @@ package friend import ( - common "Open_IM/internal/api2rpc" - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - rpc "Open_IM/pkg/proto/friend" + common "OpenIM/internal/api2rpc" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + rpc "OpenIM/pkg/proto/friend" "github.com/gin-gonic/gin" ) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 5cc57e2c1..32c52975f 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -1,16 +1,16 @@ package group //import ( -// common "Open_IM/internal/api_to_rpc" -// api "Open_IM/pkg/apistruct" -// "Open_IM/pkg/common/config" -// "Open_IM/pkg/common/constant" -// "Open_IM/pkg/common/log" -// "Open_IM/pkg/common/token_verify" -// "Open_IM/pkg/common/tracelog" -// "Open_IM/pkg/getcdv3" -// rpc "Open_IM/pkg/proto/group" -// "Open_IM/pkg/utils" +// common "OpenIM/internal/api_to_rpc" +// api "OpenIM/pkg/apistruct" +// "OpenIM/pkg/common/config" +// "OpenIM/pkg/common/constant" +// "OpenIM/pkg/common/log" +// "OpenIM/pkg/common/token_verify" +// "OpenIM/pkg/common/tracelog" +// "OpenIM/pkg/getcdv3" +// rpc "OpenIM/pkg/proto/group" +// "OpenIM/pkg/utils" // "context" // "github.com/golang/protobuf/ptypes/wrappers" // "google.golang.org/grpc" @@ -20,7 +20,7 @@ package group // "net/http" // "strings" // -// jsonData "Open_IM/internal/utils" +// jsonData "OpenIM/internal/utils" //) // @Summary 把用户踢出群组 diff --git a/internal/api/group/group_test.go b/internal/api/group/group_test.go index 24da7cb2d..9c9d7ec7e 100644 --- a/internal/api/group/group_test.go +++ b/internal/api/group/group_test.go @@ -1,8 +1,8 @@ package group import ( - "Open_IM/pkg/apistruct" - "Open_IM/pkg/proto/group" + "OpenIM/pkg/apistruct" + "OpenIM/pkg/proto/group" "context" "errors" "github.com/gin-gonic/gin" diff --git a/internal/api/group/super_group.go b/internal/api/group/super_group.go index 0dd19abd0..89744452c 100644 --- a/internal/api/group/super_group.go +++ b/internal/api/group/super_group.go @@ -1,14 +1,14 @@ package group //import ( -// jsonData "Open_IM/internal/utils" -// api "Open_IM/pkg/apistruct" -// "Open_IM/pkg/common/config" -// "Open_IM/pkg/common/log" -// "Open_IM/pkg/common/token_verify" -// "Open_IM/pkg/getcdv3" -// rpc "Open_IM/pkg/proto/group" -// "Open_IM/pkg/utils" +// jsonData "OpenIM/internal/utils" +// api "OpenIM/pkg/apistruct" +// "OpenIM/pkg/common/config" +// "OpenIM/pkg/common/log" +// "OpenIM/pkg/common/token_verify" +// "OpenIM/pkg/getcdv3" +// rpc "OpenIM/pkg/proto/group" +// "OpenIM/pkg/utils" // "context" // "github.com/gin-gonic/gin" // "net/http" diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index d1160fd0f..1a5c78f0f 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -7,14 +7,14 @@ package manage import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - pbChat "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + pbChat "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "net/http" "strings" diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index 7e1829e48..d519056ad 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -7,14 +7,14 @@ package manage import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - pbRelay "Open_IM/pkg/proto/relay" - rpc "Open_IM/pkg/proto/user" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + pbRelay "OpenIM/pkg/proto/relay" + rpc "OpenIM/pkg/proto/user" + "OpenIM/pkg/utils" "context" "net/http" "strings" diff --git a/internal/api/msg/del_msg.go b/internal/api/msg/del_msg.go index e3031faf9..d2b0b44aa 100644 --- a/internal/api/msg/del_msg.go +++ b/internal/api/msg/del_msg.go @@ -1,14 +1,14 @@ package msg import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - rpc "Open_IM/pkg/proto/msg" - pbCommon "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + rpc "OpenIM/pkg/proto/msg" + pbCommon "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "github.com/gin-gonic/gin" "github.com/golang/protobuf/proto" diff --git a/internal/api/msg/extend_msg.go b/internal/api/msg/extend_msg.go index a1e4130d3..a6b1318f3 100644 --- a/internal/api/msg/extend_msg.go +++ b/internal/api/msg/extend_msg.go @@ -1,13 +1,13 @@ package msg import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - rpc "Open_IM/pkg/proto/msg" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + rpc "OpenIM/pkg/proto/msg" + "OpenIM/pkg/utils" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/msg/get_max_min_seq.go b/internal/api/msg/get_max_min_seq.go index 444f82d04..8b7780129 100644 --- a/internal/api/msg/get_max_min_seq.go +++ b/internal/api/msg/get_max_min_seq.go @@ -1,11 +1,11 @@ package msg import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - pbChat "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + pbChat "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/msg/pull_msg.go b/internal/api/msg/pull_msg.go index 254e9b781..5893855da 100644 --- a/internal/api/msg/pull_msg.go +++ b/internal/api/msg/pull_msg.go @@ -1,12 +1,12 @@ package msg import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/msg/send_msg.go b/internal/api/msg/send_msg.go index a9b826c5f..a7a558097 100644 --- a/internal/api/msg/send_msg.go +++ b/internal/api/msg/send_msg.go @@ -1,10 +1,10 @@ package msg import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - pbChat "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + pbChat "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/route.go b/internal/api/route.go new file mode 100644 index 000000000..3305a2d0d --- /dev/null +++ b/internal/api/route.go @@ -0,0 +1,169 @@ +package api + +import ( + "OpenIM/internal/api/auth" + "OpenIM/internal/api/conversation" + "OpenIM/internal/api/friend" + "OpenIM/internal/api/group" + "OpenIM/internal/api/manage" + "OpenIM/internal/api/msg" + "OpenIM/internal/api/third" + "OpenIM/internal/api/user" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/middleware" + "OpenIM/pkg/common/prome" + "OpenIM/pkg/common/tokenverify" + "github.com/gin-gonic/gin" + "io" + "os" +) + +func NewGinRouter() *gin.Engine { + gin.SetMode(gin.ReleaseMode) + f, _ := os.Create("../logs/api.log") + gin.DefaultWriter = io.MultiWriter(f) + // gin.SetMode(gin.DebugMode) + r := gin.New() + r.Use(gin.Recovery()) + r.Use(middleware.GinParseOperationID) + log.Info("load config: ", config.Config) + if config.Config.Prometheus.Enable { + prome.NewApiRequestCounter() + prome.NewApiRequestFailedCounter() + prome.NewApiRequestSuccessCounter() + r.Use(prome.PromeTheusMiddleware) + r.GET("/metrics", prome.PrometheusHandler()) + } + userRouterGroup := r.Group("/user") + { + userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1 + userRouterGroup.POST("/set_global_msg_recv_opt", user.SetGlobalRecvMessageOpt) + userRouterGroup.POST("/get_users_info", user.GetUsersPublicInfo) //1 + userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1 + userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1 + userRouterGroup.POST("/get_users_info_from_cache", user.GetUsersInfoFromCache) + userRouterGroup.POST("/get_user_friend_from_cache", user.GetFriendIDListFromCache) + userRouterGroup.POST("/get_black_list_from_cache", user.GetBlackIDListFromCache) + userRouterGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) //1 + userRouterGroup.POST("/account_check", manage.AccountCheck) //1 + // userRouterGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1 + userRouterGroup.POST("/get_users", user.GetUsers) + } + ////friend routing group + friendRouterGroup := r.Group("/friend") + { + // friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo) + friendRouterGroup.POST("/add_friend", friend.AddFriend) //1 + friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) //1 + friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1 + friendRouterGroup.POST("/get_self_friend_apply_list", friend.GetSelfApplyList) //1 + friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) //1 + friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1 + friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark) //1 + + friendRouterGroup.POST("/add_black", friend.AddBlack) //1 + friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1 + friendRouterGroup.POST("/remove_black", friend.RemoveBlacklist) //1 + + friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1 + friendRouterGroup.POST("/is_friend", friend.IsFriend) //1 + } + //group related routing group + groupRouterGroup := r.Group("/group") + groupRouterGroup.Use(func(c *gin.Context) { + userID, err := tokenverify.ParseUserIDFromToken(c.GetHeader("token"), c.GetString("operationID")) + if err != nil { + c.String(400, err.Error()) + c.Abort() + return + } + c.Set("opUserID", userID) + c.Next() + }) + { + groupRouterGroup.POST("/create_group", group.NewCreateGroup) //1 + groupRouterGroup.POST("/set_group_info", group.NewSetGroupInfo) //1 + groupRouterGroup.POST("/join_group", group.JoinGroup) //1 + groupRouterGroup.POST("/quit_group", group.QuitGroup) //1 + groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1 + groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) //1 + groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1 + groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList) + groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1 + groupRouterGroup.POST("/kick_group", group.KickGroupMember) //1 + // groupRouterGroup.POST("/get_group_member_list", group.FindGroupMemberAll) //no use + groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1 + groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo) //1 + groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1 + groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList) + groupRouterGroup.POST("/dismiss_group", group.DismissGroup) // + groupRouterGroup.POST("/mute_group_member", group.MuteGroupMember) + groupRouterGroup.POST("/cancel_mute_group_member", group.CancelMuteGroupMember) //MuteGroup + groupRouterGroup.POST("/mute_group", group.MuteGroup) + groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup) + groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname) + groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo) + groupRouterGroup.POST("/get_group_abstract_info", group.GetGroupAbstractInfo) + //groupRouterGroup.POST("/get_group_all_member_list_by_split", group.GetGroupAllMemberListBySplit) + } + superGroupRouterGroup := r.Group("/super_group") + { + superGroupRouterGroup.POST("/get_joined_group_list", group.GetJoinedSuperGroupList) + superGroupRouterGroup.POST("/get_groups_info", group.GetSuperGroupsInfo) + } + ////certificate + authRouterGroup := r.Group("/auth") + { + authRouterGroup.POST("/user_register", apiAuth.UserRegister) //1 + authRouterGroup.POST("/user_token", apiAuth.UserToken) //1 + authRouterGroup.POST("/parse_token", apiAuth.ParseToken) //1 + authRouterGroup.POST("/force_logout", apiAuth.ForceLogout) //1 + } + ////Third service + thirdGroup := r.Group("/third") + { + thirdGroup.POST("/tencent_cloud_storage_credential", third.TencentCloudStorageCredential) + thirdGroup.POST("/ali_oss_credential", third.AliOSSCredential) + thirdGroup.POST("/minio_storage_credential", third.MinioStorageCredential) + thirdGroup.POST("/minio_upload", third.MinioUploadFile) + thirdGroup.POST("/upload_update_app", third.UploadUpdateApp) + thirdGroup.POST("/get_download_url", third.GetDownloadURL) + thirdGroup.POST("/get_rtc_invitation_info", third.GetRTCInvitationInfo) + thirdGroup.POST("/get_rtc_invitation_start_app", third.GetRTCInvitationInfoStartApp) + thirdGroup.POST("/fcm_update_token", third.FcmUpdateToken) + thirdGroup.POST("/aws_storage_credential", third.AwsStorageCredential) + thirdGroup.POST("/set_app_badge", third.SetAppBadge) + } + ////Message + chatGroup := r.Group("/msg") + { + chatGroup.POST("/newest_seq", msg.GetSeq) + chatGroup.POST("/send_msg", msg.SendMsg) + chatGroup.POST("/pull_msg_by_seq", msg.PullMsgBySeqList) + chatGroup.POST("/del_msg", msg.DelMsg) + chatGroup.POST("/del_super_group_msg", msg.DelSuperGroupMsg) + chatGroup.POST("/clear_msg", msg.ClearMsg) + chatGroup.POST("/manage_send_msg", manage.ManagementSendMsg) + chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg) + chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess) + chatGroup.POST("/set_msg_min_seq", msg.SetMsgMinSeq) + + chatGroup.POST("/set_message_reaction_extensions", msg.SetMessageReactionExtensions) + chatGroup.POST("/get_message_list_reaction_extensions", msg.GetMessageListReactionExtensions) + chatGroup.POST("/add_message_reaction_extensions", msg.AddMessageReactionExtensions) + chatGroup.POST("/delete_message_reaction_extensions", msg.DeleteMessageReactionExtensions) + } + ////Conversation + conversationGroup := r.Group("/conversation") + { //1 + conversationGroup.POST("/get_all_conversations", conversation.GetAllConversations) + conversationGroup.POST("/get_conversation", conversation.GetConversation) + conversationGroup.POST("/get_conversations", conversation.GetConversations) + conversationGroup.POST("/set_conversation", conversation.SetConversation) + conversationGroup.POST("/batch_set_conversation", conversation.BatchSetConversations) + conversationGroup.POST("/set_recv_msg_opt", conversation.SetRecvMsgOpt) + conversationGroup.POST("/modify_conversation_field", conversation.ModifyConversationField) + } + return r +} diff --git a/internal/api/third/ali_oss_credential.go b/internal/api/third/ali_oss_credential.go index 0dce20690..af1af9460 100644 --- a/internal/api/third/ali_oss_credential.go +++ b/internal/api/third/ali_oss_credential.go @@ -1,11 +1,11 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" "fmt" openapi "github.com/alibabacloud-go/darabonba-openapi/client" sts20150401 "github.com/alibabacloud-go/sts-20150401/client" diff --git a/internal/api/third/aws_storage_credential.go b/internal/api/third/aws_storage_credential.go index 5e4127155..5524dd37e 100644 --- a/internal/api/third/aws_storage_credential.go +++ b/internal/api/third/aws_storage_credential.go @@ -1,12 +1,12 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "context" "net/http" diff --git a/internal/api/third/fcm_update_token.go b/internal/api/third/fcm_update_token.go index b6a31b96a..c777d15ec 100644 --- a/internal/api/third/fcm_update_token.go +++ b/internal/api/third/fcm_update_token.go @@ -1,10 +1,10 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "net/http" "github.com/gin-gonic/gin" diff --git a/internal/api/third/minio_init.go b/internal/api/third/minio_init.go index b1088df50..95bdacd60 100644 --- a/internal/api/third/minio_init.go +++ b/internal/api/third/minio_init.go @@ -1,9 +1,9 @@ -package apiThird +package third import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + "OpenIM/pkg/utils" "context" "fmt" "github.com/minio/minio-go/v7" diff --git a/internal/api/third/minio_storage_credential.go b/internal/api/third/minio_storage_credential.go index b8f610b5c..9a5cf1020 100644 --- a/internal/api/third/minio_storage_credential.go +++ b/internal/api/third/minio_storage_credential.go @@ -1,13 +1,13 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - _ "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + _ "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "context" "github.com/gin-gonic/gin" "github.com/minio/minio-go/v7" diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go index 1a4656197..977841eb1 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -1,10 +1,10 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "github.com/gin-gonic/gin" "net/http" ) diff --git a/internal/api/third/set_app_badge.go b/internal/api/third/set_app_badge.go index a6349173c..97df98a27 100644 --- a/internal/api/third/set_app_badge.go +++ b/internal/api/third/set_app_badge.go @@ -1,10 +1,10 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "github.com/gin-gonic/gin" "net/http" ) diff --git a/internal/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go index c008f8590..bc17a6122 100644 --- a/internal/api/third/tencent_cloud_storage_credential.go +++ b/internal/api/third/tencent_cloud_storage_credential.go @@ -1,11 +1,11 @@ -package apiThird +package third import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" "github.com/fatih/structs" //"github.com/fatih/structs" diff --git a/internal/api/user/user.go b/internal/api/user/user.go index e8d3a157c..22c464612 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -1,16 +1,16 @@ package user import ( - api "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - pbRelay "Open_IM/pkg/proto/relay" - sdkws "Open_IM/pkg/proto/sdkws" - rpc "Open_IM/pkg/proto/user" - "Open_IM/pkg/utils" - jsonData "Open_IM/pkg/utils" + api "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + pbRelay "OpenIM/pkg/proto/relay" + sdkws "OpenIM/pkg/proto/sdkws" + rpc "OpenIM/pkg/proto/user" + "OpenIM/pkg/utils" + jsonData "OpenIM/pkg/utils" "context" "net/http" "strings" diff --git a/internal/api2rpc/api.go b/internal/api2rpc/api.go index cfa1842a6..827cd051e 100644 --- a/internal/api2rpc/api.go +++ b/internal/api2rpc/api.go @@ -1,10 +1,10 @@ package common import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - utils2 "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + utils2 "OpenIM/pkg/utils" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/common/check/access.go b/internal/common/check/access.go index bdd42c8aa..1d9500a27 100644 --- a/internal/common/check/access.go +++ b/internal/common/check/access.go @@ -1,7 +1,7 @@ package check import ( - "Open_IM/pkg/common/tokenverify" + "OpenIM/pkg/common/tokenverify" "context" ) diff --git a/internal/common/check/black.go b/internal/common/check/black.go index 429aa80f6..7e68a2915 100644 --- a/internal/common/check/black.go +++ b/internal/common/check/black.go @@ -1,7 +1,7 @@ package check import ( - discoveryRegistry "Open_IM/pkg/discoveryregistry" + discoveryRegistry "OpenIM/pkg/discoveryregistry" "context" ) diff --git a/internal/common/check/conversation.go b/internal/common/check/conversation.go index a5413d1e2..a74829193 100644 --- a/internal/common/check/conversation.go +++ b/internal/common/check/conversation.go @@ -1,10 +1,10 @@ package check import ( - "Open_IM/pkg/common/config" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/conversation" - pbConversation "Open_IM/pkg/proto/conversation" + "OpenIM/pkg/common/config" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/conversation" + pbConversation "OpenIM/pkg/proto/conversation" "context" "google.golang.org/grpc" ) diff --git a/internal/common/check/friend.go b/internal/common/check/friend.go index 622b4fd9d..044e07437 100644 --- a/internal/common/check/friend.go +++ b/internal/common/check/friend.go @@ -1,11 +1,11 @@ package check import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/friend" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/friend" + sdkws "OpenIM/pkg/proto/sdkws" "context" "google.golang.org/grpc" ) diff --git a/internal/common/check/group.go b/internal/common/check/group.go index 89a094e0f..c36ad2c3a 100644 --- a/internal/common/check/group.go +++ b/internal/common/check/group.go @@ -1,12 +1,12 @@ package check import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/group" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/group" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "google.golang.org/grpc" "strings" diff --git a/internal/common/check/msg.go b/internal/common/check/msg.go index 06dd82c3e..e9c5a17ec 100644 --- a/internal/common/check/msg.go +++ b/internal/common/check/msg.go @@ -1,10 +1,10 @@ package check import ( - "Open_IM/pkg/common/config" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" "context" "google.golang.org/grpc" ) diff --git a/internal/common/check/user.go b/internal/common/check/user.go index 66b2a8ce9..6a487ad6a 100644 --- a/internal/common/check/user.go +++ b/internal/common/check/user.go @@ -1,12 +1,12 @@ package check import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/proto/user" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/proto/user" + "OpenIM/pkg/utils" "context" "google.golang.org/grpc" "strings" diff --git a/internal/common/convert/convert.go b/internal/common/convert/convert.go index 861027167..a965e519d 100644 --- a/internal/common/convert/convert.go +++ b/internal/common/convert/convert.go @@ -1,11 +1,11 @@ package convert import ( - "Open_IM/internal/common/check" - "Open_IM/pkg/common/db/table/relation" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - sdk "Open_IM/pkg/proto/sdkws" - utils2 "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/pkg/common/db/table/relation" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + sdk "OpenIM/pkg/proto/sdkws" + utils2 "OpenIM/pkg/utils" "context" utils "github.com/OpenIMSDK/open_utils" "time" diff --git a/internal/common/notification/c.go b/internal/common/notification/c.go index fe765c41f..57d233dd0 100644 --- a/internal/common/notification/c.go +++ b/internal/common/notification/c.go @@ -1,14 +1,14 @@ package notification import ( - "Open_IM/internal/common/check" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tracelog" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - utils2 "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tracelog" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + utils2 "OpenIM/pkg/utils" "context" utils "github.com/OpenIMSDK/open_utils" ) @@ -300,6 +300,5 @@ func (c *Check) Notification(ctx context.Context, notificationMsg *NotificationM offlineInfo.Ex = ex msg.OfflinePushInfo = &offlineInfo req.MsgData = &msg - _, err = c.Msg.SendMsg(ctx, &req) } diff --git a/internal/common/notification/conversation.go b/internal/common/notification/conversation.go index a7506779a..bcc8bb830 100644 --- a/internal/common/notification/conversation.go +++ b/internal/common/notification/conversation.go @@ -1,9 +1,9 @@ package notification import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + sdkws "OpenIM/pkg/proto/sdkws" "context" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/internal/common/notification/extend_msg.go b/internal/common/notification/extend_msg.go index 40416f30d..e1478c0d4 100644 --- a/internal/common/notification/extend_msg.go +++ b/internal/common/notification/extend_msg.go @@ -1,12 +1,12 @@ package notification import ( - "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" ) diff --git a/internal/common/notification/friend.go b/internal/common/notification/friend.go index e4d2568cf..1cbb8d5df 100644 --- a/internal/common/notification/friend.go +++ b/internal/common/notification/friend.go @@ -1,10 +1,10 @@ package notification import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - pbFriend "Open_IM/pkg/proto/friend" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + pbFriend "OpenIM/pkg/proto/friend" + "OpenIM/pkg/proto/sdkws" "context" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/internal/common/notification/group.go b/internal/common/notification/group.go index e340ed3b7..4c82c01d7 100644 --- a/internal/common/notification/group.go +++ b/internal/common/notification/group.go @@ -1,14 +1,14 @@ package notification import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - pbGroup "Open_IM/pkg/proto/group" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + pbGroup "OpenIM/pkg/proto/group" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/internal/common/notification/msg.go b/internal/common/notification/msg.go index 8eb6c0213..9e616c593 100644 --- a/internal/common/notification/msg.go +++ b/internal/common/notification/msg.go @@ -1,8 +1,8 @@ package notification import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/proto/sdkws" "context" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/internal/common/notification/super_group.go b/internal/common/notification/super_group.go index 1e9f18a90..7899e1ac1 100644 --- a/internal/common/notification/super_group.go +++ b/internal/common/notification/super_group.go @@ -1,7 +1,7 @@ package notification import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "context" //"github.com/golang/protobuf/jsonpb" //"github.com/golang/protobuf/proto" diff --git a/internal/common/notification/user.go b/internal/common/notification/user.go index 01d5fcee8..8b7f0ab78 100644 --- a/internal/common/notification/user.go +++ b/internal/common/notification/user.go @@ -1,8 +1,8 @@ package notification import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/proto/sdkws" "context" ) diff --git a/internal/common/rpcserver/register.go b/internal/common/rpcserver/register.go index bc9e25fd7..367e26962 100644 --- a/internal/common/rpcserver/register.go +++ b/internal/common/rpcserver/register.go @@ -1,10 +1,10 @@ package rpcserver import ( - "Open_IM/internal/common/network" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - discoveryRegistry "Open_IM/pkg/discoveryregistry" + "OpenIM/internal/common/network" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + discoveryRegistry "OpenIM/pkg/discoveryregistry" "github.com/OpenIMSDK/openKeeper" "net" "strconv" diff --git a/internal/msggateway/batch_push.go b/internal/msggateway/batch_push.go index fb8fc89fe..d4f0c3f4d 100644 --- a/internal/msggateway/batch_push.go +++ b/internal/msggateway/batch_push.go @@ -1,11 +1,11 @@ package msggateway import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - pbChat "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + pbChat "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "strings" ) diff --git a/internal/msggateway/callback.go b/internal/msggateway/callback.go index f284835a8..0231968b0 100644 --- a/internal/msggateway/callback.go +++ b/internal/msggateway/callback.go @@ -1,11 +1,11 @@ package msggateway import ( - cbapi "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" + cbapi "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" "context" "time" ) diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 61bdee08b..7798a55eb 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -1,14 +1,14 @@ package msggateway import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" - "Open_IM/pkg/statistics" + "OpenIM/pkg/statistics" "fmt" "sync" - prome "Open_IM/pkg/common/prome" + prome "OpenIM/pkg/common/prome" "github.com/go-playground/validator/v10" ) diff --git a/internal/msggateway/logic.go b/internal/msggateway/logic.go index 0ca3ab439..3533951de 100644 --- a/internal/msggateway/logic.go +++ b/internal/msggateway/logic.go @@ -1,15 +1,15 @@ package msggateway import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/prome" - pbChat "Open_IM/pkg/proto/msg" - push "Open_IM/pkg/proto/push" - pbRtc "Open_IM/pkg/proto/rtc" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/prome" + pbChat "OpenIM/pkg/proto/msg" + push "OpenIM/pkg/proto/push" + pbRtc "OpenIM/pkg/proto/rtc" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "bytes" "context" "encoding/gob" diff --git a/internal/msggateway/new/client.go b/internal/msggateway/new/client.go index 85dd68a00..5af2d4f1c 100644 --- a/internal/msggateway/new/client.go +++ b/internal/msggateway/new/client.go @@ -1,8 +1,8 @@ package new import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/utils" "context" "errors" "fmt" diff --git a/internal/msggateway/new/compressor.go b/internal/msggateway/new/compressor.go index c36e381d3..79b5a5e39 100644 --- a/internal/msggateway/new/compressor.go +++ b/internal/msggateway/new/compressor.go @@ -1,7 +1,7 @@ package new import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "bytes" "compress/gzip" "io/ioutil" diff --git a/internal/msggateway/new/context.go b/internal/msggateway/new/context.go index 39b44e0e8..678f3e6a2 100644 --- a/internal/msggateway/new/context.go +++ b/internal/msggateway/new/context.go @@ -1,7 +1,7 @@ package new import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "net/http" "strconv" ) diff --git a/internal/msggateway/new/encoder.go b/internal/msggateway/new/encoder.go index bbc3d5c86..30530b541 100644 --- a/internal/msggateway/new/encoder.go +++ b/internal/msggateway/new/encoder.go @@ -1,7 +1,7 @@ package new import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "bytes" "encoding/gob" ) diff --git a/internal/msggateway/new/http_error.go b/internal/msggateway/new/http_error.go index 8686d78d7..fb391cd23 100644 --- a/internal/msggateway/new/http_error.go +++ b/internal/msggateway/new/http_error.go @@ -1,7 +1,7 @@ package new import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "errors" "net/http" ) diff --git a/internal/msggateway/new/message_handler.go b/internal/msggateway/new/message_handler.go index f75e16c05..08bf11e57 100644 --- a/internal/msggateway/new/message_handler.go +++ b/internal/msggateway/new/message_handler.go @@ -1,10 +1,10 @@ package new import ( - "Open_IM/internal/common/notification" - "Open_IM/pkg/proto/msg" - pbRtc "Open_IM/pkg/proto/rtc" - "Open_IM/pkg/proto/sdkws" + "OpenIM/internal/common/notification" + "OpenIM/pkg/proto/msg" + pbRtc "OpenIM/pkg/proto/rtc" + "OpenIM/pkg/proto/sdkws" "context" "github.com/go-playground/validator/v10" "github.com/golang/protobuf/proto" diff --git a/internal/msggateway/new/n_ws_server.go b/internal/msggateway/new/n_ws_server.go index 83d7a31e5..676b9ee75 100644 --- a/internal/msggateway/new/n_ws_server.go +++ b/internal/msggateway/new/n_ws_server.go @@ -1,9 +1,9 @@ package new import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "errors" "fmt" "github.com/go-playground/validator/v10" diff --git a/internal/msggateway/relay_rpc_server.go b/internal/msggateway/relay_rpc_server.go index 6dbaf90a6..2cea2ebcc 100644 --- a/internal/msggateway/relay_rpc_server.go +++ b/internal/msggateway/relay_rpc_server.go @@ -1,14 +1,14 @@ package msggateway import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - prome "Open_IM/pkg/common/prome" - "Open_IM/pkg/common/tokenverify" - pbRelay "Open_IM/pkg/proto/relay" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + prome "OpenIM/pkg/common/prome" + "OpenIM/pkg/common/tokenverify" + pbRelay "OpenIM/pkg/proto/relay" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "bytes" "context" "encoding/gob" diff --git a/internal/msggateway/validate.go b/internal/msggateway/validate.go index 72fec3d53..70ca395c5 100644 --- a/internal/msggateway/validate.go +++ b/internal/msggateway/validate.go @@ -1,16 +1,16 @@ /* ** description(""). -** copyright('Open_IM,www.Open_IM.io'). +** copyright('OpenIM,www.OpenIM.io'). ** author("fg,Gordon@tuoyun.net"). ** time(2021/5/21 15:29). */ package msggateway import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - pbRtc "Open_IM/pkg/proto/rtc" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + pbRtc "OpenIM/pkg/proto/rtc" + sdkws "OpenIM/pkg/proto/sdkws" "github.com/golang/protobuf/proto" ) diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index 003a3b0e1..6adad24fe 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -1,13 +1,13 @@ package msggateway import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - prome "Open_IM/pkg/common/prome" - "Open_IM/pkg/common/tokenverify" - pbRelay "Open_IM/pkg/proto/relay" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + prome "OpenIM/pkg/common/prome" + "OpenIM/pkg/common/tokenverify" + pbRelay "OpenIM/pkg/proto/relay" + "OpenIM/pkg/utils" "bytes" "compress/gzip" "context" diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index a94494f9b..46fc1b585 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -1,8 +1,8 @@ package msgtransfer import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/prome" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/prome" "fmt" ) diff --git a/internal/msgtransfer/modify_msg_handler.go b/internal/msgtransfer/modify_msg_handler.go index 31b013115..4da679499 100644 --- a/internal/msgtransfer/modify_msg_handler.go +++ b/internal/msgtransfer/modify_msg_handler.go @@ -1,18 +1,18 @@ package msgtransfer import ( - "Open_IM/pkg/apistruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - unRelationTb "Open_IM/pkg/common/db/table/unrelation" - kfk "Open_IM/pkg/common/kafka" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - pbMsg "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/apistruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + unRelationTb "OpenIM/pkg/common/db/table/unrelation" + kfk "OpenIM/pkg/common/kafka" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + pbMsg "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "encoding/json" "github.com/Shopify/sarama" diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 03d0173ff..5146feb13 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -1,17 +1,17 @@ package msgtransfer import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/kafka" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - pbMsg "Open_IM/pkg/proto/msg" - pbPush "Open_IM/pkg/proto/push" - "Open_IM/pkg/statistics" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/kafka" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + pbMsg "OpenIM/pkg/proto/msg" + pbPush "OpenIM/pkg/proto/push" + "OpenIM/pkg/statistics" + "OpenIM/pkg/utils" "context" "fmt" "github.com/Shopify/sarama" diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index 974dd0310..ea45c0342 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -1,16 +1,16 @@ package msgtransfer import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - kfk "Open_IM/pkg/common/kafka" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - pbMsg "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + kfk "OpenIM/pkg/common/kafka" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + pbMsg "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" diff --git a/internal/msgtransfer/persistent_msg_handler.go b/internal/msgtransfer/persistent_msg_handler.go index 3066f6079..65634ba7e 100644 --- a/internal/msgtransfer/persistent_msg_handler.go +++ b/internal/msgtransfer/persistent_msg_handler.go @@ -7,13 +7,13 @@ package msgtransfer import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/controller" - kfk "Open_IM/pkg/common/kafka" - "Open_IM/pkg/common/log" - pbMsg "Open_IM/pkg/proto/msg" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/controller" + kfk "OpenIM/pkg/common/kafka" + "OpenIM/pkg/common/log" + pbMsg "OpenIM/pkg/proto/msg" + "OpenIM/pkg/utils" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" diff --git a/internal/push/callback.go b/internal/push/callback.go index d293b95df..1626a1fa1 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -1,13 +1,13 @@ package push import ( - "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" ) diff --git a/internal/push/fcm/push.go b/internal/push/fcm/push.go index fcab72f29..1a8617c3b 100644 --- a/internal/push/fcm/push.go +++ b/internal/push/fcm/push.go @@ -1,10 +1,10 @@ package fcm import ( - "Open_IM/internal/push" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" + "OpenIM/internal/push" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" "context" firebase "firebase.google.com/go" "firebase.google.com/go/messaging" diff --git a/internal/push/fcm/push_test.go b/internal/push/fcm/push_test.go index 4be39b685..0df2b45da 100644 --- a/internal/push/fcm/push_test.go +++ b/internal/push/fcm/push_test.go @@ -1,8 +1,8 @@ package fcm import ( - "Open_IM/internal/push" - "Open_IM/pkg/common/db/cache" + "OpenIM/internal/push" + "OpenIM/pkg/common/db/cache" "context" "github.com/stretchr/testify/assert" "testing" diff --git a/internal/push/getui/body.go b/internal/push/getui/body.go index 713b01cd0..c1c1be8a3 100644 --- a/internal/push/getui/body.go +++ b/internal/push/getui/body.go @@ -1,7 +1,7 @@ package getui import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" "fmt" ) diff --git a/internal/push/getui/push.go b/internal/push/getui/push.go index 5827a2447..5010cb97e 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -1,17 +1,17 @@ package getui import ( - "Open_IM/internal/push" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db/cache" - http2 "Open_IM/pkg/common/http" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils/splitter" + "OpenIM/internal/push" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/db/cache" + http2 "OpenIM/pkg/common/http" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils/splitter" "github.com/go-redis/redis/v8" "sync" - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "context" "crypto/sha256" "encoding/hex" diff --git a/internal/push/init.go b/internal/push/init.go index 60b9dd612..090b24b5d 100644 --- a/internal/push/init.go +++ b/internal/push/init.go @@ -7,14 +7,14 @@ package push import ( - fcm "Open_IM/internal/push/fcm" - "Open_IM/internal/push/getui" - jpush "Open_IM/internal/push/jpush" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/prome" - "Open_IM/pkg/statistics" + fcm "OpenIM/internal/push/fcm" + "OpenIM/internal/push/getui" + jpush "OpenIM/internal/push/jpush" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/prome" + "OpenIM/pkg/statistics" "fmt" ) diff --git a/internal/push/jpush/body/notification.go b/internal/push/jpush/body/notification.go index 72794793d..ddf2176e3 100644 --- a/internal/push/jpush/body/notification.go +++ b/internal/push/jpush/body/notification.go @@ -1,7 +1,7 @@ package body import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" ) type Notification struct { diff --git a/internal/push/jpush/body/platform.go b/internal/push/jpush/body/platform.go index 7b8ac255f..a9402ecfb 100644 --- a/internal/push/jpush/body/platform.go +++ b/internal/push/jpush/body/platform.go @@ -1,7 +1,7 @@ package body import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "errors" ) diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index 2d4ecb9f2..a06217ecc 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -1,10 +1,10 @@ package push import ( - "Open_IM/internal/push" - "Open_IM/internal/push/jpush/body" - "Open_IM/pkg/common/config" - http2 "Open_IM/pkg/common/http" + "OpenIM/internal/push" + "OpenIM/internal/push/jpush/body" + "OpenIM/pkg/common/config" + http2 "OpenIM/pkg/common/http" "context" "encoding/base64" "fmt" diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index b49466b01..c424a94dd 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -1,20 +1,20 @@ /* ** description(""). -** copyright('Open_IM,www.Open_IM.io'). +** copyright('OpenIM,www.OpenIM.io'). ** author("fg,Gordon@tuoyun.net"). ** time(2021/5/13 10:33). */ package push import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - kfk "Open_IM/pkg/common/kafka" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - pbChat "Open_IM/pkg/proto/msg" - pbPush "Open_IM/pkg/proto/push" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + kfk "OpenIM/pkg/common/kafka" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + pbChat "OpenIM/pkg/proto/msg" + pbPush "OpenIM/pkg/proto/push" + "OpenIM/pkg/utils" "context" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index a17df5291..080377305 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -1,14 +1,14 @@ package push import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/prome" - pbPush "Open_IM/pkg/proto/push" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/prome" + pbPush "OpenIM/pkg/proto/push" + "OpenIM/pkg/utils" "context" "net" "strconv" diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 5e72f490b..53b05b572 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -7,18 +7,18 @@ package push import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/localcache" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/prome" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/discoveryregistry" - msggateway "Open_IM/pkg/proto/msggateway" - pbRtc "Open_IM/pkg/proto/rtc" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/localcache" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/prome" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/discoveryregistry" + msggateway "OpenIM/pkg/proto/msggateway" + pbRtc "OpenIM/pkg/proto/rtc" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "errors" "github.com/golang/protobuf/proto" diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index e3a3bea04..bf26f3ca1 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -1,20 +1,20 @@ package auth import ( - "Open_IM/internal/common/check" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - discoveryRegistry "Open_IM/pkg/discoveryregistry" - pbAuth "Open_IM/pkg/proto/auth" - pbRelay "Open_IM/pkg/proto/relay" - "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + discoveryRegistry "OpenIM/pkg/discoveryregistry" + pbAuth "OpenIM/pkg/proto/auth" + pbRelay "OpenIM/pkg/proto/relay" + "OpenIM/pkg/utils" "context" "github.com/OpenIMSDK/openKeeper" "google.golang.org/grpc" diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 5ad7a432f..6c04fe637 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -1,16 +1,16 @@ package conversation import ( - "Open_IM/internal/common/check" - "Open_IM/internal/common/notification" - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/relation" - tableRelation "Open_IM/pkg/common/db/table/relation" - pbConversation "Open_IM/pkg/proto/conversation" - "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/internal/common/notification" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/relation" + tableRelation "OpenIM/pkg/common/db/table/relation" + pbConversation "OpenIM/pkg/proto/conversation" + "OpenIM/pkg/utils" "context" "github.com/OpenIMSDK/openKeeper" "github.com/dtm-labs/rockscache" diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index 0c832ad5e..5785f6531 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -1,11 +1,11 @@ package friend import ( - "Open_IM/internal/common/convert" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - pbFriend "Open_IM/pkg/proto/friend" + "OpenIM/internal/common/convert" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + pbFriend "OpenIM/pkg/proto/friend" "context" ) diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index 14df737a1..c2654271f 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -1,12 +1,12 @@ package friend import ( - cbapi "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" - pbfriend "Open_IM/pkg/proto/friend" + cbapi "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" + pbfriend "OpenIM/pkg/proto/friend" "context" ) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index e7be6221f..f345034c2 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -1,19 +1,19 @@ package friend import ( - "Open_IM/internal/common/check" - "Open_IM/internal/common/convert" - "Open_IM/internal/common/notification" - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/relation" - tablerelation "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - registry "Open_IM/pkg/discoveryregistry" - pbfriend "Open_IM/pkg/proto/friend" - "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/internal/common/convert" + "OpenIM/internal/common/notification" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/relation" + tablerelation "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + registry "OpenIM/pkg/discoveryregistry" + pbfriend "OpenIM/pkg/proto/friend" + "OpenIM/pkg/utils" "context" "github.com/OpenIMSDK/openKeeper" "google.golang.org/grpc" diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 1ffe44193..54aba79dc 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -1,15 +1,15 @@ package group import ( - "Open_IM/pkg/apistruct" - "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/proto/group" - "Open_IM/pkg/utils" + "OpenIM/pkg/apistruct" + "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/proto/group" + "OpenIM/pkg/utils" "context" "google.golang.org/protobuf/types/known/wrapperspb" "time" diff --git a/internal/rpc/group/copy.go b/internal/rpc/group/copy.go index 1d1c7879d..a1e9e9ba9 100644 --- a/internal/rpc/group/copy.go +++ b/internal/rpc/group/copy.go @@ -1,9 +1,9 @@ package group import ( - "Open_IM/pkg/common/db/table/relation" - pbGroup "Open_IM/pkg/proto/group" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/db/table/relation" + pbGroup "OpenIM/pkg/proto/group" + sdkws "OpenIM/pkg/proto/sdkws" "time" ) diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go index 29bfd0de4..02dd9089e 100644 --- a/internal/rpc/group/db_map.go +++ b/internal/rpc/group/db_map.go @@ -1,8 +1,8 @@ package group import ( - pbGroup "Open_IM/pkg/proto/group" - sdkws "Open_IM/pkg/proto/sdkws" + pbGroup "OpenIM/pkg/proto/group" + sdkws "OpenIM/pkg/proto/sdkws" "time" ) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b0d8db256..048cc4cd1 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1,21 +1,21 @@ package group import ( - "Open_IM/internal/common/check" - "Open_IM/internal/common/notification" - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/db/unrelation" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - pbConversation "Open_IM/pkg/proto/conversation" - pbGroup "Open_IM/pkg/proto/group" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/internal/common/notification" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/db/unrelation" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + pbConversation "OpenIM/pkg/proto/conversation" + pbGroup "OpenIM/pkg/proto/group" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "fmt" "github.com/OpenIMSDK/openKeeper" diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index d1d098ae7..c78b6c7e0 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -1,12 +1,12 @@ package group import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/db/table/unrelation" - pbGroup "Open_IM/pkg/proto/group" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/db/table/unrelation" + pbGroup "OpenIM/pkg/proto/group" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "fmt" "strings" diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index 9815d0567..cc921e706 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -1,13 +1,13 @@ package msg import ( - cbapi "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" - pbChat "Open_IM/pkg/proto/msg" - "Open_IM/pkg/utils" + cbapi "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" + pbChat "OpenIM/pkg/proto/msg" + "OpenIM/pkg/utils" "context" ) diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index 5695912a0..79843fa3a 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -1,14 +1,14 @@ package msg import ( - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/proto/msg" - common "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" "context" ) -func (m *msgServer) DelMsgList(ctx context.Context, req *common.DelMsgListReq) (*common.DelMsgListResp, error) { - resp := &common.DelMsgListResp{} +func (m *msgServer) DelMsgList(ctx context.Context, req *sdkws.DelMsgListReq) (*sdkws.DelMsgListResp, error) { + resp := &sdkws.DelMsgListResp{} if _, err := m.MsgInterface.DelMsgBySeqs(ctx, req.UserID, req.SeqList); err != nil { return nil, err } @@ -28,7 +28,7 @@ func (m *msgServer) DelSuperGroupMsg(ctx context.Context, req *msg.DelSuperGroup //if err := m.MsgInterface.SetGroupUserMinSeq(ctx, req.GroupID, maxSeq); err != nil { // return nil, err //} - if err := m.MsgInterface.DeleteUserSuperGroupMsgsAndSetMinSeq(ctx, req.GroupID, req.UserID, 0); err != nil { + if err := m.MsgInterface.DeleteUserSuperGroupMsgsAndSetMinSeq(ctx, req.GroupID, []string{req.UserID}, 0); err != nil { return nil, err } return resp, nil diff --git a/internal/rpc/msg/extend_msg.go b/internal/rpc/msg/extend_msg.go index 07e974540..95cd057c5 100644 --- a/internal/rpc/msg/extend_msg.go +++ b/internal/rpc/msg/extend_msg.go @@ -1,12 +1,12 @@ package msg import ( - "Open_IM/internal/common/notification" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/internal/common/notification" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" go_redis "github.com/go-redis/redis/v8" diff --git a/internal/rpc/msg/extend_msg_callback.go b/internal/rpc/msg/extend_msg_callback.go index 790ee017a..44af1a618 100644 --- a/internal/rpc/msg/extend_msg_callback.go +++ b/internal/rpc/msg/extend_msg_callback.go @@ -1,12 +1,12 @@ package msg import ( - cbapi "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/http" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/proto/msg" + cbapi "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/http" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/proto/msg" "context" ) diff --git a/internal/rpc/msg/msg_status.go b/internal/rpc/msg/msg_status.go index b3a469f37..27c5cc136 100644 --- a/internal/rpc/msg/msg_status.go +++ b/internal/rpc/msg/msg_status.go @@ -1,9 +1,9 @@ package msg import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tracelog" - pbMsg "Open_IM/pkg/proto/msg" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tracelog" + pbMsg "OpenIM/pkg/proto/msg" "context" ) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 8cc24550d..8f8bc9220 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -1,12 +1,12 @@ package msg import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "math/rand" "strconv" diff --git a/internal/rpc/msg/send_pull.go b/internal/rpc/msg/send_pull.go index 3f1be0d04..086e91e70 100644 --- a/internal/rpc/msg/send_pull.go +++ b/internal/rpc/msg/send_pull.go @@ -1,12 +1,12 @@ package msg import ( - "Open_IM/pkg/common/constant" - promePkg "Open_IM/pkg/common/prome" - pbConversation "Open_IM/pkg/proto/conversation" - "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + promePkg "OpenIM/pkg/common/prome" + pbConversation "OpenIM/pkg/proto/conversation" + "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "github.com/golang/protobuf/proto" "sync" diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 7423a393f..78a4388b0 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -1,22 +1,22 @@ package msg import ( - "Open_IM/internal/common/check" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/localcache" - "Open_IM/pkg/common/db/relation" - tablerelation "Open_IM/pkg/common/db/table/relation" - discoveryRegistry "Open_IM/pkg/discoveryregistry" + "OpenIM/internal/common/check" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/localcache" + "OpenIM/pkg/common/db/relation" + tablerelation "OpenIM/pkg/common/db/table/relation" + discoveryRegistry "OpenIM/pkg/discoveryregistry" "github.com/OpenIMSDK/openKeeper" - promePkg "Open_IM/pkg/common/prome" - "Open_IM/pkg/proto/msg" + promePkg "OpenIM/pkg/common/prome" + "OpenIM/pkg/proto/msg" "google.golang.org/grpc" ) type msgServer struct { RegisterCenter discoveryRegistry.SvcDiscoveryRegistry - MsgInterface controller.MsgDatabaseInterface + MsgInterface controller.MsgDatabase Group *check.GroupChecker User *check.UserCheck Conversation *check.ConversationChecker diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index 3582bd8f5..2783def72 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -1,10 +1,10 @@ package msg import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "github.com/go-redis/redis/v8" "gorm.io/gorm" ) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index d72c4ed6f..79108c51f 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -1,20 +1,20 @@ package user import ( - "Open_IM/internal/common/check" - "Open_IM/internal/common/convert" - "Open_IM/internal/common/notification" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/relation" - tablerelation "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/common/tracelog" - registry "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/sdkws" - pbuser "Open_IM/pkg/proto/user" - "Open_IM/pkg/utils" + "OpenIM/internal/common/check" + "OpenIM/internal/common/convert" + "OpenIM/internal/common/notification" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/db/relation" + tablerelation "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/common/tracelog" + registry "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/sdkws" + pbuser "OpenIM/pkg/proto/user" + "OpenIM/pkg/utils" "context" "github.com/OpenIMSDK/openKeeper" "google.golang.org/grpc" diff --git a/internal/startrpc/start.go b/internal/startrpc/start.go index 89ce089e3..43ae2e975 100644 --- a/internal/startrpc/start.go +++ b/internal/startrpc/start.go @@ -1,12 +1,12 @@ package startrpc import ( - "Open_IM/internal/common/network" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/middleware" - promePkg "Open_IM/pkg/common/prome" + "OpenIM/internal/common/network" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/middleware" + promePkg "OpenIM/pkg/common/prome" "flag" "fmt" "github.com/OpenIMSDK/openKeeper" diff --git a/internal/task/clear_msg.go b/internal/task/clear_msg.go index 7dfdb0a7b..9730c93cc 100644 --- a/internal/task/clear_msg.go +++ b/internal/task/clear_msg.go @@ -1,12 +1,12 @@ package task import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/controller" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "fmt" "github.com/go-redis/redis/v8" @@ -36,9 +36,9 @@ func (c *msgTool) ClearAll() { log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) } // working group msg clear - workingGroupIDList, err := c.groupInterface.GetGroupIDsByGroupType(ctx, constant.WorkingGroup) + superGroupIDList, err := c.groupInterface.GetGroupIDsByGroupType(ctx, constant.WorkingGroup) if err == nil { - c.ClearSuperGroupMsg(ctx, workingGroupIDList) + c.ClearSuperGroupMsg(ctx, superGroupIDList) } else { log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) } @@ -60,8 +60,8 @@ func (c *msgTool) ClearUsersMsg(ctx context.Context, userIDList []string) { } } -func (c *msgTool) ClearSuperGroupMsg(ctx context.Context, workingGroupIDList []string) { - for _, groupID := range workingGroupIDList { +func (c *msgTool) ClearSuperGroupMsg(ctx context.Context, superGroupIDList []string) { + for _, groupID := range superGroupIDList { userIDs, err := c.groupInterface.FindGroupMemberUserID(ctx, groupID) if err != nil { log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "FindGroupMemberUserID", err.Error(), groupID) diff --git a/internal/task/clear_msg_test.go b/internal/task/clear_msg_test.go index fc91c2e82..6dd50ac37 100644 --- a/internal/task/clear_msg_test.go +++ b/internal/task/clear_msg_test.go @@ -1,8 +1,8 @@ package task import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/proto/sdkws" "context" "fmt" "strconv" diff --git a/internal/task/cron_task.go b/internal/task/cron_task.go index 0e2f4f6d8..168c21515 100644 --- a/internal/task/cron_task.go +++ b/internal/task/cron_task.go @@ -1,10 +1,10 @@ package task import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "fmt" "time" @@ -36,7 +36,7 @@ func StartCronTask() error { } } -func FixSeq(userID, workingGroupID string, fixAllSeq bool) { +func FixSeq(userID, superGroupID string, fixAllSeq bool) { log.NewPrivateLog(moduleName) log.NewInfo(utils.OperationIDGenerator(), "start cron task", "cron config", config.Config.Mongo.ChatRecordsClearTime) clearCronTask := msgTool{} @@ -46,8 +46,8 @@ func FixSeq(userID, workingGroupID string, fixAllSeq bool) { if userID != "" { clearCronTask.ClearUsersMsg(ctx, []string{userID}) } - if workingGroupID != "" { - clearCronTask.ClearSuperGroupMsg(ctx, []string{workingGroupID}) + if superGroupID != "" { + clearCronTask.ClearSuperGroupMsg(ctx, []string{superGroupID}) } if fixAllSeq { clearCronTask.FixAllSeq(ctx) diff --git a/internal/tx/mongo.go b/internal/tx/mongo.go index dff6b4dd1..40c41aa7e 100644 --- a/internal/tx/mongo.go +++ b/internal/tx/mongo.go @@ -1,7 +1,7 @@ package tx import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "context" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/apistruct/group.go b/pkg/apistruct/group.go index 4fd422900..27f9cd647 100644 --- a/pkg/apistruct/group.go +++ b/pkg/apistruct/group.go @@ -1,7 +1,7 @@ package apistruct import ( - sdkws "Open_IM/pkg/proto/sdkws" + sdkws "OpenIM/pkg/proto/sdkws" ) type CommResp struct { diff --git a/pkg/apistruct/manage.go b/pkg/apistruct/manage.go index 70afe4ad6..85fa57c0e 100644 --- a/pkg/apistruct/manage.go +++ b/pkg/apistruct/manage.go @@ -1,8 +1,8 @@ package apistruct import ( - pbRelay "Open_IM/pkg/proto/relay" - sdkws "Open_IM/pkg/proto/sdkws" + pbRelay "OpenIM/pkg/proto/relay" + sdkws "OpenIM/pkg/proto/sdkws" ) type DeleteUsersReq struct { diff --git a/pkg/apistruct/msg.go b/pkg/apistruct/msg.go index f6f110e23..74b2a37cb 100644 --- a/pkg/apistruct/msg.go +++ b/pkg/apistruct/msg.go @@ -1,8 +1,8 @@ package apistruct import ( - "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" ) type DelMsgReq struct { diff --git a/pkg/apistruct/user.go b/pkg/apistruct/user.go index 47fd58e2e..4b7260e9f 100644 --- a/pkg/apistruct/user.go +++ b/pkg/apistruct/user.go @@ -1,7 +1,7 @@ package apistruct import ( - sdkws "Open_IM/pkg/proto/sdkws" + sdkws "OpenIM/pkg/proto/sdkws" ) type GetUsersInfoReq struct { diff --git a/pkg/callbackstruct/common.go b/pkg/callbackstruct/common.go index d7d590bd1..2290cb9aa 100644 --- a/pkg/callbackstruct/common.go +++ b/pkg/callbackstruct/common.go @@ -1,7 +1,7 @@ package callbackstruct import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "fmt" ) diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 136386297..664facc16 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -1,8 +1,8 @@ package callbackstruct import ( - "Open_IM/pkg/apistruct" - common "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/apistruct" + common "OpenIM/pkg/proto/sdkws" ) type CallbackCommand string diff --git a/pkg/callbackstruct/message.go b/pkg/callbackstruct/message.go index f26c9ba84..2f1ad9434 100644 --- a/pkg/callbackstruct/message.go +++ b/pkg/callbackstruct/message.go @@ -1,8 +1,8 @@ package callbackstruct import ( - "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" ) type CallbackBeforeSendSingleMsgReq struct { diff --git a/pkg/callbackstruct/push.go b/pkg/callbackstruct/push.go index e68694626..900341b0b 100644 --- a/pkg/callbackstruct/push.go +++ b/pkg/callbackstruct/push.go @@ -1,6 +1,6 @@ package callbackstruct -import common "Open_IM/pkg/proto/sdkws" +import common "OpenIM/pkg/proto/sdkws" type CallbackBeforePushReq struct { UserStatusBatchCallbackReq diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 68a0140f6..6adc26471 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -1,6 +1,7 @@ package config import ( + "flag" "fmt" "io/ioutil" "os" @@ -16,9 +17,8 @@ var ( Root = filepath.Join(filepath.Dir(b), "../../..") ) -const ConfName = "openIMConf" - var Config config +var NotificationConfig notificationConfig type CallBackConfig struct { Enable bool `yaml:"enable"` @@ -26,6 +26,21 @@ type CallBackConfig struct { CallbackFailedContinue *bool `yaml:"callbackFailedContinue"` } +type PConversation struct { + ReliabilityLevel int `yaml:"reliabilityLevel"` + UnreadCount bool `yaml:"unreadCount"` +} + +type POfflinePush struct { + PushSwitch bool `yaml:"switch"` + Title string `yaml:"title"` + Desc string `yaml:"desc"` + Ext string `yaml:"ext"` +} +type PDefaultTips struct { + Tips string `yaml:"tips"` +} + type config struct { ServerIP string `yaml:"serverip"` @@ -263,7 +278,6 @@ type config struct { BadgeCount bool `yaml:"badgeCount"` Production bool `yaml:"production"` } - Callback struct { CallbackUrl string `yaml:"callbackUrl"` CallbackBeforeSendSingleMsg CallBackConfig `yaml:"callbackBeforeSendSingleMsg"` @@ -282,191 +296,8 @@ type config struct { CallbackBeforeMemberJoinGroup CallBackConfig `yaml:"callbackBeforeMemberJoinGroup"` CallbackBeforeSetGroupMemberInfo CallBackConfig `yaml:"callbackBeforeSetGroupMemberInfo"` } `yaml:"callback"` - Notification struct { - ///////////////////////group///////////////////////////// - GroupCreated struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupCreated"` - - GroupInfoSet struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupInfoSet"` - - JoinGroupApplication struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"joinGroupApplication"` - - MemberQuit struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"memberQuit"` - - GroupApplicationAccepted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupApplicationAccepted"` - - GroupApplicationRejected struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupApplicationRejected"` - - GroupOwnerTransferred struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupOwnerTransferred"` - - MemberKicked struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"memberKicked"` - - MemberInvited struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"memberInvited"` - - MemberEnter struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"memberEnter"` - - GroupDismissed struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupDismissed"` - - GroupMuted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMuted"` - - GroupCancelMuted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupCancelMuted"` - - GroupMemberMuted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMemberMuted"` - - GroupMemberCancelMuted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMemberCancelMuted"` - GroupMemberInfoSet struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMemberInfoSet"` - GroupMemberSetToAdmin struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMemberSetToAdmin"` - GroupMemberSetToOrdinary struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"groupMemberSetToOrdinaryUser"` - - ////////////////////////user/////////////////////// - UserInfoUpdated struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"userInfoUpdated"` - - //////////////////////friend/////////////////////// - FriendApplication struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendApplicationAdded"` - FriendApplicationApproved struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendApplicationApproved"` - - FriendApplicationRejected struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendApplicationRejected"` - - FriendAdded struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendAdded"` - - FriendDeleted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendDeleted"` - FriendRemarkSet struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendRemarkSet"` - BlackAdded struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"blackAdded"` - BlackDeleted struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"blackDeleted"` - FriendInfoUpdated struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"friendInfoUpdated"` - - ConversationOptUpdate struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips PDefaultTips `yaml:"defaultTips"` - } `yaml:"conversationOptUpdate"` - ConversationSetPrivate struct { - Conversation PConversation `yaml:"conversation"` - OfflinePush POfflinePush `yaml:"offlinePush"` - DefaultTips struct { - OpenTips string `yaml:"openTips"` - CloseTips string `yaml:"closeTips"` - } `yaml:"defaultTips"` - } `yaml:"conversationSetPrivate"` - Signal struct { - OfflinePush struct { - Title string `yaml:"title"` - } `yaml:"offlinePush"` - } `yaml:"signal"` - } - - Rtc struct { + Notification Notification `yaml:"notification"` + Rtc struct { SignalTimeout string `yaml:"signalTimeout"` } `yaml:"rtc"` @@ -484,74 +315,193 @@ type config struct { MessageTransferPrometheusPort []int `yaml:"messageTransferPrometheusPort"` } `yaml:"prometheus"` } -type PConversation struct { - ReliabilityLevel int `yaml:"reliabilityLevel"` - UnreadCount bool `yaml:"unreadCount"` + +type notificationConfig struct { + Notification Notification `yaml:"notification"` } -type POfflinePush struct { - PushSwitch bool `yaml:"switch"` - Title string `yaml:"title"` - Desc string `yaml:"desc"` - Ext string `yaml:"ext"` +type Notification struct { + GroupCreated struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupCreated"` + + GroupInfoSet struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupInfoSet"` + + JoinGroupApplication struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"joinGroupApplication"` + + MemberQuit struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"memberQuit"` + + GroupApplicationAccepted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupApplicationAccepted"` + + GroupApplicationRejected struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupApplicationRejected"` + + GroupOwnerTransferred struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupOwnerTransferred"` + + MemberKicked struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"memberKicked"` + + MemberInvited struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"memberInvited"` + + MemberEnter struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"memberEnter"` + + GroupDismissed struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupDismissed"` + + GroupMuted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMuted"` + + GroupCancelMuted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupCancelMuted"` + + GroupMemberMuted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberMuted"` + + GroupMemberCancelMuted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberCancelMuted"` + GroupMemberInfoSet struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberInfoSet"` + GroupMemberSetToAdmin struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberSetToAdmin"` + GroupMemberSetToOrdinary struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberSetToOrdinaryUser"` + + ////////////////////////user/////////////////////// + UserInfoUpdated struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"userInfoUpdated"` + + //////////////////////friend/////////////////////// + FriendApplication struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendApplicationAdded"` + FriendApplicationApproved struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendApplicationApproved"` + + FriendApplicationRejected struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendApplicationRejected"` + + FriendAdded struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendAdded"` + + FriendDeleted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendDeleted"` + FriendRemarkSet struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendRemarkSet"` + BlackAdded struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"blackAdded"` + BlackDeleted struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"blackDeleted"` + FriendInfoUpdated struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"friendInfoUpdated"` + + ConversationOptUpdate struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"conversationOptUpdate"` + ConversationSetPrivate struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips struct { + OpenTips string `yaml:"openTips"` + CloseTips string `yaml:"closeTips"` + } `yaml:"defaultTips"` + } `yaml:"conversationSetPrivate"` + Signal struct { + OfflinePush struct { + Title string `yaml:"title"` + } `yaml:"offlinePush"` + } `yaml:"signal"` } -type PDefaultTips struct { - Tips string `yaml:"tips"` -} - -type usualConfig struct { - Etcd struct { - UserName string `yaml:"userName"` - Password string `yaml:"password"` - Secret string `yaml:"secret"` - } `yaml:"etcd"` - Mysql struct { - DBUserName string `yaml:"dbMysqlUserName"` - DBPassword string `yaml:"dbMysqlPassword"` - } `yaml:"mysql"` - Mongo struct { - DBUserName string `yaml:"dbUserName"` - DBPassword string `yaml:"dbPassword"` - } `yaml:"mongo"` - Redis struct { - DBUserName string `yaml:"dbUserName"` - DBPassword string `yaml:"dbPassWord"` - } `yaml:"redis"` - Kafka struct { - SASLUserName string `yaml:"SASLUserName"` - SASLPassword string `yaml:"SASLPassword"` - } `yaml:"kafka"` - - Credential struct { - Minio struct { - AccessKeyID string `yaml:"accessKeyID"` - SecretAccessKey string `yaml:"secretAccessKey"` - Endpoint string `yaml:"endpoint"` - } `yaml:"minio"` - } `yaml:"credential"` - - Secret string `yaml:"secret"` - - Tokenpolicy struct { - AccessSecret string `yaml:"accessSecret"` - AccessExpire int64 `yaml:"accessExpire"` - } `yaml:"tokenpolicy"` - - Messageverify struct { - FriendVerify bool `yaml:"friendVerify"` - } `yaml:"messageverify"` - - Push struct { - Getui struct { - PushUrl string `yaml:"pushUrl"` - MasterSecret string `yaml:"masterSecret"` - AppKey string `yaml:"appKey"` - Enable bool `yaml:"enable"` - } `yaml:"getui"` - } `yaml:"push"` -} - -var UsualConfig usualConfig func unmarshalConfig(config interface{}, configPath string) { bytes, err := ioutil.ReadFile(configPath) @@ -565,7 +515,7 @@ func unmarshalConfig(config interface{}, configPath string) { func initConfig(config interface{}, configName, configPath string) { if configPath == "" { - var env string + var env = "CONFIG_NAME" if configName == "config.yaml" { env = "CONFIG_NAME" } else if configName == "usualConfig.yaml" { @@ -587,75 +537,10 @@ func initConfig(config interface{}, configName, configPath string) { unmarshalConfig(config, configPath) } -func InitConfig(configPath string) { - initConfig(&Config, "config.yaml", configPath) - initConfig(&UsualConfig, "usualConfig.yaml", configPath) - - if Config.Mysql.DBUserName == "" { - Config.Mysql.DBUserName = UsualConfig.Mysql.DBUserName - } - if Config.Mysql.DBPassword == "" { - Config.Mysql.DBPassword = UsualConfig.Mysql.DBPassword - } - - if Config.Redis.DBUserName == "" { - Config.Redis.DBUserName = UsualConfig.Redis.DBUserName - } - if Config.Redis.DBPassWord == "" { - Config.Redis.DBPassWord = UsualConfig.Redis.DBPassword - } - - if Config.Mongo.DBUserName == "" { - Config.Mongo.DBUserName = UsualConfig.Mongo.DBUserName - } - if Config.Mongo.DBPassword == "" { - Config.Mongo.DBPassword = UsualConfig.Mongo.DBPassword - } - - if Config.Kafka.SASLUserName == "" { - Config.Kafka.SASLUserName = UsualConfig.Kafka.SASLUserName - } - if Config.Kafka.SASLPassword == "" { - Config.Kafka.SASLPassword = UsualConfig.Kafka.SASLPassword - } - - if Config.Credential.Minio.AccessKeyID == "" { - Config.Credential.Minio.AccessKeyID = UsualConfig.Credential.Minio.AccessKeyID - } - if Config.Credential.Minio.SecretAccessKey == "" { - Config.Credential.Minio.SecretAccessKey = UsualConfig.Credential.Minio.SecretAccessKey - } - if Config.Credential.Minio.Endpoint == "" { - Config.Credential.Minio.Endpoint = UsualConfig.Credential.Minio.Endpoint - } - - if Config.MessageVerify.FriendVerify == nil { - Config.MessageVerify.FriendVerify = &UsualConfig.Messageverify.FriendVerify - } - - if Config.Push.Getui.MasterSecret == "" { - Config.Push.Getui.MasterSecret = UsualConfig.Push.Getui.MasterSecret - } - if Config.Push.Getui.AppKey == "" { - Config.Push.Getui.AppKey = UsualConfig.Push.Getui.AppKey - } - if Config.Push.Getui.PushUrl == "" { - Config.Push.Getui.PushUrl = UsualConfig.Push.Getui.PushUrl - } - if Config.Push.Getui.Enable == nil { - Config.Push.Getui.Enable = &UsualConfig.Push.Getui.Enable - } - if Config.Secret == "" { - Config.Secret = UsualConfig.Secret - } - if Config.TokenPolicy.AccessExpire == 0 { - Config.TokenPolicy.AccessExpire = UsualConfig.Tokenpolicy.AccessExpire - } - if Config.TokenPolicy.AccessSecret == "" { - Config.TokenPolicy.AccessSecret = UsualConfig.Tokenpolicy.AccessSecret - } -} - -func init() { - InitConfig("") +func InitConfig() { + configPath := flag.String("config_path", "../config/", "config folder") + flag.Parse() + initConfig(&Config, "config.yaml", *configPath) + initConfig(&NotificationConfig, "notification.yaml", *configPath) + Config.Notification = NotificationConfig.Notification } diff --git a/pkg/common/db/cache/black.go b/pkg/common/db/cache/black.go index bcd72b529..7cf5f4578 100644 --- a/pkg/common/db/cache/black.go +++ b/pkg/common/db/cache/black.go @@ -1,9 +1,9 @@ package cache import ( - "Open_IM/pkg/common/db/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "github.com/dtm-labs/rockscache" "github.com/go-redis/redis/v8" diff --git a/pkg/common/db/cache/conversation.go b/pkg/common/db/cache/conversation.go index 742fac240..ca7e4263e 100644 --- a/pkg/common/db/cache/conversation.go +++ b/pkg/common/db/cache/conversation.go @@ -1,10 +1,10 @@ package cache import ( - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "github.com/dtm-labs/rockscache" "github.com/go-redis/redis/v8" diff --git a/pkg/common/db/cache/extend_msg_set.go b/pkg/common/db/cache/extend_msg_set.go index 8d254f54f..d4a935c4d 100644 --- a/pkg/common/db/cache/extend_msg_set.go +++ b/pkg/common/db/cache/extend_msg_set.go @@ -1,9 +1,9 @@ package cache import ( - "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "github.com/dtm-labs/rockscache" "time" diff --git a/pkg/common/db/cache/friend.go b/pkg/common/db/cache/friend.go index dfe33f653..543948b0c 100644 --- a/pkg/common/db/cache/friend.go +++ b/pkg/common/db/cache/friend.go @@ -1,10 +1,10 @@ package cache import ( - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "encoding/json" "github.com/dtm-labs/rockscache" diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index 69b991ed7..1b85c7bd8 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -1,10 +1,10 @@ package cache import ( - relationTb "Open_IM/pkg/common/db/table/relation" - unrelation2 "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + relationTb "OpenIM/pkg/common/db/table/relation" + unrelation2 "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "github.com/dtm-labs/rockscache" "github.com/go-redis/redis/v8" diff --git a/pkg/common/db/cache/redis.go b/pkg/common/db/cache/redis.go index d6d3bc110..8869eaf59 100644 --- a/pkg/common/db/cache/redis.go +++ b/pkg/common/db/cache/redis.go @@ -1,12 +1,12 @@ package cache import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - pbChat "Open_IM/pkg/proto/msg" - pbRtc "Open_IM/pkg/proto/rtc" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + pbChat "OpenIM/pkg/proto/msg" + pbRtc "OpenIM/pkg/proto/rtc" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "errors" "fmt" diff --git a/pkg/common/db/cache/redis_test.go b/pkg/common/db/cache/redis_test.go index 1357dfadf..9b977db08 100644 --- a/pkg/common/db/cache/redis_test.go +++ b/pkg/common/db/cache/redis_test.go @@ -1,9 +1,9 @@ package cache import ( - "Open_IM/pkg/common/constant" - pbChat "Open_IM/pkg/proto/msg" - common "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + pbChat "OpenIM/pkg/proto/msg" + common "OpenIM/pkg/proto/sdkws" "context" "flag" "fmt" diff --git a/pkg/common/db/cache/rockscache.go b/pkg/common/db/cache/rockscache.go index 1984113fe..35c025b65 100644 --- a/pkg/common/db/cache/rockscache.go +++ b/pkg/common/db/cache/rockscache.go @@ -1,7 +1,7 @@ package cache import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "context" "encoding/json" "github.com/dtm-labs/rockscache" diff --git a/pkg/common/db/cache/token.go b/pkg/common/db/cache/token.go index c343c759b..dcc2b6760 100644 --- a/pkg/common/db/cache/token.go +++ b/pkg/common/db/cache/token.go @@ -1,9 +1,9 @@ package cache import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tokenverify" + "OpenIM/pkg/utils" "context" "github.com/golang-jwt/jwt/v4" ) diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 3be508189..ef69d5800 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -1,10 +1,10 @@ package cache import ( - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "encoding/json" "github.com/dtm-labs/rockscache" diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index 0c31c8691..64252213a 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -1,7 +1,7 @@ package controller import ( - "Open_IM/pkg/common/db/cache" + "OpenIM/pkg/common/db/cache" "context" "github.com/go-redis/redis/v8" ) diff --git a/pkg/common/db/controller/black.go b/pkg/common/db/controller/black.go index 3647cbc12..969557e0d 100644 --- a/pkg/common/db/controller/black.go +++ b/pkg/common/db/controller/black.go @@ -1,8 +1,8 @@ package controller import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/utils" "context" "errors" "gorm.io/gorm" diff --git a/pkg/common/db/controller/chatlog.go b/pkg/common/db/controller/chatlog.go index 024da2641..50ae13771 100644 --- a/pkg/common/db/controller/chatlog.go +++ b/pkg/common/db/controller/chatlog.go @@ -1,9 +1,9 @@ package controller import ( - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - pbMsg "Open_IM/pkg/proto/msg" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + pbMsg "OpenIM/pkg/proto/msg" "gorm.io/gorm" ) diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index c586d5fde..9db064a50 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -1,12 +1,12 @@ package controller import ( - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - "Open_IM/pkg/common/db/relation" - relationTb "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/utils" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + "OpenIM/pkg/common/db/relation" + relationTb "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/utils" "context" "encoding/json" ) diff --git a/pkg/common/db/controller/extend_msg.go b/pkg/common/db/controller/extend_msg.go index 4f62f8925..83e4d830a 100644 --- a/pkg/common/db/controller/extend_msg.go +++ b/pkg/common/db/controller/extend_msg.go @@ -1,8 +1,8 @@ package controller import ( - unRelationTb "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/proto/sdkws" + unRelationTb "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/proto/sdkws" "context" "github.com/go-redis/redis/v8" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 4afde6f43..58a838dc3 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -1,10 +1,10 @@ package controller import ( - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/utils" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/utils" "context" "errors" "gorm.io/gorm" diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 232b3bdc4..89f3fd9f6 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -1,12 +1,12 @@ package controller import ( - "Open_IM/internal/tx" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - relationTb "Open_IM/pkg/common/db/table/relation" - unRelationTb "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/utils" + "OpenIM/internal/tx" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + relationTb "OpenIM/pkg/common/db/table/relation" + unRelationTb "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/utils" "context" "fmt" "github.com/dtm-labs/rockscache" diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 997aca61c..08043e5cd 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -1,20 +1,20 @@ package controller import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/cache" - unRelationTb "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/common/db/unrelation" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/prome" - "Open_IM/pkg/common/tracelog" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/cache" + unRelationTb "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/common/db/unrelation" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/prome" + "OpenIM/pkg/common/tracelog" "github.com/gogo/protobuf/sortkeys" "sync" "time" - pbMsg "Open_IM/pkg/proto/msg" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + pbMsg "OpenIM/pkg/proto/msg" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "errors" "github.com/go-redis/redis/v8" @@ -146,7 +146,6 @@ type MsgDatabase interface { SetUserMinSeq(ctx context.Context, userID string, minSeq int64) (err error) JudgeMessageReactionEXISTS(ctx context.Context, clientMsgID string, sessionType int32) (bool, error) - SetMessageTypeKeyValue(ctx context.Context, clientMsgID string, sessionType int32, typeKey, value string) error SetMessageReactionExpire(ctx context.Context, clientMsgID string, sessionType int32, expiration time.Duration) (bool, error) diff --git a/pkg/common/db/controller/push.go b/pkg/common/db/controller/push.go index cca942487..16b931c1f 100644 --- a/pkg/common/db/controller/push.go +++ b/pkg/common/db/controller/push.go @@ -1,7 +1,7 @@ package controller import ( - "Open_IM/pkg/common/db/cache" + "OpenIM/pkg/common/db/cache" "context" ) diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 3ec4fb9f0..21d8bd713 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -1,9 +1,9 @@ package controller import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/utils" "context" ) diff --git a/pkg/common/db/localcache/conversation.go b/pkg/common/db/localcache/conversation.go index 592f1e3f2..53a962c92 100644 --- a/pkg/common/db/localcache/conversation.go +++ b/pkg/common/db/localcache/conversation.go @@ -1,9 +1,9 @@ package localcache import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/conversation" + "OpenIM/pkg/common/config" + "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/conversation" "context" "sync" ) diff --git a/pkg/common/db/localcache/group.go b/pkg/common/db/localcache/group.go index e5bc03d45..37de9b4ca 100644 --- a/pkg/common/db/localcache/group.go +++ b/pkg/common/db/localcache/group.go @@ -1,10 +1,10 @@ package localcache import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/discoveryregistry" - "Open_IM/pkg/proto/group" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/discoveryregistry" + "OpenIM/pkg/proto/group" "context" "sync" ) diff --git a/pkg/common/db/relation/black_model.go b/pkg/common/db/relation/black_model.go index dbef9e116..1ce821cb5 100644 --- a/pkg/common/db/relation/black_model.go +++ b/pkg/common/db/relation/black_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/chat_log_model.go b/pkg/common/db/relation/chat_log_model.go index 09aaf4ab1..17c85bbdf 100644 --- a/pkg/common/db/relation/chat_log_model.go +++ b/pkg/common/db/relation/chat_log_model.go @@ -1,11 +1,11 @@ package relation import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - pbMsg "Open_IM/pkg/proto/msg" - sdkws "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + pbMsg "OpenIM/pkg/proto/msg" + sdkws "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "fmt" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index c360fa393..bd4c64570 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -1,10 +1,10 @@ package relation import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/friend_model.go b/pkg/common/db/relation/friend_model.go index 15d541855..f59fe3d35 100644 --- a/pkg/common/db/relation/friend_model.go +++ b/pkg/common/db/relation/friend_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/friend_request_model.go b/pkg/common/db/relation/friend_request_model.go index 1326048ec..5df1405e4 100644 --- a/pkg/common/db/relation/friend_request_model.go +++ b/pkg/common/db/relation/friend_request_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/group_member_model.go b/pkg/common/db/relation/group_member_model.go index 1c178eab3..75d37ce60 100644 --- a/pkg/common/db/relation/group_member_model.go +++ b/pkg/common/db/relation/group_member_model.go @@ -1,10 +1,10 @@ package relation import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/group_model.go b/pkg/common/db/relation/group_model.go index e6a4ff962..5ae5150db 100644 --- a/pkg/common/db/relation/group_model.go +++ b/pkg/common/db/relation/group_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/group_request_model.go b/pkg/common/db/relation/group_request_model.go index 3525878c6..bf2b4e4b2 100644 --- a/pkg/common/db/relation/group_request_model.go +++ b/pkg/common/db/relation/group_request_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/mysql_init.go b/pkg/common/db/relation/mysql_init.go index 1047f51cc..5223fc0e1 100644 --- a/pkg/common/db/relation/mysql_init.go +++ b/pkg/common/db/relation/mysql_init.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" "fmt" "gorm.io/driver/mysql" "time" diff --git a/pkg/common/db/relation/user_model.go b/pkg/common/db/relation/user_model.go index c76aca95e..9ad182d17 100644 --- a/pkg/common/db/relation/user_model.go +++ b/pkg/common/db/relation/user_model.go @@ -1,9 +1,9 @@ package relation import ( - "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/db/table/relation" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "gorm.io/gorm" ) diff --git a/pkg/common/db/relation/utils.go b/pkg/common/db/relation/utils.go index 8e3c62bfc..0f492356a 100644 --- a/pkg/common/db/relation/utils.go +++ b/pkg/common/db/relation/utils.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "gorm.io/gorm" ) diff --git a/pkg/common/db/table/relation/chatlog.go b/pkg/common/db/table/relation/chatlog.go index 62b41a5d0..e85e52891 100644 --- a/pkg/common/db/table/relation/chatlog.go +++ b/pkg/common/db/table/relation/chatlog.go @@ -4,7 +4,7 @@ import ( "gorm.io/gorm" "time" - pbMsg "Open_IM/pkg/proto/msg" + pbMsg "OpenIM/pkg/proto/msg" ) const ( diff --git a/pkg/common/db/table/unrelation/extend_msg_set.go b/pkg/common/db/table/unrelation/extend_msg_set.go index e691776d3..17bf78a61 100644 --- a/pkg/common/db/table/unrelation/extend_msg_set.go +++ b/pkg/common/db/table/unrelation/extend_msg_set.go @@ -1,7 +1,7 @@ package unrelation import ( - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/proto/sdkws" "context" "strconv" "strings" diff --git a/pkg/common/db/table/unrelation/msg.go b/pkg/common/db/table/unrelation/msg.go index 75a784c6d..6d07d4efb 100644 --- a/pkg/common/db/table/unrelation/msg.go +++ b/pkg/common/db/table/unrelation/msg.go @@ -1,8 +1,8 @@ package unrelation import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/proto/sdkws" "context" "strconv" "strings" diff --git a/pkg/common/db/unrelation/extend_msg.go b/pkg/common/db/unrelation/extend_msg.go index 44184c56d..a7f46f1cf 100644 --- a/pkg/common/db/unrelation/extend_msg.go +++ b/pkg/common/db/unrelation/extend_msg.go @@ -1,9 +1,9 @@ package unrelation import ( - unRelationTb "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + unRelationTb "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "errors" "fmt" diff --git a/pkg/common/db/unrelation/mongo.go b/pkg/common/db/unrelation/mongo.go index 1c0058f94..ebaa55e38 100644 --- a/pkg/common/db/unrelation/mongo.go +++ b/pkg/common/db/unrelation/mongo.go @@ -1,9 +1,9 @@ package unrelation import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/utils" "context" "fmt" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index 3f5a9867b..11d2df14b 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -1,9 +1,9 @@ package unrelation import ( - table "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/proto/sdkws" - "Open_IM/pkg/utils" + table "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/proto/sdkws" + "OpenIM/pkg/utils" "context" "errors" "fmt" diff --git a/pkg/common/db/unrelation/super_group.go b/pkg/common/db/unrelation/super_group.go index 82c75e54b..cd873c190 100644 --- a/pkg/common/db/unrelation/super_group.go +++ b/pkg/common/db/unrelation/super_group.go @@ -1,9 +1,9 @@ package unrelation import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db/table/unrelation" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/db/table/unrelation" + "OpenIM/pkg/utils" "context" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index 4c83e2747..d249f0067 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -7,9 +7,9 @@ package http import ( - "Open_IM/pkg/callbackstruct" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" + "OpenIM/pkg/callbackstruct" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" "bytes" "encoding/json" "io/ioutil" diff --git a/pkg/common/kafka/consumer.go b/pkg/common/kafka/consumer.go index f794a244c..dc1512027 100644 --- a/pkg/common/kafka/consumer.go +++ b/pkg/common/kafka/consumer.go @@ -1,7 +1,7 @@ package kafka import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" "sync" "github.com/Shopify/sarama" diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index 61a137458..69a5e9c53 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -1,15 +1,15 @@ package kafka import ( - "Open_IM/pkg/common/config" - log "Open_IM/pkg/common/log" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + log "OpenIM/pkg/common/log" + "OpenIM/pkg/utils" "errors" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" - prome "Open_IM/pkg/common/prome" + prome "OpenIM/pkg/common/prome" ) type Producer struct { diff --git a/pkg/common/log/es_hk.go b/pkg/common/log/es_hk.go index 19eafaed5..e873a115a 100644 --- a/pkg/common/log/es_hk.go +++ b/pkg/common/log/es_hk.go @@ -7,7 +7,7 @@ package log import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" "context" "fmt" elasticV7 "github.com/olivere/elastic/v7" diff --git a/pkg/common/log/file_line_hk.go b/pkg/common/log/file_line_hk.go index 793d10c06..be194e43a 100644 --- a/pkg/common/log/file_line_hk.go +++ b/pkg/common/log/file_line_hk.go @@ -7,7 +7,7 @@ package log import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "github.com/sirupsen/logrus" "runtime" "strings" diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go index 133f42d12..3c24cf8a4 100644 --- a/pkg/common/log/logrus.go +++ b/pkg/common/log/logrus.go @@ -1,8 +1,8 @@ package log import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/tracelog" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/tracelog" "bufio" "context" //"bufio" diff --git a/pkg/common/middleware/rpc.go b/pkg/common/middleware/rpc.go index 755348153..c80d75e67 100644 --- a/pkg/common/middleware/rpc.go +++ b/pkg/common/middleware/rpc.go @@ -1,10 +1,10 @@ package middleware import ( - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/log" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "fmt" "google.golang.org/grpc" diff --git a/pkg/common/prome/grpc.go b/pkg/common/prome/grpc.go index 8542e7e9f..ad869ab8a 100644 --- a/pkg/common/prome/grpc.go +++ b/pkg/common/prome/grpc.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "Open_IM/pkg/common/log" + "OpenIM/pkg/common/log" "google.golang.org/grpc" "google.golang.org/grpc/peer" diff --git a/pkg/common/prome/prometheus.go b/pkg/common/prome/prometheus.go index 20e982e92..065fcf461 100644 --- a/pkg/common/prome/prometheus.go +++ b/pkg/common/prome/prometheus.go @@ -1,7 +1,7 @@ package prome import ( - "Open_IM/pkg/common/config" + "OpenIM/pkg/common/config" "bytes" "net/http" "strconv" diff --git a/pkg/common/tokenverify/jwt_token.go b/pkg/common/tokenverify/jwt_token.go index 9722830a7..7e8a24aec 100644 --- a/pkg/common/tokenverify/jwt_token.go +++ b/pkg/common/tokenverify/jwt_token.go @@ -1,10 +1,10 @@ package tokenverify import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tracelog" - "Open_IM/pkg/utils" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tracelog" + "OpenIM/pkg/utils" "context" "github.com/golang-jwt/jwt/v4" "time" diff --git a/pkg/common/tracelog/ctx.go b/pkg/common/tracelog/ctx.go index 77a15da15..c027736e9 100644 --- a/pkg/common/tracelog/ctx.go +++ b/pkg/common/tracelog/ctx.go @@ -1,7 +1,7 @@ package tracelog import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "context" "github.com/sirupsen/logrus" "runtime" diff --git a/pkg/errs/coderr.go b/pkg/errs/coderr.go index 98ee9a5ca..d933cdf43 100644 --- a/pkg/errs/coderr.go +++ b/pkg/errs/coderr.go @@ -1,7 +1,7 @@ package errs import ( - "Open_IM/pkg/utils" + "OpenIM/pkg/utils" "fmt" "github.com/pkg/errors" "strings" diff --git a/pkg/proto/auth/auth.pb.go b/pkg/proto/auth/auth.pb.go index a10a79920..78c2b8c0d 100644 --- a/pkg/proto/auth/auth.pb.go +++ b/pkg/proto/auth/auth.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: auth/auth.proto -package pbAuth // import "Open_IM/pkg/proto/auth" +package pbAuth // import "OpenIM/pkg/proto/auth" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _ "Open_IM/pkg/proto/sdkws" +import _ "OpenIM/pkg/proto/sdkws" import ( context "golang.org/x/net/context" diff --git a/pkg/proto/auth/auth.proto b/pkg/proto/auth/auth.proto index e46b5de25..87871e3a1 100644 --- a/pkg/proto/auth/auth.proto +++ b/pkg/proto/auth/auth.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; package pbAuth; -option go_package = "Open_IM/pkg/proto/auth;pbAuth"; +option go_package = "OpenIM/pkg/proto/auth;pbAuth"; message userTokenReq { diff --git a/pkg/proto/auto_proto.sh b/pkg/proto/auto_proto.sh index 7fee2beb1..b85b8f91e 100755 --- a/pkg/proto/auto_proto.sh +++ b/pkg/proto/auto_proto.sh @@ -11,7 +11,7 @@ echo "proto file generate success" j=0 -for file in $(find ./Open_IM -name "*.go"); do # Not recommended, will break on whitespace +for file in $(find ./OpenIM -name "*.go"); do # Not recommended, will break on whitespace filelist[j]=$file j=`expr $j + 1` done @@ -19,10 +19,10 @@ done for ((i = 0; i < ${#filelist[*]}; i++)); do proto=${filelist[$i]} - cp $proto ${proto#*./Open_IM/pkg/proto/} + cp $proto ${proto#*./OpenIM/pkg/proto/} done -rm Open_IM -rf -#find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdkws\"/\"Open_IM\/pkg\/proto\/sdkws\"/g' +rm OpenIM -rf +#find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdkws\"/\"OpenIM\/pkg\/proto\/sdkws\"/g' diff --git a/pkg/proto/conversation/conversation.pb.go b/pkg/proto/conversation/conversation.pb.go index 98b174e6a..ed19a9841 100644 --- a/pkg/proto/conversation/conversation.pb.go +++ b/pkg/proto/conversation/conversation.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: conversation/conversation.proto -package conversation // import "Open_IM/pkg/proto/conversation" +package conversation // import "OpenIM/pkg/proto/conversation" import proto "github.com/golang/protobuf/proto" import fmt "fmt" diff --git a/pkg/proto/conversation/conversation.proto b/pkg/proto/conversation/conversation.proto index 7233664f0..dfa04f542 100644 --- a/pkg/proto/conversation/conversation.proto +++ b/pkg/proto/conversation/conversation.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "Open_IM/pkg/proto/conversation;conversation"; +option go_package = "OpenIM/pkg/proto/conversation;conversation"; package conversation; message Conversation{ diff --git a/pkg/proto/file/file.proto b/pkg/proto/file/file.proto index 5c1ab246b..8952c8501 100644 --- a/pkg/proto/file/file.proto +++ b/pkg/proto/file/file.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "Open_IM/pkg/proto/file;file"; +option go_package = "OpenIM/pkg/proto/file;file"; package file; diff --git a/pkg/proto/friend/friend.pb.go b/pkg/proto/friend/friend.pb.go index 1f6449800..9389880ed 100644 --- a/pkg/proto/friend/friend.pb.go +++ b/pkg/proto/friend/friend.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: friend/friend.proto -package friend // import "Open_IM/pkg/proto/friend" +package friend // import "OpenIM/pkg/proto/friend" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import sdkws "Open_IM/pkg/proto/sdkws" +import sdkws "OpenIM/pkg/proto/sdkws" import ( context "golang.org/x/net/context" diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index de47b441e..c8f363fc2 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; -option go_package = "Open_IM/pkg/proto/friend;friend"; +option go_package = "OpenIM/pkg/proto/friend;friend"; package friend; message getPaginationFriendsReq{ diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index 1fb0d7d14..e2af83719 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: group/group.proto -package group // import "Open_IM/pkg/proto/group" +package group // import "OpenIM/pkg/proto/group" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import sdkws "Open_IM/pkg/proto/sdkws" +import sdkws "OpenIM/pkg/proto/sdkws" import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" import ( diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index d5cb23324..aa5a81c4a 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto"; -option go_package = "Open_IM/pkg/proto/group;group"; +option go_package = "OpenIM/pkg/proto/group;group"; package group; diff --git a/pkg/proto/msg/msg.pb.go b/pkg/proto/msg/msg.pb.go index ad33c83e6..b7d3df009 100644 --- a/pkg/proto/msg/msg.pb.go +++ b/pkg/proto/msg/msg.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: msg/msg.proto -package msg // import "Open_IM/pkg/proto/msg" +package msg // import "OpenIM/pkg/proto/msg" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import sdkws "Open_IM/pkg/proto/sdkws" +import sdkws "OpenIM/pkg/proto/sdkws" import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" import ( diff --git a/pkg/proto/msg/msg.proto b/pkg/proto/msg/msg.proto index 63902a98b..3f716c2a5 100644 --- a/pkg/proto/msg/msg.proto +++ b/pkg/proto/msg/msg.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto"; -option go_package = "Open_IM/pkg/proto/msg;msg"; +option go_package = "OpenIM/pkg/proto/msg;msg"; package msg; message MsgDataToMQ{ diff --git a/pkg/proto/msggateway/relay.pb.go b/pkg/proto/msggateway/relay.pb.go index e56b9c9c0..2dc38605b 100644 --- a/pkg/proto/msggateway/relay.pb.go +++ b/pkg/proto/msggateway/relay.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: relay/relay.proto -package pbRelay // import "Open_IM/pkg/proto/relay" +package pbRelay // import "OpenIM/pkg/proto/relay" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import sdkws "Open_IM/pkg/proto/sdkws" +import sdkws "OpenIM/pkg/proto/sdkws" import ( context "golang.org/x/net/context" diff --git a/pkg/proto/msggateway/relay.proto b/pkg/proto/msggateway/relay.proto index 5177fac7f..47f981137 100644 --- a/pkg/proto/msggateway/relay.proto +++ b/pkg/proto/msggateway/relay.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; -option go_package = "Open_IM/pkg/proto/relay;pbRelay"; +option go_package = "OpenIM/pkg/proto/relay;pbRelay"; package relay; message OnlinePushMsgReq { diff --git a/pkg/proto/push/push.pb.go b/pkg/proto/push/push.pb.go index 5208657b9..7cb0d1f04 100644 --- a/pkg/proto/push/push.pb.go +++ b/pkg/proto/push/push.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: push/push.proto -package pbPush // import "Open_IM/pkg/proto/push" +package pbPush // import "OpenIM/pkg/proto/push" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import sdkws "Open_IM/pkg/proto/sdkws" +import sdkws "OpenIM/pkg/proto/sdkws" import ( context "golang.org/x/net/context" diff --git a/pkg/proto/push/push.proto b/pkg/proto/push/push.proto index 596a0ede3..d97096896 100644 --- a/pkg/proto/push/push.proto +++ b/pkg/proto/push/push.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; -option go_package = "Open_IM/pkg/proto/push;pbPush"; +option go_package = "OpenIM/pkg/proto/push;pbPush"; package push; message PushMsgReq { diff --git a/pkg/proto/rtc/rtc.pb.go b/pkg/proto/rtc/rtc.pb.go index f826725e2..381a0cecd 100644 --- a/pkg/proto/rtc/rtc.pb.go +++ b/pkg/proto/rtc/rtc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: rtc/rtc.proto -package rtc // import "Open_IM/pkg/proto/rtc" +package rtc // import "OpenIM/pkg/proto/rtc" import proto "github.com/golang/protobuf/proto" import fmt "fmt" diff --git a/pkg/proto/rtc/rtc.proto b/pkg/proto/rtc/rtc.proto index e70739574..ee20e2142 100644 --- a/pkg/proto/rtc/rtc.proto +++ b/pkg/proto/rtc/rtc.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "Open_IM/pkg/proto/rtc;rtc"; +option go_package = "OpenIM/pkg/proto/rtc;rtc"; package proto; message CommonResp{ diff --git a/pkg/proto/sdk_ws/group.proto b/pkg/proto/sdk_ws/group.proto index 4ab168601..d0539897a 100644 --- a/pkg/proto/sdk_ws/group.proto +++ b/pkg/proto/sdk_ws/group.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto"; -option go_package = "Open_IM/pkg/proto/group;group"; +option go_package = "OpenIM/pkg/proto/group;group"; package group; diff --git a/pkg/proto/sdkws/ws.pb.go b/pkg/proto/sdkws/ws.pb.go index dc6569378..fe4781d61 100644 --- a/pkg/proto/sdkws/ws.pb.go +++ b/pkg/proto/sdkws/ws.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: sdkws/ws.proto -package sdkws // import "Open_IM/pkg/proto/sdkws" +package sdkws // import "OpenIM/pkg/proto/sdkws" import proto "github.com/golang/protobuf/proto" import fmt "fmt" diff --git a/pkg/proto/sdkws/ws.proto b/pkg/proto/sdkws/ws.proto index 1daa1747e..684107e65 100644 --- a/pkg/proto/sdkws/ws.proto +++ b/pkg/proto/sdkws/ws.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto"; -option go_package = "Open_IM/pkg/proto/sdkws;sdkws"; +option go_package = "OpenIM/pkg/proto/sdkws;sdkws"; package sdkws; diff --git a/pkg/proto/user/user.pb.go b/pkg/proto/user/user.pb.go index 8e05e8d7e..92f1e484e 100644 --- a/pkg/proto/user/user.pb.go +++ b/pkg/proto/user/user.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: user/user.proto -package user // import "Open_IM/pkg/proto/user" +package user // import "OpenIM/pkg/proto/user" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import conversation "Open_IM/pkg/proto/conversation" -import sdkws "Open_IM/pkg/proto/sdkws" +import conversation "OpenIM/pkg/proto/conversation" +import sdkws "OpenIM/pkg/proto/sdkws" import ( context "golang.org/x/net/context" diff --git a/pkg/proto/user/user.proto b/pkg/proto/user/user.proto index 085cdafb7..e56856f3d 100644 --- a/pkg/proto/user/user.proto +++ b/pkg/proto/user/user.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/conversation/conversation.proto"; -option go_package = "Open_IM/pkg/proto/user;user"; +option go_package = "OpenIM/pkg/proto/user;user"; package user; diff --git a/pkg/statistics/statistics.go b/pkg/statistics/statistics.go index 63653c42f..d61c6098b 100644 --- a/pkg/statistics/statistics.go +++ b/pkg/statistics/statistics.go @@ -1,7 +1,7 @@ package statistics import ( - "Open_IM/pkg/common/log" + "OpenIM/pkg/common/log" "time" ) diff --git a/pkg/utils/callback.go b/pkg/utils/callback.go index 83793bf32..fdc1ccaa6 100644 --- a/pkg/utils/callback.go +++ b/pkg/utils/callback.go @@ -1,8 +1,8 @@ package utils import ( - "Open_IM/pkg/common/constant" - sdkws "Open_IM/pkg/proto/sdkws" + "OpenIM/pkg/common/constant" + sdkws "OpenIM/pkg/proto/sdkws" "github.com/golang/protobuf/proto" ) diff --git a/pkg/utils/file.go b/pkg/utils/file.go index b385c55d7..08c3e7940 100644 --- a/pkg/utils/file.go +++ b/pkg/utils/file.go @@ -1,7 +1,7 @@ package utils import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "fmt" "math/rand" "os" diff --git a/pkg/utils/jwt_token_test.go b/pkg/utils/jwt_token_test.go index 3c4f8e4ce..66fe0de85 100644 --- a/pkg/utils/jwt_token_test.go +++ b/pkg/utils/jwt_token_test.go @@ -1,9 +1,9 @@ package utils import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/tokenverify" + "OpenIM/pkg/common/config" + "OpenIM/pkg/common/constant" + "OpenIM/pkg/common/tokenverify" "testing" "time" diff --git a/pkg/utils/platform_number_id_to_name_test.go b/pkg/utils/platform_number_id_to_name_test.go index 8a956bfac..77ee6bf50 100644 --- a/pkg/utils/platform_number_id_to_name_test.go +++ b/pkg/utils/platform_number_id_to_name_test.go @@ -1,7 +1,7 @@ package utils import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "testing" "github.com/stretchr/testify/assert" diff --git a/pkg/utils/strings.go b/pkg/utils/strings.go index d2896cf78..207584448 100644 --- a/pkg/utils/strings.go +++ b/pkg/utils/strings.go @@ -7,7 +7,7 @@ package utils import ( - "Open_IM/pkg/common/constant" + "OpenIM/pkg/common/constant" "encoding/json" "math/rand" "strconv"