Compare commits

..

No commits in common. "fe3f6939257aa8b6f3a7c4947c76a1710f520abc" and "cbded7c26a783f0eb879a812f740e1503d6b423d" have entirely different histories.

View File

@ -57,12 +57,8 @@ func AuthorizationVerify(sourceData []byte) (userInfo *accountFiee.ChatUserData,
if err != nil { if err != nil {
fmt.Printf("err:%v\n", err) fmt.Printf("err:%v\n", err)
} }
if accInfo != nil { if accInfo != nil && accInfo.Name != "" {
accountInfo.Account = accInfo.TelNum accountInfo.NickName = accInfo.Name
if accInfo.Name != "" {
accountInfo.NickName = accInfo.Name
}
} }
case e.ErpDomain: case e.ErpDomain:
//erp token校验 //erp token校验
@ -111,11 +107,10 @@ func AuthorizationVerify(sourceData []byte) (userInfo *accountFiee.ChatUserData,
fmt.Printf("注册聊天用户:%#v\n", userInfo) fmt.Printf("注册聊天用户:%#v\n", userInfo)
} else { } else {
userInfo = chatUserQuery.List[0] userInfo = chatUserQuery.List[0]
if msg.Content.Domain == config.AppConfig.System.Domain && (accountInfo.NickName != userInfo.NickName || accountInfo.Account != userInfo.Account) { if msg.Content.Domain == config.AppConfig.System.Domain && accountInfo.NickName != userInfo.NickName {
_, _ = service.AccountFieeProvider.UpdateChatUser(ctx, &accountFiee.ChatUserData{ _, _ = service.AccountFieeProvider.UpdateChatUser(ctx, &accountFiee.ChatUserData{
NickName: accountInfo.NickName, NickName: accountInfo.NickName,
ID: userInfo.ID, ID: userInfo.ID,
Account: accountInfo.Account,
}) })
userInfo.NickName = accountInfo.NickName userInfo.NickName = accountInfo.NickName
} }