From ae4076a20e4b93703028dc1af321f6920290375f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 10 十一月 2023 21:29:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 middleware/user.go |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/middleware/user.go b/middleware/user.go
index e852ac9..1f0caac 100644
--- a/middleware/user.go
+++ b/middleware/user.go
@@ -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,11 @@
 	return rsp.Result
 }
 
-func SyncUserInfo() {
+func SyncUserInfo(uuid string) {
 	cli := user.NewUserServiceClient(userConn)
-
-	var users []*user.User
-
+	var users = []*user.User{
+		{Uuid: uuid},
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	r, err := cli.SyncUser(ctx, &user.UserRequest{Users: users})
@@ -72,7 +75,7 @@
 	fmt.Printf("Synced: %v, Message: %s", r.List, r.Message)
 
 	for _, member := range r.List {
-		err = model.NewUserSearch(nil).FirstOrCreate(model.User{
+		err = model.NewUserSearch(nil).Upsert(model.User{
 			UUID:     member.Uuid,
 			Username: member.Username,
 			UserType: constvar.UserType(member.Usertype),

--
Gitblit v1.8.0