Merge remote-tracking branch 'origin/tuoyun' into tuoyun

config/config.yaml

@@ -462,7 +462,8 @@ notification:
 #是否启动demo，如果自身没有账号体系，设置为true
 demoswitch: true
 demo:
-  openImDemoPort: [ 42233 ] #demo对外服务端口，默认即可，需要开放此端口或做nginx转发
+  #demo对外服务端口，默认即可，需要开放此端口或做nginx转发
+  openImDemoPort: [ 42233 ]
   alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，必须修改
     accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7
     accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV

internal/msg_transfer/logic/init.go

@@ -20,6 +20,6 @@ func Init() {
 }
 func Run() {
 	//register mysqlConsumerHandler to
-	go persistentCH.persistentConsumerGroup.RegisterHandleAndConsumer(&persistentCH)
+	//go persistentCH.persistentConsumerGroup.RegisterHandleAndConsumer(&persistentCH)
 	go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH)
 }

internal/rpc/msg/send_msg.go

@@ -245,7 +245,7 @@ func (rpc *rpcChat) sendMsgToKafka(m *pbChat.MsgDataToMQ, key string) error {
 }
 func GetMsgID(sendID string) string {
 	t := time.Now().Format("2006-01-02 15:04:05")
-	return t + "-" + sendID + "-" + strconv.Itoa(rand.Int())
+	return utils.Md5(t + "-" + sendID + "-" + strconv.Itoa(rand.Int()))
 }
 
 func returnMsg(replay *pbChat.SendMsgResp, pb *pbChat.SendMsgReq, errCode int32, errMsg, serverMsgID string, sendTime int64) (*pbChat.SendMsgResp, error) {