From b4aff74b597ad5604694903cd6b36f355bdfd2a2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 14:35:11 +0800
Subject: [PATCH] srm同步用户改成同步本公司全部用户
---
api/v1/test/member.go | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/api/v1/test/member.go b/api/v1/test/member.go
index f0af64d..a8bd70a 100644
--- a/api/v1/test/member.go
+++ b/api/v1/test/member.go
@@ -1,17 +1,24 @@
package test
import (
+ "context"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
+ "google.golang.org/grpc/metadata"
+ "srm/constvar"
"srm/global"
"srm/model/common/request"
"srm/model/common/response"
"srm/model/test"
testReq "srm/model/test/request"
+ "srm/pkg/contextx"
+ "srm/pkg/ecode"
"srm/proto/user"
"srm/service"
+ "strings"
+ "time"
)
type MemberApi struct {
@@ -207,9 +214,25 @@
defer CloseUserConn()
cli := user.NewUserServiceClient(userConn)
- var users []*user.User
- getMemberListResponse, err := cli.SyncUser(c, &user.UserRequest{Users: users})
-
+ ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+ defer cancel()
+ slices := strings.Split(c.GetHeader("Authorization"), " ")
+ if len(slices) != 2 {
+ ctx := new(contextx.Context).SetCtx(c)
+ ctx.Fail(ecode.JWTEmpty)
+ return
+ }
+ token := slices[1]
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� metadata
+ md := metadata.Pairs("token", token)
+ // 灏� metadata 娣诲姞鍒� context 涓�
+ ctx = metadata.NewOutgoingContext(ctx, md)
+ getMemberListResponse, err := cli.SyncAllUser(ctx, &user.AllUserRequest{SystemType: constvar.SystemTypeSrm})
+ if err != nil {
+ global.GVA_LOG.Error("user.AllUserRequest fail:", zap.Error(err))
+ response.FailWithMessage("鑾峰彇澶辫触", c)
+ return
+ }
rawMemberList := getMemberListResponse.List
memberList := make([]*test.Member, len(rawMemberList))
@@ -224,12 +247,13 @@
if err != nil || len(memberList) == 0 {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
response.FailWithMessage("鑾峰彇澶辫触", c)
- } else {
- response.OkWithDetailed(response.PageResult{
- List: memberList,
- Total: int64(len(memberList)),
- Page: pageInfo.Page,
- PageSize: pageInfo.PageSize,
- }, "鑾峰彇鎴愬姛", c)
+ return
}
+ response.OkWithDetailed(response.PageResult{
+ List: memberList,
+ Total: getMemberListResponse.Total,
+ Page: pageInfo.Page,
+ PageSize: pageInfo.PageSize,
+ }, "鑾峰彇鎴愬姛", c)
+
}
--
Gitblit v1.8.0