errcode

internal/msgtransfer/db.go

@@ -1,4 +1,4 @@
-package logic
+package msgtransfer
 
 import (
 	"Open_IM/pkg/common/db"

internal/msgtransfer/init.go

@@ -1,4 +1,4 @@
-package logic
+package msgtransfer
 
 import (
 	"Open_IM/pkg/common/config"

internal/msgtransfer/modify_msg_handler.go

@@ -1,15 +1,13 @@
-package logic
+package msgtransfer
 
 import (
-	"Open_IM/pkg/api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/mongo"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
 	pbMsg "Open_IM/pkg/proto/msg"
-	server_api_params "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"encoding/json"
 	"github.com/Shopify/sarama"
@@ -90,9 +88,9 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg
 					continue
 				}
 			} else {
-				var reactionExtensionList = make(map[string]*server_api_params.KeyValue)
+				var reactionExtensionList = make(map[string]*sdkws.KeyValue)
 				for _, v := range notification.SuccessReactionExtensionList {
-					reactionExtensionList[v.TypeKey] = &server_api_params.KeyValue{
+					reactionExtensionList[v.TypeKey] = &sdkws.KeyValue{
 						TypeKey:          v.TypeKey,
 						Value:            v.Value,
 						LatestUpdateTime: v.LatestUpdateTime,

internal/msgtransfer/online_history_msg_handler.go

@@ -1,4 +1,4 @@
-package logic
+package msgtransfer
 
 import (
 	"Open_IM/pkg/common/config"
@@ -6,7 +6,6 @@ import (
 	"Open_IM/pkg/common/db"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/getcdv3"
 	pbMsg "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
@@ -164,8 +163,8 @@ func (och *OnlineHistoryRedisConsumerHandler) SendMessageToMongoCH(aggregationID
 //				}
 //				for _, v := range msgList {
 //					if v.MsgData.ContentType == constant.DeleteMessageNotification {
-//						tips := server_api_params.TipsComm{}
-//						DeleteMessageTips := server_api_params.DeleteMessageTips{}
+//						tips := sdkws.TipsComm{}
+//						DeleteMessageTips := sdkws.DeleteMessageTips{}
 //						err := proto.Unmarshal(v.MsgData.Content, &tips)
 //						if err != nil {
 //							log.NewError(triggerID, "tips unmarshal err:", err.Error(), v.String())

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -1,4 +1,4 @@
-package logic
+package msgtransfer
 
 import (
 	"Open_IM/pkg/common/config"
@@ -7,7 +7,7 @@ import (
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
 	pbMsg "Open_IM/pkg/proto/msg"
-	server_api_params "Open_IM/pkg/proto/sdk_ws"
+	sdkws "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
@@ -18,10 +18,10 @@ type OnlineHistoryMongoConsumerHandler struct {
 	historyConsumerGroup *kfk.MConsumerGroup
 }
 
-func (och *OnlineHistoryMongoConsumerHandler) Init() {
-	och.msgHandle = make(map[string]fcb)
-	och.msgHandle[config.Config.Kafka.MsgToMongo.Topic] = och.handleChatWs2Mongo
-	och.historyConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,
+func (mc *OnlineHistoryMongoConsumerHandler) Init() {
+	mc.msgHandle = make(map[string]fcb)
+	mc.msgHandle[config.Config.Kafka.MsgToMongo.Topic] = mc.handleChatWs2Mongo
+	mc.historyConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,
 		OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.MsgToMongo.Topic},
 		config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMongo)
 
@@ -46,8 +46,8 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(cMsg *sarama.Con
 	}
 	for _, v := range msgFromMQ.MessageList {
 		if v.MsgData.ContentType == constant.DeleteMessageNotification {
-			tips := server_api_params.TipsComm{}
-			DeleteMessageTips := server_api_params.DeleteMessageTips{}
+			tips := sdkws.TipsComm{}
+			DeleteMessageTips := sdkws.DeleteMessageTips{}
 			err := proto.Unmarshal(v.MsgData.Content, &tips)
 			if err != nil {
 				log.NewError(msgFromMQ.TriggerID, "tips unmarshal err:", err.Error(), v.String())
@@ -68,13 +68,13 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(cMsg *sarama.Con
 func (OnlineHistoryMongoConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error   { return nil }
 func (OnlineHistoryMongoConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil }
 
-func (och *OnlineHistoryMongoConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession,
+func (mc *OnlineHistoryMongoConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession,
 	claim sarama.ConsumerGroupClaim) error { // a instance in the consumer group
 	log.NewDebug("", "online new session msg come", claim.HighWaterMarkOffset(), claim.Topic(), claim.Partition())
 	for msg := range claim.Messages() {
 		log.NewDebug("", "kafka get info to mongo", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value), "key", string(msg.Key))
 		if len(msg.Value) != 0 {
-			och.msgHandle[msg.Topic](msg, string(msg.Key), sess)
+			mc.msgHandle[msg.Topic](msg, string(msg.Key), sess)
 		} else {
 			log.Error("", "mongo msg get from kafka but is nil", msg.Key)
 		}

internal/msgtransfer/persistent_msg_handler.go

@@ -4,7 +4,7 @@
 ** author("fg,Gordon@tuoyun.net").
 ** time(2021/5/11 15:37).
  */
-package logic
+package msgtransfer
 
 import (
 	"Open_IM/pkg/common/config"
@@ -98,3 +98,15 @@ func (pc *PersistentConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSessi
 	}
 	return nil
 }
+
+1. 请求1  group Rpc             2. 请求2 发消息 sendMsg rpc
+1 更改数据库
+
+2. 删除哈希缓存
+								检测到哈希变了， 群成员还没来得及删除，有问题
+3. 删除群成员缓存
+
+4. 删除对应群成员加群缓存
+
+5. 删除数量缓存
+