IM/open-im-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
wangchuxiao
2023-02-23 19:15:30 +08:00
parent 9c76722c90
commit f586ab1ac2
205 changed files with 1216 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/auth/auth.go
+8 -8
View File
@@ -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"
internal/api/conversation/conversation.go
+6 -6
View File
@@ -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"
internal/api/friend/friend.go
+9 -9
View File
@@ -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"
internal/api/friend/friend1.go
+4 -4
View File
@@ -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"
)
internal/api/group/group.go
+11 -11
View File
@@ -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 把用户踢出群组
internal/api/group/group_test.go
+2 -2
View File
@@ -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"
internal/api/group/super_group.go
+8 -8
View File
@@ -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"
internal/api/manage/management_chat.go
+8 -8
View File
@@ -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"
internal/api/manage/management_user.go
+8 -8
View File
@@ -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"
internal/api/msg/del_msg.go
+8 -8
View File
@@ -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"
internal/api/msg/extend_msg.go
+7 -7
View File
@@ -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"
internal/api/msg/get_max_min_seq.go
+5 -5
View File
@@ -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"
internal/api/msg/pull_msg.go
+6 -6
View File
@@ -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"
internal/api/msg/send_msg.go
+4 -4
View File
@@ -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"
internal/api/route.go
+169
View File
@@ -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
}
internal/api/third/ali_oss_credential.go
+6 -6
View File
@@ -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"
internal/api/third/aws_storage_credential.go
+7 -7
View File
@@ -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"
internal/api/third/fcm_update_token.go
+5 -5
View File
@@ -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"
internal/api/third/minio_init.go
+4 -4
View File
@@ -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"
internal/api/third/minio_storage_credential.go
+8 -8
View File
@@ -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"
internal/api/third/rtc.go
+5 -5
View File
@@ -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"
)
internal/api/third/set_app_badge.go
+5 -5
View File
@@ -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"
)
internal/api/third/tencent_cloud_storage_credential.go
+6 -6
View File
@@ -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"
internal/api/user/user.go
+10 -10
View File
@@ -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"
internal/api2rpc/api.go
+4 -4
View File
@@ -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"
internal/common/check/access.go
+1 -1
View File
@@ -1,7 +1,7 @@
package check
import (
"Open_IM/pkg/common/tokenverify"
"OpenIM/pkg/common/tokenverify"
"context"
)
internal/common/check/black.go
+1 -1
View File
@@ -1,7 +1,7 @@
package check
import (
discoveryRegistry "Open_IM/pkg/discoveryregistry"
discoveryRegistry "OpenIM/pkg/discoveryregistry"
"context"
)
internal/common/check/conversation.go
+4 -4
View File
@@ -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"
)
internal/common/check/friend.go
+5 -5
View File
@@ -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"
)
internal/common/check/group.go
+6 -6
View File
@@ -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"
internal/common/check/msg.go
+4 -4
View File
@@ -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"
)
internal/common/check/user.go
+6 -6
View File
@@ -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"
internal/common/convert/convert.go
+5 -5
View File
@@ -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"
internal/common/notification/c.go
+8 -9
View File
@@ -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)
}
internal/common/notification/conversation.go
+3 -3
View File
@@ -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"
internal/common/notification/extend_msg.go
+6 -6
View File
@@ -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"
)
internal/common/notification/friend.go
+4 -4
View File
@@ -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"
internal/common/notification/group.go
+8 -8
View File
@@ -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"
internal/common/notification/msg.go
+2 -2
View File
@@ -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"
internal/common/notification/super_group.go
+1 -1
View File
@@ -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"
internal/common/notification/user.go
+2 -2
View File
@@ -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"
)
internal/common/rpcserver/register.go
+4 -4
View File
@@ -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"
internal/msggateway/batch_push.go
+5 -5
View File
@@ -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"
)
internal/msggateway/callback.go
+5 -5
View File
@@ -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"
)
internal/msggateway/init.go
+4 -4
View File
@@ -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"
)
internal/msggateway/logic.go
+9 -9
View File
@@ -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"
internal/msggateway/new/client.go
+2 -2
View File
@@ -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"
internal/msggateway/new/compressor.go
+1 -1
View File
@@ -1,7 +1,7 @@
package new
import (
"Open_IM/pkg/utils"
"OpenIM/pkg/utils"
"bytes"
"compress/gzip"
"io/ioutil"
internal/msggateway/new/context.go
+1 -1
View File
@@ -1,7 +1,7 @@
package new
import (
"Open_IM/pkg/utils"
"OpenIM/pkg/utils"
"net/http"
"strconv"
)
internal/msggateway/new/encoder.go
+1 -1
View File
@@ -1,7 +1,7 @@
package new
import (
"Open_IM/pkg/utils"
"OpenIM/pkg/utils"
"bytes"
"encoding/gob"
)
internal/msggateway/new/http_error.go
+1 -1
View File
@@ -1,7 +1,7 @@
package new
import (
"Open_IM/pkg/common/constant"
"OpenIM/pkg/common/constant"
"errors"
"net/http"
)
internal/msggateway/new/message_handler.go
+4 -4
View File
@@ -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"
internal/msggateway/new/n_ws_server.go
+3 -3
View File
@@ -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"
internal/msggateway/relay_rpc_server.go
+8 -8
View File
@@ -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"
internal/msggateway/validate.go
+5 -5
View File
@@ -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"
)
internal/msggateway/ws_server.go
+7 -7
View File
@@ -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"
internal/msgtransfer/init.go
+2 -2
View File
@@ -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"
)
internal/msgtransfer/modify_msg_handler.go
+12 -12
View File
@@ -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"
internal/msgtransfer/online_history_msg_handler.go
+11 -11
View File
@@ -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"
internal/msgtransfer/online_msg_to_mongo_handler.go
+10 -10
View File
@@ -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"
internal/msgtransfer/persistent_msg_handler.go
+7 -7
View File
@@ -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"
internal/push/callback.go
+7 -7
View File
@@ -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"
)
internal/push/fcm/push.go
+4 -4
View File
@@ -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"
internal/push/fcm/push_test.go
+2 -2
View File
@@ -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"
internal/push/getui/body.go
+1 -1
View File
@@ -1,7 +1,7 @@
package getui
import (
"Open_IM/pkg/common/config"
"OpenIM/pkg/common/config"
"fmt"
)
internal/push/getui/push.go
+8 -8
View File
@@ -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"
internal/push/init.go
+8 -8
View File
@@ -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"
)
internal/push/jpush/body/notification.go
+1 -1
View File
@@ -1,7 +1,7 @@
package body
import (
"Open_IM/pkg/common/config"
"OpenIM/pkg/common/config"
)
type Notification struct {
internal/push/jpush/body/platform.go
+1 -1
View File
@@ -1,7 +1,7 @@
package body
import (
"Open_IM/pkg/common/constant"
"OpenIM/pkg/common/constant"
"errors"
)
internal/push/jpush/push.go
+4 -4
View File
@@ -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"
internal/push/push_handler.go
+9 -9
View File
@@ -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"
internal/push/push_rpc_server.go
+8 -8
View File
@@ -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"
internal/push/push_to_client.go
+12 -12
View File
@@ -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"
internal/rpc/auth/auth.go
+14 -14
View File
@@ -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"
internal/rpc/conversation/conversaion.go
+10 -10
View File
@@ -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"
internal/rpc/friend/black.go
+5 -5
View File
@@ -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"
)
internal/rpc/friend/callback.go
+6 -6
View File
@@ -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"
)
internal/rpc/friend/friend.go
+13 -13
View File
@@ -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"
internal/rpc/group/callback.go
+9 -9
View File
@@ -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"
internal/rpc/group/copy.go
+3 -3
View File
@@ -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"
)
internal/rpc/group/db_map.go
+2 -2
View File
@@ -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"
)
internal/rpc/group/group.go
+15 -15
View File
@@ -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"
internal/rpc/group/super_group.go
+6 -6
View File
@@ -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"
internal/rpc/msg/callback.go
+7 -7
View File
@@ -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"
)
internal/rpc/msg/delete.go
+6 -6
View File
@@ -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
internal/rpc/msg/extend_msg.go
+6 -6
View File
@@ -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"
internal/rpc/msg/extend_msg_callback.go
+6 -6
View File
@@ -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"
)
internal/rpc/msg/msg_status.go
+3 -3
View File
@@ -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"
)
internal/rpc/msg/send_msg.go
+6 -6
View File
@@ -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"
internal/rpc/msg/send_pull.go
+6 -6
View File
@@ -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"
internal/rpc/msg/server.go
+9 -9
View File
@@ -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
internal/rpc/msg/utils.go
+4 -4
View File
@@ -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"
)
internal/rpc/user/user.go
+14 -14
View File
@@ -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"
internal/startrpc/start.go
+6 -6
View File
@@ -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"
internal/task/clear_msg.go
+10 -10
View File
@@ -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)
internal/task/clear_msg_test.go
+2 -2
View File
@@ -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"
internal/task/cron_task.go
+7 -7
View File
@@ -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)
internal/tx/mongo.go
+1 -1
View File
@@ -1,7 +1,7 @@
package tx
import (
"Open_IM/pkg/utils"
"OpenIM/pkg/utils"
"context"
"go.mongodb.org/mongo-driver/mongo"
)