IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove some structs (#509)

Browse Source 
* 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 434f22564a.

* Delete .idea directory

* feat: regenerate pb file

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com>
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>
This commit is contained in:
Gordon
2023-07-12 17:48:06 +08:00
committed by GitHub
parent 4d05ea1de6
commit c7c9f170ad
5 changed files with 122 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/msg/revoke.go
-2
View File
@@ -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"
pkg/common/db/relation/mysql_init_test.go
-38
View File
@@ -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")
}
}
pkg/proto/conversation/conversation.go
+31 -30
View File
@@ -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 == "" {
pkg/proto/msg/msg.go
+54 -54
View File
@@ -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
pkg/proto/third/third.go
+37 -37
View File
@@ -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 {