Compare commits

..

No commits in common. "f4ae80f32665830f5063ea11a3f54909f855b6f6" and "b06f24d06ebfb03fd459dbd2a42a0b69d0846002" have entirely different histories.

6 changed files with 1509 additions and 1525 deletions

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
syntax = "proto3"; syntax = "proto3";
package accountFiee; package accountFiee;
import "github.com/mwitkow/go-proto-validators@v0.3.2/validator.proto"; import "github.com/mwitkow/go-proto-validators/validator.proto";
option go_package = "./;accountFiee"; option go_package = "./;accountFiee";
//protoc -I . -I C:\Users\lenovo\go\src --go_out=. --go-triple_out=. ./accountFiee.proto //protoc -I . -I C:\Users\lenovo\go\src --go_out=. --go-triple_out=. ./accountFiee.proto
@ -186,7 +186,6 @@ message UserListRequest{
uint64 pageSize = 9; uint64 pageSize = 9;
string blurNameTel = 10; string blurNameTel = 10;
repeated int64 ids = 11; repeated int64 ids = 11;
string nationality = 12;
} }
message UserInfoResponse{ message UserInfoResponse{
uint64 id = 1; uint64 id = 1;
@ -967,8 +966,6 @@ message GetChatUserListRequest2{
string where=3; string where=3;
string name=4; string name=4;
repeated int64 userIdIn=5; repeated int64 userIdIn=5;
string account=6;
repeated int32 roleIn=7;
} }
message ChatUser2{ message ChatUser2{
int64 userId=1; int64 userId=1;

View File

@ -59,7 +59,6 @@ func AuthorizationVerify(sourceData []byte) (userInfo *accountFiee.ChatUserData,
} }
if accInfo != nil { if accInfo != nil {
accountInfo.Account = accInfo.TelNum accountInfo.Account = accInfo.TelNum
accountInfo.Avatar = accInfo.GroupPhoto
if accInfo.Name != "" { if accInfo.Name != "" {
accountInfo.NickName = accInfo.Name accountInfo.NickName = accInfo.Name
} }
@ -112,16 +111,13 @@ 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 || accountInfo.Avatar != userInfo.Avatar) { if msg.Content.Domain == config.AppConfig.System.Domain && (accountInfo.NickName != userInfo.NickName || accountInfo.Account != userInfo.Account) {
_, _ = 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, Account: accountInfo.Account,
Avatar: accountInfo.Avatar,
}) })
userInfo.NickName = accountInfo.NickName userInfo.NickName = accountInfo.NickName
userInfo.Account = accountInfo.Account
userInfo.Avatar = accountInfo.Avatar
} }
fmt.Printf("获取聊天用户:%#v\n", userInfo) fmt.Printf("获取聊天用户:%#v\n", userInfo)
} }

View File

@ -126,7 +126,7 @@ func NewRouter() *gin.Engine {
v1.POST("aschat/message/list", asChat.ChatHandlerIns.MessageList) v1.POST("aschat/message/list", asChat.ChatHandlerIns.MessageList)
v1.POST("aschat/user/stat", asChat.ChatHandlerIns.UserMessageStat) v1.POST("aschat/user/stat", asChat.ChatHandlerIns.UserMessageStat)
v1.POST("aschat/voicetotext", asChat.ChatHandlerIns.VoiceToText) v1.POST("aschat/voicetotext", asChat.ChatHandlerIns.VoiceToText)
v1.POST("aschat/userDetail", asChat.ChatHandlerIns.ArtistDetail) //v1.POST("aschat/artistDetail", asChat.ChatHandlerIns.ArtistDetail)
v1.POST("aschat/autoReplyRuler/create", asChat.Handler.CreateChatAutoReplyRuler) v1.POST("aschat/autoReplyRuler/create", asChat.Handler.CreateChatAutoReplyRuler)
v1.POST("aschat/autoReplyRuler/delete", asChat.Handler.DeleteChatAutoReplyRuler) v1.POST("aschat/autoReplyRuler/delete", asChat.Handler.DeleteChatAutoReplyRuler)
v1.POST("aschat/autoReplyRuler/update", asChat.Handler.UpdateChatAutoReplyRuler) v1.POST("aschat/autoReplyRuler/update", asChat.Handler.UpdateChatAutoReplyRuler)

View File

@ -181,7 +181,3 @@ type AutoReplyRule struct {
Content string `json:"content,omitempty"` Content string `json:"content,omitempty"`
SecondDuration time.Duration `json:"secondDuration,omitempty"` SecondDuration time.Duration `json:"secondDuration,omitempty"`
} }
type UserDetailReq struct {
UserId uint64 `json:"userId"`
}

View File

