From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix
---
service/user.go | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/service/user.go b/service/user.go
index ad83ad2..c5a1c8e 100644
--- a/service/user.go
+++ b/service/user.go
@@ -10,6 +10,7 @@
"aps_crm/proto/user"
"context"
"errors"
+ "fmt"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"gorm.io/gorm"
@@ -107,20 +108,23 @@
func InitUserConn() {
var err error
- userConn, err = grpc.Dial(conf.Conf.GrpcServiceAddr.Aps, grpc.WithTransportCredentials(insecure.NewCredentials()))
+ userConn, err = grpc.Dial(conf.Conf.GrpcServiceAddr.Admin, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
logx.Errorf("grpc dial user service error: %v", err.Error())
return
}
- defer userConn.Close()
}
-func (userService *UserService) SyncUserInfo() (err error) {
+func CloseUserConn() {
+ if userConn != nil {
+ userConn.Close()
+ }
+}
+
+func SyncUserInfo() {
cli := user.NewUserServiceClient(userConn)
- users := []*user.User{
- // ... fetched users
- }
+ var users []*user.User
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
@@ -129,7 +133,18 @@
logx.Fatalf("could not sync users: %v", err)
}
- logx.Infof("Synced: %v, Message: %s", r.List, r.Message)
+ fmt.Printf("Synced: %v, Message: %s", r.List, r.Message)
- return nil
+ for _, member := range r.List {
+ err = model.NewUserSearch(nil).FirstOrCreate(model.User{
+ UUID: member.Uuid,
+ Username: member.Username,
+ UserType: constvar.UserType(member.Usertype),
+ NickName: member.Nickname,
+ })
+ if err != nil {
+ logx.Errorf("sync user error: %v", err.Error())
+ continue
+ }
+ }
}
--
Gitblit v1.8.0