errcode

internal/rpc/admincms/admin_cms.go

@@ -1,4 +1,4 @@
-package admin_cms
+package admincms
 
 import (
 	"Open_IM/pkg/common/config"
@@ -11,7 +11,7 @@ import (
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
 	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
-	common "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdkws"
 
 	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 

internal/rpc/fault_tolerant/conn.go

@@ -1,96 +0,0 @@
-package fault_tolerant
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/common/middleware"
-	"Open_IM/pkg/utils"
-	"github.com/OpenIMSDK/getcdv3"
-	"google.golang.org/grpc"
-	"strings"
-)
-
-func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
-	rpcRegisterIP := config.Config.RpcRegisterIP
-	var err error
-	if config.Config.RpcRegisterIP == "" {
-		rpcRegisterIP, err = utils.GetLocalIP()
-		if err != nil {
-			log.Error(operationID, "GetLocalIP failed ", err.Error())
-			return nil
-		}
-	}
-
-	var configPortList []int
-	//1
-	if config.Config.RpcRegisterName.OpenImUserName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImUserPort
-	}
-	//2
-	if config.Config.RpcRegisterName.OpenImFriendName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImFriendPort
-	}
-	//3
-	if config.Config.RpcRegisterName.OpenImMsgName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImMessagePort
-	}
-	//4
-	if config.Config.RpcRegisterName.OpenImPushName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImPushPort
-	}
-	//5
-	if config.Config.RpcRegisterName.OpenImRelayName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImMessageGatewayPort
-	}
-	//6
-	if config.Config.RpcRegisterName.OpenImGroupName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImGroupPort
-	}
-	//7
-	if config.Config.RpcRegisterName.OpenImAuthName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImAuthPort
-	}
-	//10
-	if config.Config.RpcRegisterName.OpenImOfficeName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImOfficePort
-	}
-	//11
-	if config.Config.RpcRegisterName.OpenImOrganizationName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImOrganizationPort
-	}
-	//12
-	if config.Config.RpcRegisterName.OpenImConversationName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImConversationPort
-	}
-	//13
-	if config.Config.RpcRegisterName.OpenImCacheName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImCachePort
-	}
-	//14
-	if config.Config.RpcRegisterName.OpenImRealTimeCommName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImRealTimeCommPort
-	}
-	if len(configPortList) == 0 {
-		log.Error(operationID, "len(configPortList) == 0  ")
-		return nil
-	}
-	target := rpcRegisterIP + ":" + utils.Int32ToString(int32(configPortList[0]))
-	log.Info(operationID, "rpcRegisterIP ", rpcRegisterIP, " port ", configPortList, " grpc target: ", target, " serviceName: ", serviceName)
-	conn, err := grpc.Dial(target, grpc.WithInsecure(), grpc.WithUnaryInterceptor(middleware.RpcClientInterceptor))
-	if err != nil {
-		log.Error(operationID, "grpc.Dail failed ", err.Error())
-		return nil
-	}
-	log.NewDebug(operationID, utils.GetSelfFuncName(), serviceName, conn)
-	return conn
-}
-
-func GetDefaultConn(serviceName string, operationID string) (*grpc.ClientConn, error) {
-	con := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), serviceName, operationID, config.Config.Etcd.UserName, config.Config.Etcd.Password)
-	if con != nil {
-		return con, nil
-	}
-	log.NewWarn(operationID, utils.GetSelfFuncName(), "conn is nil !!!!!", serviceName)
-	con = GetConfigConn(serviceName, operationID)
-	return con, nil
-}

internal/rpc/group/copy.go

@@ -3,7 +3,7 @@ package group
 import (
 	"Open_IM/pkg/common/db/table/relation"
 	pbGroup "Open_IM/pkg/proto/group"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"time"
 )
 

internal/rpc/group/db_map.go

@@ -2,7 +2,7 @@ package group
 
 import (
 	pbGroup "Open_IM/pkg/proto/group"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"time"
 )
 

internal/rpc/group/g.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/tracelog"
 	pbConversation "Open_IM/pkg/proto/conversation"
-	sdk_ws "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"errors"
@@ -13,34 +13,34 @@ import (
 	"time"
 )
 
