From b7b049e4b182f9f377965dfd0ec234d56e55f862 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Tue, 14 Nov 2023 18:16:00 +0800 Subject: [PATCH 01/11] feat:callback test --- config/config.yaml | 6 ++- internal/rpc/group/callback.go | 42 ++++++++++++++++++++ internal/rpc/group/group.go | 9 +++++ pkg/callbackstruct/common.go | 3 +- pkg/callbackstruct/friend.go | 23 +++++++++++ pkg/callbackstruct/group.go | 71 ++++++++++++++++++++++++++++++++++ pkg/callbackstruct/message.go | 34 ++++++++++++++++ pkg/common/config/config.go | 1 + 8 files changed, 187 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index e375118f7..60a0ac236 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: + url: "http://127.0.0.1:8080/sdkName" beforeSendSingleMsg: enable: false timeout: 5 @@ -364,6 +364,10 @@ callback: enable: false timeout: 5 failedContinue: true + afterCreateGroup: + enable: false + timeout: 5 + failedContinue: true beforeMemberJoinGroup: enable: false timeout: 5 diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 38174738b..01d7f44e6 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -86,6 +86,48 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) ( return nil } +func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (err error) { + if !config.Config.Callback.CallbackBeforeCreateGroup.Enable { + return nil + } + cbReq := &callbackstruct.CallbackBeforeCreateGroupReq{ + CallbackCommand: "callbackAfterCreateGroupCommand", + OperationID: mcontext.GetOperationID(ctx), + GroupInfo: req.GroupInfo, + } + cbReq.InitMemberList = append(cbReq.InitMemberList, &apistruct.GroupAddMemberInfo{ + UserID: req.OwnerUserID, + RoleLevel: constant.GroupOwner, + }) + for _, userID := range req.AdminUserIDs { + cbReq.InitMemberList = append(cbReq.InitMemberList, &apistruct.GroupAddMemberInfo{ + UserID: userID, + RoleLevel: constant.GroupAdmin, + }) + } + for _, userID := range req.MemberUserIDs { + cbReq.InitMemberList = append(cbReq.InitMemberList, &apistruct.GroupAddMemberInfo{ + UserID: userID, + RoleLevel: constant.GroupOrdinaryUsers, + }) + } + resp := &callbackstruct.CallbackBeforeCreateGroupResp{} + err = http.CallBackPostReturn( + ctx, + config.Config.Callback.CallbackUrl, + cbReq, + resp, + config.Config.Callback.CallbackBeforeCreateGroup, + ) + if err != nil { + if err == errs.ErrCallbackContinue { + return nil + } + return err + } + return nil +} + func CallbackBeforeMemberJoinGroup( ctx context.Context, groupMember *relation.GroupMemberModel, diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 6a0ce5733..7327257bd 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -225,6 +225,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR if len(userMap) != len(userIDs) { return nil, errs.ErrUserIDNotFound.Wrap("user not found") } + // Callback Before create Group if err := CallbackBeforeCreateGroup(ctx, req); err != nil { return nil, err } @@ -298,6 +299,14 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR } s.Notification.GroupCreatedNotification(ctx, tips) } + reqCallBackAfter := &pbgroup.CreateGroupReq{ + GroupInfo: resp.GroupInfo, + } + + if err := CallbackAfterCreateGroup(ctx, reqCallBackAfter); err != nil { + return nil, err + } + return resp, nil } diff --git a/pkg/callbackstruct/common.go b/pkg/callbackstruct/common.go index ef84d52b9..0922dbf19 100644 --- a/pkg/callbackstruct/common.go +++ b/pkg/callbackstruct/common.go @@ -51,10 +51,11 @@ type CallbackResp interface { } type CommonCallbackResp struct { - ActionCode int `json:"actionCode"` + ActionCode int32 `json:"actionCode"` ErrCode int32 `json:"errCode"` ErrMsg string `json:"errMsg"` ErrDlt string `json:"errDlt"` + NextCode int32 `json:"nextCode"` } func (c CommonCallbackResp) Parse() error { diff --git a/pkg/callbackstruct/friend.go b/pkg/callbackstruct/friend.go index 7e89824e2..bbafb7f2f 100644 --- a/pkg/callbackstruct/friend.go +++ b/pkg/callbackstruct/friend.go @@ -25,3 +25,26 @@ type CallbackBeforeAddFriendReq struct { type CallbackBeforeAddFriendResp struct { CommonCallbackResp } + +type CallBackAddFriendReplyBeforeReq struct { + CallbackCommand `json:"callbackCommand"` + FromUserID string `json:"fromUserID" ` + ToUserID string `json:"toUserID"` + OperationID string `json:"operationID"` +} + +type CallBackAddFriendReplyBeforeResp struct { + CommonCallbackResp +} + +type CallbackAfterAddFriendReq struct { + CallbackCommand `json:"callbackCommand"` + FromUserID string `json:"fromUserID" ` + ToUserID string `json:"toUserID"` + ReqMsg string `json:"reqMsg"` + OperationID string `json:"operationID"` +} + +type CallbackAfterAddFriendResp struct { + CommonCallbackResp +} diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 11b33bf0a..423f31fab 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -86,3 +86,74 @@ type CallbackBeforeSetGroupMemberInfoResp struct { FaceURL *string `json:"faceURL"` RoleLevel *int32 `json:"roleLevel"` } + +type CallbackAfterGroupMemberExitReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + GroupID string `json:"groupID"` + UserID string `json:"userID"` + GroupType *int32 `json:"groupType"` + ExitType string `json:"exitType"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackAfterGroupMemberExitResp struct { + CommonCallbackResp +} + +type CallbackAfterUngroupReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + GroupID string `json:"groupID"` + GroupType *int32 `json:"groupType"` + OwnerID string `json:"ownerID"` + MemberList []string `json:"memberList"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackAfterUngroupResp struct { + CommonCallbackResp +} + +type CallbackAfterSetGroupInfoReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + GroupID string `json:"groupID"` + GroupType *int32 `json:"groupType"` + UserID string `json:"userID"` + Name string `json:"name"` + Notification string `json:"notification"` + GroupUrl string `json:"groupUrl"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackAfterSetGroupInfoResp struct { + CommonCallbackResp +} + +type CallbackAfterRevokeMsgReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + GroupID string `json:"groupID"` + GroupType *int32 `json:"groupType"` + UserID string `json:"userID"` + Content string `json:"content"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackAfterRevokeMsgResp struct { + CommonCallbackResp +} + +type CallbackGroupMsgReadReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + SendID string `json:"sendID"` + ReceiveID string `json:"receiveID"` + UnreadMsgNum int64 `json:"UnreadMsgNum"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackGroupMsgReadResp struct { + CommonCallbackResp +} diff --git a/pkg/callbackstruct/message.go b/pkg/callbackstruct/message.go index f404088e8..e5916e326 100644 --- a/pkg/callbackstruct/message.go +++ b/pkg/callbackstruct/message.go @@ -79,3 +79,37 @@ type CallbackMsgModifyCommandResp struct { AttachedInfo *string `json:"attachedInfo"` Ex *string `json:"ex"` } + +type CallbackSendGroupMsgErrorReq struct { + CommonCallbackReq + GroupID string `json:"groupID"` +} + +type CallbackSendGroupMsgErrorResp struct { + CommonCallbackResp +} + +type CallbackSingleMsgReadReq struct { + CallbackCommand string `json:"callbackCommand"` + OperationID string `json:"operationID"` + SendID string `json:"sendID"` + ReceiveID string `json:"receiveID"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackSingleMsgReadResp struct { + CommonCallbackResp +} + +type CallbackSingleMsgRevokeReq struct { + CallbackCommand `json:"callbackCommand"` + OperationID string `json:"operationID"` + SendID string `json:"sendID"` + ReceiveID string `json:"receiveID"` + Content string `json:"content"` + MuteEndTime *int64 `json:"muteEndTime"` +} + +type CallbackSingleMsgRevokeResp struct { + CommonCallbackResp +} diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index d7cecc616..1ab61c3da 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -257,6 +257,7 @@ type configStruct struct { CallbackBeforeAddFriend CallBackConfig `yaml:"beforeAddFriend"` CallbackBeforeUpdateUserInfo CallBackConfig `yaml:"beforeUpdateUserInfo"` CallbackBeforeCreateGroup CallBackConfig `yaml:"beforeCreateGroup"` + CallbackAfterCreateGroup CallBackConfig `yaml:"afterCreateGroup"` CallbackBeforeMemberJoinGroup CallBackConfig `yaml:"beforeMemberJoinGroup"` CallbackBeforeSetGroupMemberInfo CallBackConfig `yaml:"beforeSetGroupMemberInfo"` } `yaml:"callback"` From 09f0fbda396303e656d6e7e9b3a51e8c0929989b Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Tue, 14 Nov 2023 19:01:00 +0800 Subject: [PATCH 02/11] fix:fix the error parse --- internal/rpc/group/callback.go | 1 + pkg/callbackstruct/common.go | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 01d7f44e6..c6d0e6ff5 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -69,6 +69,7 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) ( if err == errs.ErrCallbackContinue { return nil } + return err } utils.NotNilReplace(&req.GroupInfo.GroupID, resp.GroupID) diff --git a/pkg/callbackstruct/common.go b/pkg/callbackstruct/common.go index 0922dbf19..93eb64ec1 100644 --- a/pkg/callbackstruct/common.go +++ b/pkg/callbackstruct/common.go @@ -14,9 +14,7 @@ package callbackstruct -import ( - "github.com/OpenIMSDK/tools/errs" -) +import "github.com/OpenIMSDK/tools/errs" type CommonCallbackReq struct { SendID string `json:"sendID"` @@ -59,7 +57,7 @@ type CommonCallbackResp struct { } func (c CommonCallbackResp) Parse() error { - if c.ActionCode != errs.NoError || c.ErrCode != errs.NoError { + if c.ActionCode != errs.NoError || c.NextCode == 1 { return errs.NewCodeError(int(c.ErrCode), c.ErrMsg).WithDetail(c.ErrDlt) } return nil From 08b045c864b6b70313a525bb077a956e8c5db57c Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Tue, 14 Nov 2023 20:40:44 +0800 Subject: [PATCH 03/11] fix:fix the url --- config/config.yaml | 2 +- internal/rpc/group/group.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 60a0ac236..b9032d67b 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://127.0.0.1:8080/sdkName" + url: "http://192.168.62.1:8080/sdkName" beforeSendSingleMsg: enable: false timeout: 5 diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 7327257bd..05d947638 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -300,7 +300,9 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR s.Notification.GroupCreatedNotification(ctx, tips) } reqCallBackAfter := &pbgroup.CreateGroupReq{ - GroupInfo: resp.GroupInfo, + MemberUserIDs: userIDs, + GroupInfo: resp.GroupInfo, + OwnerUserID: req.OwnerUserID, } if err := CallbackAfterCreateGroup(ctx, reqCallBackAfter); err != nil { From 0e261d0db2897cb6d3f761a5be4a5ccc92852169 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Tue, 14 Nov 2023 21:35:30 +0800 Subject: [PATCH 04/11] fix:fix the url --- internal/rpc/group/callback.go | 8 ++++---- pkg/callbackstruct/group.go | 11 +++++++++++ pkg/common/http/http_client.go | 10 +++++----- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index c6d0e6ff5..887aaf8aa 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -88,10 +88,10 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) ( } func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (err error) { - if !config.Config.Callback.CallbackBeforeCreateGroup.Enable { + if !config.Config.Callback.CallbackAfterCreateGroup.Enable { return nil } - cbReq := &callbackstruct.CallbackBeforeCreateGroupReq{ + cbReq := &callbackstruct.CallbackAfterCreateGroupReq{ CallbackCommand: "callbackAfterCreateGroupCommand", OperationID: mcontext.GetOperationID(ctx), GroupInfo: req.GroupInfo, @@ -112,13 +112,13 @@ func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (e RoleLevel: constant.GroupOrdinaryUsers, }) } - resp := &callbackstruct.CallbackBeforeCreateGroupResp{} + resp := &callbackstruct.CallbackAfterCreateGroupResp{} err = http.CallBackPostReturn( ctx, config.Config.Callback.CallbackUrl, cbReq, resp, - config.Config.Callback.CallbackBeforeCreateGroup, + config.Config.Callback.CallbackAfterCreateGroup, ) if err != nil { if err == errs.ErrCallbackContinue { diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 423f31fab..5ec6433b6 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -50,6 +50,17 @@ type CallbackBeforeCreateGroupResp struct { ApplyMemberFriend *int32 `json:"applyMemberFriend"` } +type CallbackAfterCreateGroupReq struct { + OperationID string `json:"operationID"` + CallbackCommand `json:"callbackCommand"` + *common.GroupInfo + InitMemberList []*apistruct.GroupAddMemberInfo `json:"initMemberList"` +} + +type CallbackAfterCreateGroupResp struct { + CommonCallbackResp +} + type CallbackBeforeMemberJoinGroupReq struct { CallbackCommand `json:"callbackCommand"` OperationID string `json:"operationID"` diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index e0cedf357..c45e9f8ad 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -20,7 +20,6 @@ import ( "encoding/json" "io" "net/http" - urllib "net/url" "time" "github.com/OpenIMSDK/protocol/constant" @@ -108,10 +107,11 @@ func PostReturn(ctx context.Context, url string, header map[string]string, input func callBackPostReturn(ctx context.Context, url, command string, input interface{}, output callbackstruct.CallbackResp, callbackConfig config.CallBackConfig) error { defer log.ZDebug(ctx, "callback", "url", url, "command", command, "input", input, "callbackConfig", callbackConfig) - - v := urllib.Values{} - v.Set(constant.CallbackCommand, command) - url = url + "?" + v.Encode() + // + //v := urllib.Values{} + //v.Set(constant.CallbackCommand, command) + //url = url + "/" + v.Encode() + url = url + "/" + command b, err := Post(ctx, url, nil, input, callbackConfig.CallbackTimeOut) if err != nil { From cb73dad6944e5fc85c840d8c9ced9f94750fdfee Mon Sep 17 00:00:00 2001 From: luhaoling Date: Tue, 14 Nov 2023 13:37:33 +0000 Subject: [PATCH 05/11] cicd: robot automated Change --- cmd/openim-api/main.go | 5 +++-- internal/api/third.go | 3 ++- internal/msggateway/n_ws_server.go | 3 ++- internal/msgtransfer/init.go | 12 +++++++----- internal/msgtransfer/online_msg_to_mongo_handler.go | 1 + internal/push/offlinepush/dummy/push.go | 1 + internal/push/push_to_client.go | 3 ++- internal/rpc/auth/auth.go | 1 + internal/rpc/msg/send.go | 1 + internal/tools/conversation.go | 12 ++++++++---- internal/tools/msg.go | 9 ++++++--- pkg/common/cmd/msg_transfer.go | 4 +++- pkg/common/db/cache/meta_cache.go | 3 ++- pkg/common/db/cache/s3.go | 8 +++++--- pkg/common/db/controller/msg.go | 6 ++++-- pkg/common/db/controller/s3.go | 8 +++++--- pkg/common/db/relation/conversation_model.go | 1 + pkg/common/db/s3/cont/controller.go | 3 ++- pkg/common/db/s3/minio/minio.go | 3 ++- pkg/common/db/s3/minio/thumbnail.go | 12 +++++++----- pkg/common/prom_metrics/func.go | 5 +++-- pkg/common/startrpc/start.go | 8 +++++--- 22 files changed, 73 insertions(+), 39 deletions(-) diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index 0f50c621f..e7fa81879 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -17,12 +17,13 @@ package main import ( "context" "fmt" - ginProm "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "net" _ "net/http/pprof" "strconv" + ginProm "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" "github.com/OpenIMSDK/protocol/constant" diff --git a/internal/api/third.go b/internal/api/third.go index fca133ea9..5191903da 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -15,11 +15,12 @@ package api import ( - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "math/rand" "net/http" "strconv" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/gin-gonic/gin" "github.com/OpenIMSDK/protocol/third" diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index c58710e1b..6c63fcdc7 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -17,13 +17,14 @@ package msggateway import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "net/http" "strconv" "sync" "sync/atomic" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/OpenIMSDK/protocol/msggateway" "github.com/openimsdk/open-im-server/v3/pkg/authverify" diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index c18186fa8..88410c093 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -17,16 +17,18 @@ package msgtransfer import ( "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "log" + "net/http" + "sync" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "log" - "net/http" - "sync" + + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/OpenIMSDK/tools/mw" diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index 88fd256d1..f420ed72e 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -16,6 +16,7 @@ package msgtransfer import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/IBM/sarama" diff --git a/internal/push/offlinepush/dummy/push.go b/internal/push/offlinepush/dummy/push.go index 1be234d68..2b15bc05d 100644 --- a/internal/push/offlinepush/dummy/push.go +++ b/internal/push/offlinepush/dummy/push.go @@ -2,6 +2,7 @@ package dummy import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" ) diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 2f3156c28..07bea4f67 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -18,8 +18,9 @@ import ( "context" "encoding/json" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/dummy" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/OpenIMSDK/protocol/conversation" diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index bcca59152..2617124c0 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -16,6 +16,7 @@ package auth import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/openimsdk/open-im-server/v3/pkg/authverify" diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index b43bc82be..15b1835ad 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -16,6 +16,7 @@ package msg import ( "context" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index 5d568cac5..05d963a17 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -16,12 +16,14 @@ package tools import ( "context" + "math/rand" + "time" + "github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/utils" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "math/rand" - "time" ) //func (c *MsgTool) ConversationsDestructMsgs() { @@ -54,7 +56,8 @@ import ( // continue // } // if len(seqs) > 0 { -// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err != nil { +// if err := c.conversationDatabase.UpdateUsersConversationFiled(ctx, []string{conversation.OwnerUserID}, conversation.ConversationID, map[string]interface{}{"latest_msg_destruct_time": now}); err +// != nil { // log.ZError(ctx, "updateUsersConversationFiled failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID) // continue // } @@ -104,7 +107,8 @@ func (c *MsgTool) ConversationsDestructMsgs() { } temp := make([]*relation.ConversationModel, 0, len(conversations)) for i, conversation := range conversations { - if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || conversation.LatestMsgDestructTime.IsZero() { + if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && (time.Now().Unix() > (conversation.MsgDestructTime+conversation.LatestMsgDestructTime.Unix()+8*60*60)) || + conversation.LatestMsgDestructTime.IsZero() { temp = append(temp, conversations[i]) } } diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 7e06fda4a..f13938eba 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -17,11 +17,15 @@ package tools import ( "context" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + "math" + "github.com/redis/go-redis/v9" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "math" + + "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" + + "math/rand" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" @@ -29,7 +33,6 @@ import ( "github.com/OpenIMSDK/tools/mw" "github.com/OpenIMSDK/tools/tx" "github.com/OpenIMSDK/tools/utils" - "math/rand" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index 903d1fb95..f99b625c7 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -16,10 +16,12 @@ package cmd import ( "fmt" + "github.com/OpenIMSDK/protocol/constant" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" ) diff --git a/pkg/common/db/cache/meta_cache.go b/pkg/common/db/cache/meta_cache.go index 45888ed8f..ccac88d68 100644 --- a/pkg/common/db/cache/meta_cache.go +++ b/pkg/common/db/cache/meta_cache.go @@ -18,9 +18,10 @@ import ( "context" "encoding/json" "errors" - "github.com/OpenIMSDK/tools/mw/specialerror" "time" + "github.com/OpenIMSDK/tools/mw/specialerror" + "github.com/dtm-labs/rockscache" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/cache/s3.go b/pkg/common/db/cache/s3.go index a63496d05..3520ba2ec 100644 --- a/pkg/common/db/cache/s3.go +++ b/pkg/common/db/cache/s3.go @@ -2,12 +2,14 @@ package cache import ( "context" + "strconv" + "time" + "github.com/dtm-labs/rockscache" + "github.com/redis/go-redis/v9" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" - "strconv" - "time" ) type ObjectCache interface { diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 62ecf7232..62df71497 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -17,21 +17,23 @@ package controller import ( "context" "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/redis/go-redis/v9" "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" + "go.mongodb.org/mongo-driver/mongo" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" - "go.mongodb.org/mongo-driver/mongo" pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go index ffe9ff508..ddbd5d27f 100644 --- a/pkg/common/db/controller/s3.go +++ b/pkg/common/db/controller/s3.go @@ -16,13 +16,15 @@ package controller import ( "context" + "path/filepath" + "time" + + "github.com/redis/go-redis/v9" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" - "github.com/redis/go-redis/v9" - "path/filepath" - "time" ) type S3Database interface { diff --git a/pkg/common/db/relation/conversation_model.go b/pkg/common/db/relation/conversation_model.go index 5df14ad4a..f39047bf6 100644 --- a/pkg/common/db/relation/conversation_model.go +++ b/pkg/common/db/relation/conversation_model.go @@ -16,6 +16,7 @@ package relation import ( "context" + "github.com/OpenIMSDK/tools/errs" "gorm.io/gorm" diff --git a/pkg/common/db/s3/cont/controller.go b/pkg/common/db/s3/cont/controller.go index 2db1b800f..09025e130 100644 --- a/pkg/common/db/s3/cont/controller.go +++ b/pkg/common/db/s3/cont/controller.go @@ -20,11 +20,12 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "path" "strings" "time" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/google/uuid" "github.com/OpenIMSDK/tools/errs" diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 01101e893..be49e2faa 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "io" "net/http" "net/url" @@ -30,6 +29,8 @@ import ( "time" "unsafe" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/OpenIMSDK/tools/log" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/pkg/common/db/s3/minio/thumbnail.go b/pkg/common/db/s3/minio/thumbnail.go index fa3581572..01b14541b 100644 --- a/pkg/common/db/s3/minio/thumbnail.go +++ b/pkg/common/db/s3/minio/thumbnail.go @@ -5,11 +5,6 @@ import ( "context" "errors" "fmt" - "github.com/OpenIMSDK/tools/errs" - "github.com/OpenIMSDK/tools/log" - "github.com/minio/minio-go/v7" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" - "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "image" "image/gif" "image/jpeg" @@ -18,6 +13,13 @@ import ( "path/filepath" "strings" "time" + + "github.com/OpenIMSDK/tools/errs" + "github.com/OpenIMSDK/tools/log" + "github.com/minio/minio-go/v7" + + "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" ) func (m *Minio) getImageThumbnailURL(ctx context.Context, name string, expire time.Duration, opt *s3.Image) (string, error) { diff --git a/pkg/common/prom_metrics/func.go b/pkg/common/prom_metrics/func.go index e451c441b..a4eff0ed6 100644 --- a/pkg/common/prom_metrics/func.go +++ b/pkg/common/prom_metrics/func.go @@ -2,10 +2,11 @@ package prom_metrics import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/ginPrometheus" ) func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *grpc_prometheus.ServerMetrics, error) { diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 975d21246..9b2dd4c2b 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -16,14 +16,16 @@ package startrpc import ( "fmt" - "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" "log" "net" "net/http" "strconv" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/openimsdk/open-im-server/v3/pkg/common/prom_metrics" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register" From 7cf8595791c53d8a68893a5db3769cbbe4446c27 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 16 Nov 2023 09:57:03 +0800 Subject: [PATCH 06/11] feat:a callback example --- config/config.yaml | 2 +- deployments/templates/openim.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index b9032d67b..4de6d95e8 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://192.168.62.1:8080/sdkName" + url: beforeSendSingleMsg: enable: false timeout: 5 diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index 44a28adff..2dc0b676e 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: + url: "http://192.168.62.1:8080/sdkName" beforeSendSingleMsg: enable: false timeout: 5 @@ -367,7 +367,11 @@ callback: beforeMemberJoinGroup: enable: false timeout: 5 - failedContinue: true + failedContinue: false + afterCreateGroup: + enable: false + timeout: 5 + failedContinue: false beforeSetGroupMemberInfo: enable: false timeout: 5 From b99ebe00584b603a07c39713f034041205f98fe0 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 16 Nov 2023 17:08:56 +0800 Subject: [PATCH 07/11] fix: fix the callback example --- internal/rpc/group/callback.go | 24 ++++++------------------ internal/rpc/group/group.go | 1 + pkg/callbackstruct/common.go | 6 +++++- pkg/common/http/http_client.go | 15 +++++++-------- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 887aaf8aa..583d637db 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,6 +16,7 @@ package group import ( "context" + "github.com/OpenIMSDK/tools/log" "time" "github.com/OpenIMSDK/protocol/constant" @@ -66,24 +67,14 @@ func CallbackBeforeCreateGroup(ctx context.Context, req *group.CreateGroupReq) ( config.Config.Callback.CallbackBeforeCreateGroup, ) if err != nil { - if err == errs.ErrCallbackContinue { + if errs.Unwrap(err) == errs.ErrCallbackContinue { + log.ZWarn(ctx, "callback failed but continue", err, "url", config.Config.Callback.CallbackUrl) return nil } - return err } - utils.NotNilReplace(&req.GroupInfo.GroupID, resp.GroupID) - utils.NotNilReplace(&req.GroupInfo.GroupName, resp.GroupName) - utils.NotNilReplace(&req.GroupInfo.Notification, resp.Notification) - utils.NotNilReplace(&req.GroupInfo.Introduction, resp.Introduction) - utils.NotNilReplace(&req.GroupInfo.FaceURL, resp.FaceURL) - utils.NotNilReplace(&req.GroupInfo.OwnerUserID, resp.OwnerUserID) - utils.NotNilReplace(&req.GroupInfo.Ex, resp.Ex) - utils.NotNilReplace(&req.GroupInfo.Status, resp.Status) - utils.NotNilReplace(&req.GroupInfo.CreatorUserID, resp.CreatorUserID) - utils.NotNilReplace(&req.GroupInfo.GroupType, resp.GroupType) - utils.NotNilReplace(&req.GroupInfo.NeedVerification, resp.NeedVerification) - utils.NotNilReplace(&req.GroupInfo.LookMemberInfo, resp.LookMemberInfo) + + utils.StructFieldNotNilReplace(req, resp) return nil } @@ -92,7 +83,7 @@ func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (e return nil } cbReq := &callbackstruct.CallbackAfterCreateGroupReq{ - CallbackCommand: "callbackAfterCreateGroupCommand", + CallbackCommand: constant.CallbackAfterCreateGroupCommand, OperationID: mcontext.GetOperationID(ctx), GroupInfo: req.GroupInfo, } @@ -121,9 +112,6 @@ func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (e config.Config.Callback.CallbackAfterCreateGroup, ) if err != nil { - if err == errs.ErrCallbackContinue { - return nil - } return err } return nil diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 05d947638..f2fd2986e 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -303,6 +303,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR MemberUserIDs: userIDs, GroupInfo: resp.GroupInfo, OwnerUserID: req.OwnerUserID, + AdminUserIDs: req.AdminUserIDs, } if err := CallbackAfterCreateGroup(ctx, reqCallBackAfter); err != nil { diff --git a/pkg/callbackstruct/common.go b/pkg/callbackstruct/common.go index 93eb64ec1..c58b9e415 100644 --- a/pkg/callbackstruct/common.go +++ b/pkg/callbackstruct/common.go @@ -16,6 +16,10 @@ package callbackstruct import "github.com/OpenIMSDK/tools/errs" +const ( + Next = 1 +) + type CommonCallbackReq struct { SendID string `json:"sendID"` CallbackCommand string `json:"callbackCommand"` @@ -57,7 +61,7 @@ type CommonCallbackResp struct { } func (c CommonCallbackResp) Parse() error { - if c.ActionCode != errs.NoError || c.NextCode == 1 { + if c.ActionCode != errs.NoError || c.NextCode == Next { return errs.NewCodeError(int(c.ErrCode), c.ErrMsg).WithDetail(c.ErrDlt) } return nil diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index c45e9f8ad..abdc6d822 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -57,7 +57,8 @@ func Get(url string) (response []byte, err error) { return body, nil } -func Post(ctx context.Context, url string, header map[string]string, data interface{}, timeout int) (content []byte, err error) { +func Post(ctx context.Context, url string, header map[string]string, data interface{}, timeout int) (result []byte, err error) { + defer log.ZDebug(ctx, "callbackPost", "url", url, "header", header, "input", data, "output", result, "timeout", timeout, "output") if timeout > 0 { var cancel func() ctx, cancel = context.WithTimeout(ctx, time.Second*time.Duration(timeout)) @@ -88,7 +89,7 @@ func Post(ctx context.Context, url string, header map[string]string, data interf } defer resp.Body.Close() - result, err := io.ReadAll(resp.Body) + result, err = io.ReadAll(resp.Body) if err != nil { return nil, err } @@ -106,8 +107,8 @@ func PostReturn(ctx context.Context, url string, header map[string]string, input } func callBackPostReturn(ctx context.Context, url, command string, input interface{}, output callbackstruct.CallbackResp, callbackConfig config.CallBackConfig) error { - defer log.ZDebug(ctx, "callback", "url", url, "command", command, "input", input, "callbackConfig", callbackConfig) - // + defer log.ZDebug(ctx, "callback", "url", url, "input", input, "output", output, "timeout", callbackConfig.CallbackTimeOut) + //v := urllib.Values{} //v.Set(constant.CallbackCommand, command) //url = url + "/" + v.Encode() @@ -116,16 +117,14 @@ func callBackPostReturn(ctx context.Context, url, command string, input interfac b, err := Post(ctx, url, nil, input, callbackConfig.CallbackTimeOut) if err != nil { if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue { - log.ZWarn(ctx, "callback failed but continue", err, "url", url) - return errs.ErrCallbackContinue + return errs.ErrCallbackContinue.Wrap(err.Error()) } return errs.ErrNetwork.Wrap(err.Error()) } if err = json.Unmarshal(b, output); err != nil { if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue { - log.ZWarn(ctx, "callback failed but continue", err, "url", url) - return errs.ErrCallbackContinue + return errs.ErrCallbackContinue.Wrap(err.Error()) } return errs.ErrData.Wrap(err.Error()) } From 155706680c7213a468dd32c77242f84ff9f86659 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 16 Nov 2023 17:32:02 +0800 Subject: [PATCH 08/11] fix: fix the pakage error --- go.mod | 2 +- go.sum | 4 ++-- internal/rpc/group/callback.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 31f067693..52fcd8b70 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require github.com/google/uuid v1.3.1 require ( github.com/IBM/sarama v1.41.3 github.com/OpenIMSDK/protocol v0.0.31 - github.com/OpenIMSDK/tools v0.0.16 + github.com/OpenIMSDK/tools v0.0.17 github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible github.com/go-redis/redis v6.15.9+incompatible github.com/go-sql-driver/mysql v1.7.1 diff --git a/go.sum b/go.sum index 2fa9b872c..ff1d90575 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/IBM/sarama v1.41.3 h1:MWBEJ12vHC8coMjdEXFq/6ftO6DUZnQlFYcxtOJFa7c= github.com/IBM/sarama v1.41.3/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ= github.com/OpenIMSDK/protocol v0.0.31 h1:ax43x9aqA6EKNXNukS5MT5BSTqkUmwO4uTvbJLtzCgE= github.com/OpenIMSDK/protocol v0.0.31/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= -github.com/OpenIMSDK/tools v0.0.16 h1:te/GIq2imCMsrRPgU9OObYKbzZ3rT08Lih/o+3QFIz0= -github.com/OpenIMSDK/tools v0.0.16/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= +github.com/OpenIMSDK/tools v0.0.17 h1:1E1HUOL2W09YUHBb4wBwrXoTSZm5ONVwLxlEX1GhlKw= +github.com/OpenIMSDK/tools v0.0.17/go.mod h1:eg+q4A34Qmu73xkY0mt37FHGMCMfC6CtmOnm0kFEGFI= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 583d637db..ac2f275ff 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -83,7 +83,7 @@ func CallbackAfterCreateGroup(ctx context.Context, req *group.CreateGroupReq) (e return nil } cbReq := &callbackstruct.CallbackAfterCreateGroupReq{ - CallbackCommand: constant.CallbackAfterCreateGroupCommand, + CallbackCommand: "callbackAfterCreateGroupCommand", OperationID: mcontext.GetOperationID(ctx), GroupInfo: req.GroupInfo, } From 4f5d0da4241c4086e9644b448cbfc4bcc4d21847 Mon Sep 17 00:00:00 2001 From: luhaoling Date: Thu, 16 Nov 2023 09:34:10 +0000 Subject: [PATCH 09/11] cicd: robot automated Change --- internal/rpc/group/callback.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index ac2f275ff..982a57140 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -16,9 +16,10 @@ package group import ( "context" - "github.com/OpenIMSDK/tools/log" "time" + "github.com/OpenIMSDK/tools/log" + "github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/group" "github.com/OpenIMSDK/protocol/wrapperspb" From 3bd4fa3d1061f342218cd43dffb5f969f0704f84 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 16 Nov 2023 17:45:13 +0800 Subject: [PATCH 10/11] feat: fix the openim.yaml --- deployments/templates/openim.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index 2dc0b676e..28b6281fd 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://192.168.62.1:8080/sdkName" + url: "http://192.168.62.1:18888/sdkName" beforeSendSingleMsg: enable: false timeout: 5 @@ -363,7 +363,7 @@ callback: beforeCreateGroup: enable: false timeout: 5 - failedContinue: true + failedContinue: false beforeMemberJoinGroup: enable: false timeout: 5 From 4ac89989dca887cd3b05d452e5af615943e77b78 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 16 Nov 2023 18:17:11 +0800 Subject: [PATCH 11/11] fix: fix openim.yaml --- deployments/templates/openim.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index 28b6281fd..4d48284dd 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -361,17 +361,17 @@ callback: timeout: 5 failedContinue: true beforeCreateGroup: - enable: false + enable: true + timeout: 5 + failedContinue: false + afterCreateGroup: + enable: true timeout: 5 failedContinue: false beforeMemberJoinGroup: enable: false timeout: 5 failedContinue: false - afterCreateGroup: - enable: false - timeout: 5 - failedContinue: false beforeSetGroupMemberInfo: enable: false timeout: 5