refactor: 3.7.0 code conventions. (#2148)

* Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * feat: add code lint * feat: add code lint * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * Script Refactoring * feat: code format * Script Refactoring * Script Refactoring * Script Refactoring * Adjust MinIO configuration settings * Adjust configuration settings * Adjust configuration settings * refactor: config change. * refactor: webhooks update. * Adjust configuration settings * refactor: webhooks update. * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * feat: s3 api addr * refactor: webhooks update. * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * Adjust configuration settings * refactor: webhooks update. * refactor: kafka update. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * refactor: kafka update. * refactor: kafka update. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * Simplify the Docker Compose configuration, remove unnecessary environment variables, and eliminate the gateway service. * Windows can compile and run. * Windows can compile and run. * refactor: kafka update. * feat: msg cache split * refactor: webhooks update * refactor: webhooks update * refactor: friends update * refactor: group update * refactor: third update * refactor: api update * refactor: crontab update * refactor: msggateway update * mage * mage * refactor: all module update. * check * refactor: all module update. * load config * load config * load config * load config * refactor: all module update. * refactor: all module update. * refactor: all module update. * refactor: all module update. * refactor: all module update. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * refactor: all module update. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * update tools * update tools * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * update protocol * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: all module update. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * Optimize Docker configuration and script. * refactor: api remove token auth by redis directly. * Code Refactoring * refactor: websocket auth change to call rpc of auth. * refactor: kick online user and remove token change to call auth rpc. * refactor: kick online user and remove token change to call auth rpc. * refactor: remove msggateway redis. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor webhook * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor webhook * refactor: cmd update. * refactor: cmd update. * fix: runtime: goroutine stack exceeds * refactor: cmd update. * refactor notification * refactor notification * refactor * refactor: cmd update. * refactor: cmd update. * refactor * refactor * refactor * protojson * protojson * protojson * go mod * wrapperspb * refactor: cmd update. * refactor: cmd update. * refactor: cmd update. * refactor: context update. * refactor: websocket update info. * refactor: websocket update info. * refactor: websocket update info. * refactor: websocket update info. * refactor: api name change. * refactor: debug info. * refactor: debug info. * refactor: debug info. * fix: update file * refactor * refactor * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * refactor: debug info. * fix: callback update. * fix: callback update. * refactor * fix: update message. * fix: msg cache timeout. * refactor * refactor * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: push update. * fix: websocket handle error remove when upgrade error. --------- Co-authored-by: skiffer-git <44203734@qq.com> Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> Co-authored-by: withchao <993506633@qq.com>
2026-05-14 14:05:59 +08:00 · 2024-04-19 22:23:08 +08:00
parent cca5336a8a
commit b76816bc14
438 changed files with 11525 additions and 15033 deletions
@@ -16,122 +16,135 @@ package push

 import (
 	"context"
+	"encoding/json"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"

-	"github.com/OpenIMSDK/protocol/constant"
-	"github.com/OpenIMSDK/protocol/sdkws"
-	"github.com/OpenIMSDK/tools/mcontext"
-	"github.com/OpenIMSDK/tools/utils"
 	"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/http"
+	"github.com/openimsdk/protocol/constant"
+	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/mcontext"
+	"github.com/openimsdk/tools/utils/datautil"
 )

-func callbackOfflinePush(
-	ctx context.Context,
-	config *config.GlobalConfig,
-	userIDs []string,
-	msg *sdkws.MsgData,
-	offlinePushUserIDs *[]string,
-) error {
-	if !config.Callback.CallbackOfflinePush.Enable || msg.ContentType == constant.Typing {
-		return nil
-	}
-	req := &callbackstruct.CallbackBeforePushReq{
-		UserStatusBatchCallbackReq: callbackstruct.UserStatusBatchCallbackReq{
-			UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
-				CallbackCommand: callbackstruct.CallbackOfflinePushCommand,
-				OperationID:     mcontext.GetOperationID(ctx),
-				PlatformID:      int(msg.SenderPlatformID),
-				Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+func (c *ConsumerHandler) webhookBeforeOfflinePush(ctx context.Context, before *config.BeforeConfig, userIDs []string, msg *sdkws.MsgData, offlinePushUserIDs *[]string) error {
+	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
+		if msg.ContentType == constant.Typing {
+			return nil
+		}
+		req := &callbackstruct.CallbackBeforePushReq{
+			UserStatusBatchCallbackReq: callbackstruct.UserStatusBatchCallbackReq{
+				UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
+					CallbackCommand: callbackstruct.CallbackBeforeOfflinePushCommand,
+					OperationID:     mcontext.GetOperationID(ctx),
+					PlatformID:      int(msg.SenderPlatformID),
+					Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+				},
+				UserIDList: userIDs,
 			},
-			UserIDList: userIDs,
-		},
-		OfflinePushInfo: msg.OfflinePushInfo,
-		ClientMsgID:     msg.ClientMsgID,
-		SendID:          msg.SendID,
-		GroupID:         msg.GroupID,
-		ContentType:     msg.ContentType,
-		SessionType:     msg.SessionType,
-		AtUserIDs:       msg.AtUserIDList,
-		Content:         GetContent(msg),
-	}
+			OfflinePushInfo: msg.OfflinePushInfo,
+			ClientMsgID:     msg.ClientMsgID,
+			SendID:          msg.SendID,
+			GroupID:         msg.GroupID,
+			ContentType:     msg.ContentType,
+			SessionType:     msg.SessionType,
+			AtUserIDs:       msg.AtUserIDList,
+			Content:         GetContent(msg),
+		}

-	resp := &callbackstruct.CallbackBeforePushResp{}
-	if err := http.CallBackPostReturn(ctx, config.Callback.CallbackUrl, req, resp, config.Callback.CallbackOfflinePush); err != nil {
-		return err
-	}
+		resp := &callbackstruct.CallbackBeforePushResp{}

-	if len(resp.UserIDs) != 0 {
-		*offlinePushUserIDs = resp.UserIDs
-	}
-	if resp.OfflinePushInfo != nil {
-		msg.OfflinePushInfo = resp.OfflinePushInfo
-	}
-	return nil
+		if err := c.webhookClient.SyncPost(ctx, req.GetCallbackCommand(), req, resp, before); err != nil {
+			return err
+		}
+
+		if len(resp.UserIDs) != 0 {
+			*offlinePushUserIDs = resp.UserIDs
+		}
+		if resp.OfflinePushInfo != nil {
+			msg.OfflinePushInfo = resp.OfflinePushInfo
+		}
+		return nil
+	})
 }

