blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenxu12345 2022-02-22 18:02:11 +08:00
commit 34695f2aa3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/config.yaml
View File

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

4
internal/rpc/msg/send_msg.go
View File

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