@ -14,7 +14,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"fonchain-fiee/api/accountFiee" "fonchain-fiee/api/accountFiee"
"fonchain-fiee/cmd/config"
"fonchain-fiee/pkg/common/jwt" "fonchain-fiee/pkg/common/jwt"
"fonchain-fiee/pkg/common/ws" "fonchain-fiee/pkg/common/ws"
"fonchain-fiee/pkg/e" "fonchain-fiee/pkg/e"
@ -452,11 +451,6 @@ func (cr ChatHandler) Upload(c *gin.Context) {
} }
func (cr ChatHandler) UserMessageStat(c *gin.Context) { func (cr ChatHandler) UserMessageStat(c *gin.Context) {
var request accountFiee.GetChatUserListRequest2
if err := c.ShouldBindJSON(&request); err != nil {
service.Error(c, err)
return
}
//获取用户信息 //获取用户信息
chatUser, code := jwt.ParseToChatUser(c) chatUser, code := jwt.ParseToChatUser(c)
if code != 0 { if code != 0 {
@ -469,18 +463,21 @@ func (cr ChatHandler) UserMessageStat(c *gin.Context) {
return return
} }
fmt.Printf("cache stat:%+v\n", result) fmt.Printf("cache stat:%+v\n", result)
request.Page = 1 //获取实名信息
request.PageSize = int64(len(result)) var protoReq = accountFiee.GetChatUserListRequest2{
Page: 1,
PageSize: int64(len(result)),
}
for i, item := range result { for i, item := range result {
if item.UserId == 0 { if item.UserId == 0 {
sessionId, _ := strconv.Atoi(item.SessionId) sessionId, _ := strconv.Atoi(item.SessionId)
item.UserId = int64(sessionId) item.UserId = int64(sessionId)
result[i].UserId = int64(sessionId) result[i].UserId = int64(sessionId)
} }
request.UserIdIn = append(request.UserIdIn, item.UserId) protoReq.UserIdIn = append(protoReq.UserIdIn, item.UserId)
} }
fmt.Printf("protoReq.UserIdIn:%+v\n", request.UserIdIn) fmt.Printf("protoReq.UserIdIn:%+v\n", protoReq.UserIdIn)
listRes, err := service.AccountFieeProvider.GetChatUserList2(c, &request) listRes, err := service.AccountFieeProvider.GetChatUserList2(c, &protoReq)
if err != nil { if err != nil {
service.Error(c, err) service.Error(c, err)
return return
@ -534,23 +531,50 @@ func (cr ChatHandler) VoiceToText(c *gin.Context) {
service.Success(c, map[string]string{"convText": detail.ConvText}) service.Success(c, map[string]string{"convText": detail.ConvText})
} }
func (cr ChatHandler) UserDetail(c *gin.Context) { //func (cr ChatHandler) ArtistDetail(c *gin.Context) {
var req dto.UserDetailReq // var req ArtistInfoRequest
if err := c.ShouldBindJSON(&req); err != nil { // if err := c.ShouldBindJSON(&req); err != nil {
service.Error(c, err) // service.Error(c, err)
return // return
} // }
if req.UserId == 0 { // if req.UserId == 0 {
service.Success(c, dto.ArtistInfo{}) // service.Success(c, ArtistInfo{})
return // return
} // }
resp, err := service.AccountFieeProvider.Info(c, &accountFiee.InfoRequest{ID: req.UserId, Domain: config.AppConfig.System.Domain}) // detail, err := service.GrpcArtistInfoUserImpl.FindUsersUserView(c, &artistInfoUser.FindUsersRequest{UserId: req.UserId})
if err != nil { // if err != nil {
service.Error(c, err) // service.Error(c, err)
return // return
} // }
service.Success(c, resp) // var (
} // tnum string
// artistName string
// age int64
// sex string
// nativePlace string
// telNum string
// recentPhoto string
// )
// if len(detail.Data) > 0 {
// tnum = detail.Data[0].Tnum
// artistName = beautifulZeroName(detail.Data[0].RealName, req.UserId)
// age = detail.Data[0].Age
// sex = detail.Data[0].Sex
// nativePlace = detail.Data[0].NativePlace
// telNum = detail.Data[0].TelNum
// recentPhoto = detail.Data[0].Photo
// }
// resp := ArtistInfo{
// Tnum: tnum,
// ArtistName: artistName,
// Age: age,
// Sex: sex,
// NativePlace: nativePlace,
// TelNum: telNum,
// RecentPhoto: recentPhoto,
// }
// service.Success(c, resp)
//}
// 对没有名字的name进行优化 // 对没有名字的name进行优化
func beautifulZeroName(name string, userId int64) string { func beautifulZeroName(name string, userId int64) string {