-func callbackOnlinePush(ctx context.Context, config *config.GlobalConfig, userIDs []string, msg *sdkws.MsgData) error {
-	if !config.Callback.CallbackOnlinePush.Enable || utils.Contain(msg.SendID, userIDs...) || msg.ContentType == constant.Typing {
-		return nil
-	}
-	req := callbackstruct.CallbackBeforePushReq{
-		UserStatusBatchCallbackReq: callbackstruct.UserStatusBatchCallbackReq{
-			UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
-				CallbackCommand: callbackstruct.CallbackOnlinePushCommand,
-				OperationID:     mcontext.GetOperationID(ctx),
-				PlatformID:      int(msg.SenderPlatformID),
-				Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+func (c *ConsumerHandler) webhookBeforeOnlinePush(ctx context.Context, before *config.BeforeConfig, userIDs []string, msg *sdkws.MsgData) error {
+	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
+		if datautil.Contain(msg.SendID, userIDs...) || msg.ContentType == constant.Typing {
+			return nil
+		}
+		req := callbackstruct.CallbackBeforePushReq{
+			UserStatusBatchCallbackReq: callbackstruct.UserStatusBatchCallbackReq{
+				UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
+					CallbackCommand: callbackstruct.CallbackBeforeOnlinePushCommand,
+					OperationID:     mcontext.GetOperationID(ctx),
+					PlatformID:      int(msg.SenderPlatformID),
+					Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+				},
+				UserIDList: userIDs,
 			},
-			UserIDList: userIDs,
-		},
-		ClientMsgID: msg.ClientMsgID,
-		SendID:      msg.SendID,
-		GroupID:     msg.GroupID,
-		ContentType: msg.ContentType,
-		SessionType: msg.SessionType,
-		AtUserIDs:   msg.AtUserIDList,
-		Content:     GetContent(msg),
-	}
-	resp := &callbackstruct.CallbackBeforePushResp{}
-	if err := http.CallBackPostReturn(ctx, config.Callback.CallbackUrl, req, resp, config.Callback.CallbackOnlinePush); err != nil {
-		return err
-	}
-	return nil
+			ClientMsgID: msg.ClientMsgID,
+			SendID:      msg.SendID,
+			GroupID:     msg.GroupID,
+			ContentType: msg.ContentType,
+			SessionType: msg.SessionType,
+			AtUserIDs:   msg.AtUserIDList,
+			Content:     GetContent(msg),
+		}
+		resp := &callbackstruct.CallbackBeforePushResp{}
+		if err := c.webhookClient.SyncPost(ctx, req.GetCallbackCommand(), req, resp, before); err != nil {
+			return err
+		}
+		return nil
+	})
 }

