From b3a47cb555076c25c64d83dd455a472509291245 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 13 十一月 2023 16:09:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
middleware/user.go | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/middleware/user.go b/middleware/user.go
index f1e4487..198b328 100644
--- a/middleware/user.go
+++ b/middleware/user.go
@@ -7,9 +7,9 @@
"aps_crm/pkg/logx"
"aps_crm/proto/user"
"context"
- "fmt"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
+ "strings"
"time"
)
@@ -59,11 +59,14 @@
return rsp.Result
}
-func SyncUserInfo() {
+func SyncUserInfo(uuid []string) {
cli := user.NewUserServiceClient(userConn)
-
var users []*user.User
-
+ for _, id := range uuid {
+ users = append(users, &user.User{
+ Uuid: id,
+ })
+ }
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
r, err := cli.SyncUser(ctx, &user.UserRequest{Users: users})
@@ -72,15 +75,19 @@
return
}
- fmt.Printf("Synced: %v, Message: %s", r.List, r.Message)
+ logx.Infof("Synced: %v, Message: %s", r.List, r.Message)
for _, member := range r.List {
- err = model.NewUserSearch(nil).FirstOrCreate(model.User{
+ userRecord := model.User{
UUID: member.Uuid,
Username: member.Username,
UserType: constvar.UserType(member.Usertype),
NickName: member.Nickname,
- })
+ }
+ if member.SubUserIds != nil {
+ userRecord.SubUserIds = strings.Join(member.SubUserIds, ",")
+ }
+ err = model.NewUserSearch(nil).Upsert(userRecord, member.SubUserQueried)
if err != nil {
logx.Errorf("sync user error: %v", err.Error())
continue
--
Gitblit v1.8.0