-func GetPublicUserInfoOne(ctx context.Context, userID string) (*sdk_ws.PublicUserInfo, error) {
+func GetPublicUserInfoOne(ctx context.Context, userID string) (*sdkws.PublicUserInfo, error) {
 	return nil, errors.New("todo")
 }
 
-func GetUsersInfo(ctx context.Context, userIDs []string) ([]*sdk_ws.UserInfo, error) {
+func GetUsersInfo(ctx context.Context, userIDs []string) ([]*sdkws.UserInfo, error) {
 	return nil, errors.New("todo")
 }
 
-func GetUserInfoMap(ctx context.Context, userIDs []string) (map[string]*sdk_ws.UserInfo, error) {
+func GetUserInfoMap(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error) {
 	users, err := GetUsersInfo(ctx, userIDs)
 	if err != nil {
 		return nil, err
 	}
-	return utils.SliceToMap(users, func(e *sdk_ws.UserInfo) string {
+	return utils.SliceToMap(users, func(e *sdkws.UserInfo) string {
 		return e.UserID
 	}), nil
 }
 
-func GetPublicUserInfo(ctx context.Context, userIDs []string) ([]*sdk_ws.PublicUserInfo, error) {
+func GetPublicUserInfo(ctx context.Context, userIDs []string) ([]*sdkws.PublicUserInfo, error) {
 	return nil, errors.New("todo")
 }
 
-func GetPublicUserInfoMap(ctx context.Context, userIDs []string) (map[string]*sdk_ws.PublicUserInfo, error) {
+func GetPublicUserInfoMap(ctx context.Context, userIDs []string) (map[string]*sdkws.PublicUserInfo, error) {
 	users, err := GetPublicUserInfo(ctx, userIDs)
 	if err != nil {
 		return nil, err
 	}
-	return utils.SliceToMap(users, func(e *sdk_ws.PublicUserInfo) string {
+	return utils.SliceToMap(users, func(e *sdkws.PublicUserInfo) string {
 		return e.UserID
 	}), nil
 }

internal/rpc/group/group.go

@@ -17,7 +17,7 @@ import (
 	"Open_IM/pkg/common/tracelog"
 	discoveryRegistry "Open_IM/pkg/discoveryregistry"
 	pbGroup "Open_IM/pkg/proto/group"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"fmt"

internal/rpc/group/super_group.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/db/table/relation"
 	"Open_IM/pkg/common/db/table/unrelation"
 	pbGroup "Open_IM/pkg/proto/group"
-	sdk_ws "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"fmt"
@@ -48,7 +48,7 @@ func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup.
 	superGroupMemberMap := utils.SliceToMapAny(superGroupMembers, func(e *unrelation.SuperGroupModel) (string, []string) {
 		return e.GroupID, e.MemberIDs
 	})
-	resp.Groups = utils.Slice(joinSuperGroup.GroupIDs, func(groupID string) *sdk_ws.GroupInfo {
+	resp.Groups = utils.Slice(joinSuperGroup.GroupIDs, func(groupID string) *sdkws.GroupInfo {
 		return DbToPbGroupInfo(groupMap[groupID], ownerMap[groupID].UserID, uint32(len(superGroupMemberMap)))
 	})
 	return resp, nil
@@ -77,7 +77,7 @@ func (s *groupServer) GetSuperGroupsInfo(ctx context.Context, req *pbGroup.GetSu
 	ownerMap := utils.SliceToMap(owners, func(e *relation.GroupMemberModel) string {
 		return e.GroupID
 	})
-	resp.GroupInfos = utils.Slice(groups, func(e *relation.GroupModel) *sdk_ws.GroupInfo {
+	resp.GroupInfos = utils.Slice(groups, func(e *relation.GroupModel) *sdkws.GroupInfo {
 		return DbToPbGroupInfo(e, ownerMap[e.GroupID].UserID, uint32(len(superGroupMemberMap[e.GroupID])))
 	})
 	return resp, nil

internal/rpc/msg/conversation_notification.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/golang/protobuf/jsonpb"

internal/rpc/msg/del_msg.go

@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/proto/msg"
-	common "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"time"

internal/rpc/msg/extend_msg.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/proto/msg"
-	"Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	go_redis "github.com/go-redis/redis/v8"
@@ -116,10 +116,10 @@ func (rpc *rpcChat) SetMessageReactionExtensions(ctx context.Context, req *msg.S
 				}
 				return &rResp, nil
 			}
-			setValue := make(map[string]*server_api_params.KeyValue)
+			setValue := make(map[string]*sdkws.KeyValue)
 			for k, v := range req.ReactionExtensionList {
 
-				temp := new(server_api_params.KeyValue)
+				temp := new(sdkws.KeyValue)
 				if vv, ok := mongoValue.ReactionExtensionList[k]; ok {
 					utils.CopyStructFields(temp, &vv)
 					if v.LatestUpdateTime != vv.LatestUpdateTime {
@@ -168,7 +168,7 @@ func (rpc *rpcChat) SetMessageReactionExtensions(ctx context.Context, req *msg.S
 				setKeyResultInfo(&rResp, 200, err.Error(), req.ClientMsgID, k, v)
 				continue
 			}
-			temp := new(server_api_params.KeyValue)
+			temp := new(sdkws.KeyValue)
 			utils.JsonStringToStruct(redisValue, temp)
 			if v.LatestUpdateTime != temp.LatestUpdateTime {
 				setKeyResultInfo(&rResp, 300, "message have update", req.ClientMsgID, k, temp)
@@ -198,7 +198,7 @@ func (rpc *rpcChat) SetMessageReactionExtensions(ctx context.Context, req *msg.S
 	return &rResp, nil
 
 }
-func setKeyResultInfo(r *msg.SetMessageReactionExtensionsResp, errCode int32, errMsg, clientMsgID, typeKey string, keyValue *server_api_params.KeyValue) {
+func setKeyResultInfo(r *msg.SetMessageReactionExtensionsResp, errCode int32, errMsg, clientMsgID, typeKey string, keyValue *sdkws.KeyValue) {
 	temp := new(msg.KeyValueResp)
 	temp.KeyValue = keyValue
 	temp.ErrCode = errCode
@@ -206,7 +206,7 @@ func setKeyResultInfo(r *msg.SetMessageReactionExtensionsResp, errCode int32, er
 	r.Result = append(r.Result, temp)
 	_ = db.DB.UnLockMessageTypeKey(clientMsgID, typeKey)
 }
-func setDeleteKeyResultInfo(r *msg.DeleteMessageListReactionExtensionsResp, errCode int32, errMsg, clientMsgID, typeKey string, keyValue *server_api_params.KeyValue) {
+func setDeleteKeyResultInfo(r *msg.DeleteMessageListReactionExtensionsResp, errCode int32, errMsg, clientMsgID, typeKey string, keyValue *sdkws.KeyValue) {
 	temp := new(msg.KeyValueResp)
 	temp.KeyValue = keyValue
 	temp.ErrCode = errCode
@@ -236,10 +236,10 @@ func (rpc *rpcChat) GetMessageListReactionExtensions(ctx context.Context, req *m
 				rResp.SingleMessageResult = append(rResp.SingleMessageResult, &oneMessage)
 				continue
 			}
-			keyMap := make(map[string]*server_api_params.KeyValue)
+			keyMap := make(map[string]*sdkws.KeyValue)
 
 			for k, v := range redisValue {
-				temp := new(server_api_params.KeyValue)
+				temp := new(sdkws.KeyValue)
 				utils.JsonStringToStruct(v, temp)
 				keyMap[k] = temp
 			}
@@ -253,10 +253,10 @@ func (rpc *rpcChat) GetMessageListReactionExtensions(ctx context.Context, req *m
 				rResp.SingleMessageResult = append(rResp.SingleMessageResult, &oneMessage)
 				continue
 			}
-			keyMap := make(map[string]*server_api_params.KeyValue)
+			keyMap := make(map[string]*sdkws.KeyValue)
 
 			for k, v := range mongoValue.ReactionExtensionList {
-				temp := new(server_api_params.KeyValue)
+				temp := new(sdkws.KeyValue)
 				temp.TypeKey = v.TypeKey
 				temp.Value = v.Value
 				temp.LatestUpdateTime = v.LatestUpdateTime
@@ -300,7 +300,7 @@ func (rpc *rpcChat) DeleteMessageReactionExtensions(ctx context.Context, req *ms
 	}
 	for _, v := range callbackResp.ResultReactionExtensionList {
 		if v.ErrCode != 0 {
-			func(req *[]*server_api_params.KeyValue, typeKey string) {
+			func(req *[]*sdkws.KeyValue, typeKey string) {
 				for i := 0; i < len(*req); i++ {
 					if (*req)[i].TypeKey == typeKey {
 						*req = append((*req)[:i], (*req)[i+1:]...)
@@ -338,7 +338,7 @@ func (rpc *rpcChat) DeleteMessageReactionExtensions(ctx context.Context, req *ms
 				setDeleteKeyResultInfo(&rResp, 200, err.Error(), req.ClientMsgID, v.TypeKey, v)
 				continue
 			}
-			temp := new(server_api_params.KeyValue)
+			temp := new(sdkws.KeyValue)
 			utils.JsonStringToStruct(redisValue, temp)
 			if v.LatestUpdateTime != temp.LatestUpdateTime {
 				setDeleteKeyResultInfo(&rResp, 300, "message have update", req.ClientMsgID, v.TypeKey, temp)
@@ -379,10 +379,10 @@ func (rpc *rpcChat) DeleteMessageReactionExtensions(ctx context.Context, req *ms
 			}
 			return &rResp, nil
 		}
-		setValue := make(map[string]*server_api_params.KeyValue)
+		setValue := make(map[string]*sdkws.KeyValue)
 		for _, v := range req.ReactionExtensionList {
 
-			temp := new(server_api_params.KeyValue)
+			temp := new(sdkws.KeyValue)
 			if vv, ok := mongoValue.ReactionExtensionList[v.TypeKey]; ok {
 				utils.CopyStructFields(temp, &vv)
 				if v.LatestUpdateTime != vv.LatestUpdateTime {

internal/rpc/msg/extend_msg.notification.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/getcdv3"
 	"Open_IM/pkg/proto/msg"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 )

internal/rpc/msg/friend_notification.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/tracelog"
 	pbFriend "Open_IM/pkg/proto/friend"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/golang/protobuf/jsonpb"

internal/rpc/msg/group_notification.go

@@ -8,7 +8,7 @@ import (
 	"Open_IM/pkg/common/tokenverify"
 	utils2 "Open_IM/pkg/common/utils"
 	pbGroup "Open_IM/pkg/proto/group"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/golang/protobuf/jsonpb"

internal/rpc/msg/msg_notification.go

@@ -3,7 +3,7 @@ package msg
 import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"

internal/rpc/msg/organization_notification.go

@@ -1,78 +0,0 @@
-package msg
-
-import (
-	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
-	"Open_IM/pkg/common/log"
-	utils2 "Open_IM/pkg/common/utils"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
-	"Open_IM/pkg/utils"
-
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
-)
-
-func OrganizationNotificationToAll(opUserID string, operationID string) {
-	err, userIDList := imdb.GetAllOrganizationUserID()
-	if err != nil {
-		log.Error(operationID, "GetAllOrganizationUserID failed ", err.Error())
-		return
-	}
-
-	tips := open_im_sdk.OrganizationChangedTips{OpUser: &open_im_sdk.UserInfo{}}
-
-	user, err := imdb.GetUserByUserID(opUserID)
-	if err != nil {
-		log.NewError(operationID, "GetUserByUserID failed ", err.Error(), opUserID)
-		return
-	}
-	utils2.UserDBCopyOpenIM(tips.OpUser, user)
-
-	for _, v := range userIDList {
-		log.Debug(operationID, "OrganizationNotification", opUserID, v, constant.OrganizationChangedNotification, &tips, operationID)
-		OrganizationNotification(config.Config.Manager.AppManagerUid[0], v, constant.OrganizationChangedNotification, &tips, operationID)
-	}
-}
-
-func OrganizationNotification(opUserID string, recvUserID string, contentType int32, m proto.Message, operationID string) {
-	log.Info(operationID, utils.GetSelfFuncName(), "args: ", contentType, opUserID)
-	var err error
-	var tips open_im_sdk.TipsComm
-	tips.Detail, err = proto.Marshal(m)
-	if err != nil {
-		log.Error(operationID, "Marshal failed ", err.Error(), m.String())
-		return
-	}
-
-	marshaler := jsonpb.Marshaler{
-		OrigName:     true,
-		EnumsAsInts:  false,
-		EmitDefaults: false,
-	}
-
-	tips.JsonDetail, _ = marshaler.MarshalToString(m)
-
-	switch contentType {
-	case constant.OrganizationChangedNotification:
-		tips.DefaultTips = "OrganizationChangedNotification"
-
-	default:
-		log.Error(operationID, "contentType failed ", contentType)
-		return
-	}
-
-	var n NotificationMsg
-	n.SendID = opUserID
-	n.RecvID = recvUserID
-	n.ContentType = contentType
-	n.SessionType = constant.SingleChatType
-	n.MsgFrom = constant.SysMsgType
-	n.OperationID = operationID
-	n.Content, err = proto.Marshal(&tips)
-	if err != nil {
-		log.Error(operationID, "Marshal failed ", err.Error(), tips.String())
-		return
-	}
-	Notification(&n)
-}

internal/rpc/msg/pull_message.go

@@ -7,7 +7,7 @@ import (
 
 	commonDB "Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
+	open_im_sdk "Open_IM/pkg/proto/sdkws"
 
 	promePkg "Open_IM/pkg/common/prometheus"
 )

internal/rpc/msg/send_msg.go

@@ -13,7 +13,7 @@ import (
 	pbChat "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
-	sdk_ws "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"errors"
@@ -293,7 +293,7 @@ func (rpc *rpcChat) messageVerification(ctx context.Context, data *pbChat.SendMs
 	}
 
 }
-func (rpc *rpcChat) encapsulateMsgData(msg *sdk_ws.MsgData) {
+func (rpc *rpcChat) encapsulateMsgData(msg *sdkws.MsgData) {
 	msg.ServerMsgID = GetMsgID(msg.SendID)
 	msg.SendTime = utils.GetCurrentTimestampByMill()
 	switch msg.ContentType {
@@ -449,8 +449,8 @@ func (rpc *rpcChat) SendMsg(ctx context.Context, pb *pbChat.SendMsgReq) (*pbChat
 		var addUidList []string
 		switch pb.MsgData.ContentType {
 		case constant.MemberKickedNotification:
-			var tips sdk_ws.TipsComm
-			var memberKickedTips sdk_ws.MemberKickedTips
+			var tips sdkws.TipsComm
+			var memberKickedTips sdkws.MemberKickedTips
 			err := proto.Unmarshal(pb.MsgData.Content, &tips)
 			if err != nil {
 				log.Error(pb.OperationID, "Unmarshal err", err.Error())
@@ -761,8 +761,8 @@ type NotificationMsg struct {
 
 func Notification(n *NotificationMsg) {
 	var req pbChat.SendMsgReq
-	var msg sdk_ws.MsgData
-	var offlineInfo sdk_ws.OfflinePushInfo
+	var msg sdkws.MsgData
+	var offlineInfo sdkws.OfflinePushInfo
 	var title, desc, ex string
 	var pushSwitch, unReadCount bool
 	var reliabilityLevel int
@@ -975,14 +975,6 @@ func Notification(n *NotificationMsg) {
 		reliabilityLevel = config.Config.Notification.GroupMemberInfoSet.Conversation.ReliabilityLevel
 		unReadCount = config.Config.Notification.GroupMemberInfoSet.Conversation.UnreadCount
 
-	case constant.OrganizationChangedNotification:
-		pushSwitch = config.Config.Notification.OrganizationChanged.OfflinePush.PushSwitch
-		title = config.Config.Notification.OrganizationChanged.OfflinePush.Title
-		desc = config.Config.Notification.OrganizationChanged.OfflinePush.Desc
-		ex = config.Config.Notification.OrganizationChanged.OfflinePush.Ext
-		reliabilityLevel = config.Config.Notification.OrganizationChanged.Conversation.ReliabilityLevel
-		unReadCount = config.Config.Notification.OrganizationChanged.Conversation.UnreadCount
-
 	case constant.WorkMomentNotification:
 		pushSwitch = config.Config.Notification.WorkMomentsNotification.OfflinePush.PushSwitch
 		title = config.Config.Notification.WorkMomentsNotification.OfflinePush.Title
@@ -1087,11 +1079,11 @@ func getOnlineAndOfflineUserIDList(memberList []string, m map[string][]string, o
 }
 
 func valueCopy(pb *pbChat.SendMsgReq) *pbChat.SendMsgReq {
-	offlinePushInfo := sdk_ws.OfflinePushInfo{}
+	offlinePushInfo := sdkws.OfflinePushInfo{}
 	if pb.MsgData.OfflinePushInfo != nil {
 		offlinePushInfo = *pb.MsgData.OfflinePushInfo
 	}
-	msgData := sdk_ws.MsgData{}
+	msgData := sdkws.MsgData{}
 	msgData = *pb.MsgData
 	msgData.OfflinePushInfo = &offlinePushInfo
 
@@ -1105,11 +1097,11 @@ func valueCopy(pb *pbChat.SendMsgReq) *pbChat.SendMsgReq {
 
 func (rpc *rpcChat) sendMsgToGroup(ctx context.Context, list []string, pb pbChat.SendMsgReq, status string, sendTag *bool, wg *sync.WaitGroup) {
 	//	log.Debug(pb.OperationID, "split userID ", list)
-	offlinePushInfo := sdk_ws.OfflinePushInfo{}
+	offlinePushInfo := sdkws.OfflinePushInfo{}
 	if pb.MsgData.OfflinePushInfo != nil {
 		offlinePushInfo = *pb.MsgData.OfflinePushInfo
 	}
-	msgData := sdk_ws.MsgData{}
+	msgData := sdkws.MsgData{}
 	msgData = *pb.MsgData
 	msgData.OfflinePushInfo = &offlinePushInfo
 

internal/rpc/msg/super_group_notification.go

@@ -3,7 +3,7 @@ package msg
 import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	//sdk "Open_IM/pkg/proto/sdk_ws"
+	//sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	//"github.com/golang/protobuf/jsonpb"
 	//"github.com/golang/protobuf/proto"

internal/rpc/msg/tag_send_msg.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
-	pbCommon "Open_IM/pkg/proto/sdk_ws"
+	pbCommon "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"strings"

internal/rpc/msg/work_moments_notification.go

@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	pbOffice "Open_IM/pkg/proto/office"
-	sdk "Open_IM/pkg/proto/sdk_ws"
+	sdk "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"

internal/rpc/office/office.go

@@ -13,7 +13,7 @@ import (
 	promePkg "Open_IM/pkg/common/prometheus"
 	pbCache "Open_IM/pkg/proto/cache"
 	pbOffice "Open_IM/pkg/proto/office"
-	pbCommon "Open_IM/pkg/proto/sdk_ws"
+	pbCommon "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"context"
 	"github.com/OpenIMSDK/getcdv3"

internal/rpc/user/user.go

@@ -13,7 +13,7 @@ import (
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/tokenverify"
 	"Open_IM/pkg/common/tracelog"
-	server_api_params "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
@@ -125,7 +125,7 @@ func (s *userServer) SetGroupMemberFaceURL(ctx context.Context, faceURL string,
 }
 
 // 获取加入的群成员信息
-func (s *userServer) GetJoinedGroupMembers(ctx context.Context, userID string) (members []*server_api_params.GroupMemberFullInfo, err error) {
+func (s *userServer) GetJoinedGroupMembers(ctx context.Context, userID string) (members []*sdkws.GroupMemberFullInfo, err error) {
 	return
 }
 
@@ -143,7 +143,7 @@ func (s *userServer) GetDesignateUsers(ctx context.Context, req *pbUser.GetDesig
 	return resp, nil
 }
 
-func (s *userServer) GetAllPageFriends(ctx context.Context, ownerUserID string) (resp []*server_api_params.FriendInfo, err error) {
+func (s *userServer) GetAllPageFriends(ctx context.Context, ownerUserID string) (resp []*sdkws.FriendInfo, err error) {
 	return
 }
 
@@ -250,7 +250,7 @@ func (s *userServer) GetPaginationUsers(ctx context.Context, req *pbUser.GetPagi
 // ok
 func (s *userServer) UserRegister(ctx context.Context, req *pbUser.UserRegisterReq) (resp *pbUser.UserRegisterResp, err error) {
 	resp = &pbUser.UserRegisterResp{}
-	if utils.DuplicateAny(req.Users, func(e *server_api_params.UserInfo) string { return e.UserID }) {
+	if utils.DuplicateAny(req.Users, func(e *sdkws.UserInfo) string { return e.UserID }) {
 		return nil, constant.ErrArgs.Wrap("userID repeated")
 	}
 	userIDs := make([]string, 0)