From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
middleware/user.go | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/middleware/user.go b/middleware/user.go
index e852ac9..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"
)
@@ -33,8 +33,11 @@
}
var whiteList = map[string]struct{}{ //鐧藉悕鍗曞湴鍧�鍒楄〃
- "/api/code/getCodeList": {},
- "/api/data/getAllData": {},
+ "/api/code/getCodeList": {},
+ "/api/data/getAllData": {},
+ "/api/serviceCollectionPlan/add": {},
+ "/api/bankAccount/list": {},
+ "/api/paymentType/list": {},
}
func CheckAuth(apiPath string, token string) bool {
@@ -56,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})
@@ -69,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