From c7c9f170ad960f2f13ae791516c91ceee06e7d4b Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Wed, 12 Jul 2023 17:48:06 +0800 Subject: [PATCH] fix: remove some structs (#509) * statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime * feat: regenerate pb file * feat: regenerate pb file * Revert "feat: regenerate pb file" This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885. * Delete .idea directory * feat: regenerate pb file --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com> --- internal/rpc/msg/revoke.go | 2 - pkg/common/db/relation/mysql_init_test.go | 38 -------- pkg/proto/conversation/conversation.go | 61 ++++++------ pkg/proto/msg/msg.go | 108 +++++++++++----------- pkg/proto/third/third.go | 74 +++++++-------- 5 files changed, 122 insertions(+), 161 deletions(-) delete mode 100644 pkg/common/db/relation/mysql_init_test.go diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index b7664e2c6..c95d347e7 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -19,8 +19,6 @@ import ( "encoding/json" "time" - "github.com/google/uuid" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" diff --git a/pkg/common/db/relation/mysql_init_test.go b/pkg/common/db/relation/mysql_init_test.go deleted file mode 100644 index a4f38f7bc..000000000 --- a/pkg/common/db/relation/mysql_init_test.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright © 2023 OpenIM. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package relation - -import ( - "fmt" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "testing" -) - -//TestNewGormDB Test the retry of sporadic errors and the direct exit of wrong password. -func TestNewGormDB(t *testing.T) { - err := config.InitConfig("config_folder_path") - if err != nil { - fmt.Println("config load error") - return - } - db, err := newMysqlGormDB() - if err != nil { - fmt.Println("password error") - return - } - if db != nil { - fmt.Println("success connect") - } -} diff --git a/pkg/proto/conversation/conversation.go b/pkg/proto/conversation/conversation.go index 64b467ddb..7e8f62bbc 100644 --- a/pkg/proto/conversation/conversation.go +++ b/pkg/proto/conversation/conversation.go @@ -39,15 +39,15 @@ func (x *Conversation) Check() error { return nil } -func (x *ModifyConversationFieldReq) Check() error { - if x.UserIDList == nil { - return errs.ErrArgs.Wrap("userIDList is empty") - } - if x.Conversation == nil { - return errs.ErrArgs.Wrap("conversation is empty") - } - return nil -} +//func (x *ModifyConversationFieldReq) Check() error { +// if x.UserIDList == nil { +// return errs.ErrArgs.Wrap("userIDList is empty") +// } +// if x.Conversation == nil { +// return errs.ErrArgs.Wrap("conversation is empty") +// } +// return nil +//} func (x *SetConversationReq) Check() error { if x.Conversation == nil { @@ -59,18 +59,18 @@ func (x *SetConversationReq) Check() error { return nil } -func (x *SetRecvMsgOptReq) Check() error { - if x.OwnerUserID == "" { - return errs.ErrArgs.Wrap("ownerUserID is empty") - } - if x.ConversationID == "" { - return errs.ErrArgs.Wrap("conversationID is empty") - } - if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 { - return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid") - } - return nil -} +//func (x *SetRecvMsgOptReq) Check() error { +// if x.OwnerUserID == "" { +// return errs.ErrArgs.Wrap("ownerUserID is empty") +// } +// if x.ConversationID == "" { +// return errs.ErrArgs.Wrap("conversationID is empty") +// } +// if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 { +// return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid") +// } +// return nil +//} func (x *GetConversationReq) Check() error { if x.OwnerUserID == "" { @@ -99,15 +99,16 @@ func (x *GetAllConversationsReq) Check() error { return nil } -func (x *BatchSetConversationsReq) Check() error { - if x.Conversations == nil { - return errs.ErrArgs.Wrap("conversations is empty") - } - if x.OwnerUserID == "" { - return errs.ErrArgs.Wrap("conversation is empty") - } - return nil -} +// +//func (x *BatchSetConversationsReq) Check() error { +// if x.Conversations == nil { +// return errs.ErrArgs.Wrap("conversations is empty") +// } +// if x.OwnerUserID == "" { +// return errs.ErrArgs.Wrap("conversation is empty") +// } +// return nil +//} func (x *GetRecvMsgNotNotifyUserIDsReq) Check() error { if x.GroupID == "" { diff --git a/pkg/proto/msg/msg.go b/pkg/proto/msg/msg.go index a221639ee..aeb6deece 100644 --- a/pkg/proto/msg/msg.go +++ b/pkg/proto/msg/msg.go @@ -44,60 +44,60 @@ func (x *GetSendMsgStatusReq) Check() error { return nil } -func (x *ModifyMessageReactionExtensionsReq) Check() error { - if x.ConversationID == "" { - return errs.ErrArgs.Wrap("conversationID is empty") - } - if x.SessionType < 1 || x.SessionType > 4 { - return errs.ErrArgs.Wrap("sessionType is invalid") - } - if x.ReactionExtensions == nil { - return errs.ErrArgs.Wrap("reactionExtensions is empty") - } - return nil -} - -func (x *SetMessageReactionExtensionsReq) Check() error { - if x.ConversationID == "" { - return errs.ErrArgs.Wrap("conversationID is empty") - } - if x.SessionType < 1 || x.SessionType > 4 { - return errs.ErrArgs.Wrap("sessionType is invalid") - } - if x.ReactionExtensions == nil { - return errs.ErrArgs.Wrap("reactionExtensions is empty") - } - return nil -} - -func (x *GetMessagesReactionExtensionsReq) Check() error { - if x.ConversationID == "" { - return errs.ErrArgs.Wrap("conversationID is empty") - } - if x.SessionType < 1 || x.SessionType > 4 { - return errs.ErrArgs.Wrap("sessionType is invalid") - } - if x.MessageReactionKeys == nil { - return errs.ErrArgs.Wrap("MessageReactionKeys is empty") - } - if x.TypeKeys == nil { - return errs.ErrArgs.Wrap("TypeKeys is empty") - } - return nil -} - -func (x *DeleteMessagesReactionExtensionsReq) Check() error { - if x.ConversationID == "" { - return errs.ErrArgs.Wrap("conversationID is empty") - } - if x.SessionType < 1 || x.SessionType > 4 { - return errs.ErrArgs.Wrap("sessionType is invalid") - } - if x.ReactionExtensions == nil { - return errs.ErrArgs.Wrap("ReactionExtensions is empty") - } - return nil -} +//func (x *ModifyMessageReactionExtensionsReq) Check() error { +// if x.ConversationID == "" { +// return errs.ErrArgs.Wrap("conversationID is empty") +// } +// if x.SessionType < 1 || x.SessionType > 4 { +// return errs.ErrArgs.Wrap("sessionType is invalid") +// } +// if x.ReactionExtensions == nil { +// return errs.ErrArgs.Wrap("reactionExtensions is empty") +// } +// return nil +//} +// +//func (x *SetMessageReactionExtensionsReq) Check() error { +// if x.ConversationID == "" { +// return errs.ErrArgs.Wrap("conversationID is empty") +// } +// if x.SessionType < 1 || x.SessionType > 4 { +// return errs.ErrArgs.Wrap("sessionType is invalid") +// } +// if x.ReactionExtensions == nil { +// return errs.ErrArgs.Wrap("reactionExtensions is empty") +// } +// return nil +//} +// +//func (x *GetMessagesReactionExtensionsReq) Check() error { +// if x.ConversationID == "" { +// return errs.ErrArgs.Wrap("conversationID is empty") +// } +// if x.SessionType < 1 || x.SessionType > 4 { +// return errs.ErrArgs.Wrap("sessionType is invalid") +// } +// if x.MessageReactionKeys == nil { +// return errs.ErrArgs.Wrap("MessageReactionKeys is empty") +// } +// if x.TypeKeys == nil { +// return errs.ErrArgs.Wrap("TypeKeys is empty") +// } +// return nil +//} +// +//func (x *DeleteMessagesReactionExtensionsReq) Check() error { +// if x.ConversationID == "" { +// return errs.ErrArgs.Wrap("conversationID is empty") +// } +// if x.SessionType < 1 || x.SessionType > 4 { +// return errs.ErrArgs.Wrap("sessionType is invalid") +// } +// if x.ReactionExtensions == nil { +// return errs.ErrArgs.Wrap("ReactionExtensions is empty") +// } +// return nil +//} func (x *DelMsgsReq) Check() error { return nil diff --git a/pkg/proto/third/third.go b/pkg/proto/third/third.go index 9562255fc..0e2072727 100644 --- a/pkg/proto/third/third.go +++ b/pkg/proto/third/third.go @@ -16,43 +16,43 @@ package third import "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" -func (x *ApplyPutReq) Check() error { - if x.PutID == "" { - return errs.ErrArgs.Wrap("PutID is empty") - } - if x.ContentType == "" { - return errs.ErrArgs.Wrap("ContentType is empty") - } - return nil -} - -func (x *ConfirmPutReq) Check() error { - if x.PutID == "" { - return errs.ErrArgs.Wrap("PutID is empty") - } - return nil -} - -func (x *GetUrlReq) Check() error { - if x.Name == "" { - return errs.ErrArgs.Wrap("Name is empty") - } - return nil -} - -func (x *GetPutReq) Check() error { - if x.PutID == "" { - return errs.ErrArgs.Wrap("PutID is empty") - } - return nil -} - -func (x *GetHashInfoReq) Check() error { - if x.Hash == "" { - return errs.ErrArgs.Wrap("Hash is empty") - } - return nil -} +//func (x *ApplyPutReq) Check() error { +// if x.PutID == "" { +// return errs.ErrArgs.Wrap("PutID is empty") +// } +// if x.ContentType == "" { +// return errs.ErrArgs.Wrap("ContentType is empty") +// } +// return nil +//} +// +//func (x *ConfirmPutReq) Check() error { +// if x.PutID == "" { +// return errs.ErrArgs.Wrap("PutID is empty") +// } +// return nil +//} +// +//func (x *GetUrlReq) Check() error { +// if x.Name == "" { +// return errs.ErrArgs.Wrap("Name is empty") +// } +// return nil +//} +// +//func (x *GetPutReq) Check() error { +// if x.PutID == "" { +// return errs.ErrArgs.Wrap("PutID is empty") +// } +// return nil +//} +// +//func (x *GetHashInfoReq) Check() error { +// if x.Hash == "" { +// return errs.ErrArgs.Wrap("Hash is empty") +// } +// return nil +//} func (x *FcmUpdateTokenReq) Check() error { if x.PlatformID < 1 || x.PlatformID > 9 {