From 9ec9a4987cb5fe4a3bd39d61029add5c51d3ab92 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 02 十二月 2023 11:00:26 +0800
Subject: [PATCH] 添加来源
---
service/user.go | 61 +++++-------------------------
1 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/service/user.go b/service/user.go
index c5a1c8e..923ccc2 100644
--- a/service/user.go
+++ b/service/user.go
@@ -1,20 +1,12 @@
package service
import (
- "aps_crm/conf"
"aps_crm/constvar"
"aps_crm/model"
"aps_crm/pkg/ecode"
"aps_crm/pkg/encrypt"
- "aps_crm/pkg/logx"
- "aps_crm/proto/user"
- "context"
"errors"
- "fmt"
- "google.golang.org/grpc"
- "google.golang.org/grpc/credentials/insecure"
"gorm.io/gorm"
- "time"
)
type UserService struct{}
@@ -98,53 +90,20 @@
})
}
-func (userService *UserService) GetUserList() (userList []*model.User, err error) {
- return model.NewUserSearch(nil).FindAll()
+func (userService *UserService) GetUserList(userIds []int) (userList []*model.User, err error) {
+ return model.NewUserSearch(nil).SetUserIds(userIds).FindAll()
}
-var (
- userConn *grpc.ClientConn
-)
-
-func InitUserConn() {
- var err error
- userConn, err = grpc.Dial(conf.Conf.GrpcServiceAddr.Admin, grpc.WithTransportCredentials(insecure.NewCredentials()))
+func (userService *UserService) UUID2CrmUserId(uuids []string) (crmUserIds []int, m map[string]int, err error) {
+ idPairs, err := model.NewUserSearch(nil).UUID2CrmUserId(uuids)
if err != nil {
- logx.Errorf("grpc dial user service error: %v", err.Error())
return
}
-}
-
-func CloseUserConn() {
- if userConn != nil {
- userConn.Close()
+ crmUserIds = make([]int, 0, len(idPairs))
+ m = make(map[string]int, len(idPairs))
+ for _, idPair := range idPairs {
+ crmUserIds = append(crmUserIds, idPair.ID)
+ m[idPair.UUID] = idPair.ID
}
-}
-
-func SyncUserInfo() {
- cli := user.NewUserServiceClient(userConn)
-
- var users []*user.User
-
- ctx, cancel := context.WithTimeout(context.Background(), time.Second)
- defer cancel()
- r, err := cli.SyncUser(ctx, &user.UserRequest{Users: users})
- if err != nil {
- logx.Fatalf("could not sync users: %v", err)
- }
-
- fmt.Printf("Synced: %v, Message: %s", r.List, r.Message)
-
- 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
- }
- }
+ return
}
--
Gitblit v1.8.0