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

config/config.yaml

@@ -458,19 +458,19 @@ demoswitch: true
 demo:
   openImDemoPort: [ 42233 ]
   alismsverify:
-    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe71
+    accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7
-    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV1
+    accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV
-    signName: OpenIM Corporation
+    signName: 托云信息技术
-    verificationCodeTemplateCode: SMS_2268101641
+    verificationCodeTemplateCode: SMS_226810164
   superCode: 666666
   #  second
   codeTTL: 60
   mail:
     title: "openIM"
-    senderMail: "1765567899@qq.com"
+    senderMail: "765567899@qq.com"
-    senderAuthorizationCode: "1gxyausfoevlzbfag"
+    senderAuthorizationCode: "gxyausfoevlzbfag"
     smtpAddr: "smtp.qq.com"
-    smtpPort: 25
+    smtpPort:
 
 
 

internal/rpc/msg/send_msg.go

@@ -57,9 +57,7 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) {
 }
 func (rpc *rpcChat) encapsulateMsgData(msg *sdk_ws.MsgData) {
 	msg.ServerMsgID = GetMsgID(msg.SendID)
-	if msg.SendTime == 0 {
 	msg.SendTime = utils.GetCurrentTimestampByMill()
-	}
 	switch msg.ContentType {
 	case constant.Text:
 		fallthrough