-func callbackBeforeSuperGroupOnlinePush(
+func (c *ConsumerHandler) webhookBeforeGroupOnlinePush(
 	ctx context.Context,
-	config *config.GlobalConfig,
+	before *config.BeforeConfig,
 	groupID string,
 	msg *sdkws.MsgData,
 	pushToUserIDs *[]string,
 ) error {
-	if !config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable || msg.ContentType == constant.Typing {
+	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
+		if msg.ContentType == constant.Typing {
+			return nil
+		}
+		req := callbackstruct.CallbackBeforeSuperGroupOnlinePushReq{
+			UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
+				CallbackCommand: callbackstruct.CallbackBeforeGroupOnlinePushCommand,
+				OperationID:     mcontext.GetOperationID(ctx),
+				PlatformID:      int(msg.SenderPlatformID),
+				Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
+			},
+			ClientMsgID: msg.ClientMsgID,
+			SendID:      msg.SendID,
+			GroupID:     groupID,
+			ContentType: msg.ContentType,
+			SessionType: msg.SessionType,
+			AtUserIDs:   msg.AtUserIDList,
+			Content:     GetContent(msg),
+			Seq:         msg.Seq,
+		}
+		resp := &callbackstruct.CallbackBeforeSuperGroupOnlinePushResp{}
+		if err := c.webhookClient.SyncPost(ctx, req.GetCallbackCommand(), req, resp, before); err != nil {
+			return err
+		}
+		if len(resp.UserIDs) != 0 {
+			*pushToUserIDs = resp.UserIDs
+		}
 		return nil
-	}
-	req := callbackstruct.CallbackBeforeSuperGroupOnlinePushReq{
-		UserStatusBaseCallback: callbackstruct.UserStatusBaseCallback{
-			CallbackCommand: callbackstruct.CallbackSuperGroupOnlinePushCommand,
-			OperationID:     mcontext.GetOperationID(ctx),
-			PlatformID:      int(msg.SenderPlatformID),
-			Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
-		},
-		ClientMsgID: msg.ClientMsgID,
-		SendID:      msg.SendID,
-		GroupID:     groupID,
-		ContentType: msg.ContentType,
-		SessionType: msg.SessionType,
-		AtUserIDs:   msg.AtUserIDList,
-		Content:     GetContent(msg),
-		Seq:         msg.Seq,
-	}
-	resp := &callbackstruct.CallbackBeforeSuperGroupOnlinePushResp{}
-	if err := http.CallBackPostReturn(ctx, config.Callback.CallbackUrl, req, resp, config.Callback.CallbackBeforeSuperGroupOnlinePush); err != nil {
-		return err
-	}
-
-	if len(resp.UserIDs) != 0 {
-		*pushToUserIDs = resp.UserIDs
-	}
-	return nil
+	})
+}
+
+func GetContent(msg *sdkws.MsgData) string {
+	if msg.ContentType >= constant.NotificationBegin && msg.ContentType <= constant.NotificationEnd {
+		var notification sdkws.NotificationElem
+		if err := json.Unmarshal(msg.Content, &notification); err != nil {
+			return ""
+		}
+		return notification.Detail
+	} else {
+		return string(msg.Content)
+	}
 }