wangshan 1 жил өмнө
parent
commit
59bf02fead
3 өөрчлөгдсөн 19 нэмэгдсэн , 17 устгасан
  1. 2 2
      go.mod
  2. 4 4
      go.sum
  3. 13 11
      middleground/usercenter.go

+ 2 - 2
go.mod

@@ -7,9 +7,9 @@ require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14-0.20230901063927-295e0133fa8f
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/robfig/cron v1.2.0
 	github.com/robfig/cron v1.2.0
 	github.com/tealeg/xlsx v1.0.5
 	github.com/tealeg/xlsx v1.0.5

+ 4 - 4
go.sum

@@ -11,12 +11,12 @@ app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8vi
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 h1:hrBqrsf2QHTrnoR9VTV4w7g2akDfbpQ+umNQvkkNs+Y=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13/go.mod h1:vDEKni2rnCraKgKnnCEIwsFmO92GxnpfKmNQ+83wKP0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14-0.20230901063927-295e0133fa8f h1:6VlVY0vfADW9ydcalFtmLBr8/LJkRHttEjX4HzQWhmY=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14-0.20230901063927-295e0133fa8f/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

+ 13 - 11
middleground/usercenter.go

@@ -42,15 +42,17 @@ func (u *userCenter) NewClient() zrpc.Client {
 	return client
 	return client
 }
 }
 
 
-//获取身份列表
-func (u *userCenter) IdentityList(userId int64) []*pb.Identity {
+// 获取身份列表
+func (u *userCenter) IdentityList(userId int64, mgoUserId, appId string) []*pb.Identity {
 	client := u.NewClient()
 	client := u.NewClient()
 	if client == nil {
 	if client == nil {
 		return nil
 		return nil
 	}
 	}
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()
 	resp, err := usercenter.NewUserCenter(client).IdentityList(context.Background(), &pb.IdentityReq{
 	resp, err := usercenter.NewUserCenter(client).IdentityList(context.Background(), &pb.IdentityReq{
-		Id: userId,
+		Id:        userId,
+		MgoUserId: mgoUserId,
+		AppId:     appId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		log.Println(err)
 		log.Println(err)
@@ -59,7 +61,7 @@ func (u *userCenter) IdentityList(userId int64) []*pb.Identity {
 	return resp.Identitys
 	return resp.Identitys
 }
 }
 
 
-//获取账号id获取个人身份信息
+// 获取账号id获取个人身份信息
 func (u *userCenter) IdentityByUserId(userId int64) *pb.Identity {
 func (u *userCenter) IdentityByUserId(userId int64) *pb.Identity {
 	client := u.NewClient()
 	client := u.NewClient()
 	if client == nil {
 	if client == nil {
@@ -76,7 +78,7 @@ func (u *userCenter) IdentityByUserId(userId int64) *pb.Identity {
 	return resp
 	return resp
 }
 }
 
 
-//根据职位id获取身份信息
+// 根据职位id获取身份信息
 func (u *userCenter) IdentityByPositionId(positionId int64) *pb.Identity {
 func (u *userCenter) IdentityByPositionId(positionId int64) *pb.Identity {
 	client := u.NewClient()
 	client := u.NewClient()
 	if client == nil {
 	if client == nil {
@@ -93,7 +95,7 @@ func (u *userCenter) IdentityByPositionId(positionId int64) *pb.Identity {
 	return resp
 	return resp
 }
 }
 
 
-//根据企业员工id获取身份信息
+// 根据企业员工id获取身份信息
 func (u *userCenter) IdentityByEntUserId(entUserId int64) *pb.Identity {
 func (u *userCenter) IdentityByEntUserId(entUserId int64) *pb.Identity {
 	client := u.NewClient()
 	client := u.NewClient()
 	if client == nil {
 	if client == nil {
@@ -110,7 +112,7 @@ func (u *userCenter) IdentityByEntUserId(entUserId int64) *pb.Identity {
 	return resp
 	return resp
 }
 }
 
 
-//添加用户
+// 添加用户
 func (u *userCenter) UserAdd(req pb.UserAddReq) *pb.UserAddResp {
 func (u *userCenter) UserAdd(req pb.UserAddReq) *pb.UserAddResp {
 	client := u.NewClient()
 	client := u.NewClient()
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()
@@ -136,7 +138,7 @@ func (u *userCenter) UserAdd(req pb.UserAddReq) *pb.UserAddResp {
 	return resp
 	return resp
 }
 }
 
 
-//修改用户
+// 修改用户
 func (u *userCenter) UserUpdate(req pb.UserIdReq) *pb.ExamineResp {
 func (u *userCenter) UserUpdate(req pb.UserIdReq) *pb.ExamineResp {
 	client := u.NewClient()
 	client := u.NewClient()
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()
@@ -160,7 +162,7 @@ func (u *userCenter) UserUpdate(req pb.UserIdReq) *pb.ExamineResp {
 	return resp
 	return resp
 }
 }
 
 
-//删除用户
+// 删除用户
 func (u *userCenter) UserDel(req pb.UserIdReq) *pb.ExamineResp {
 func (u *userCenter) UserDel(req pb.UserIdReq) *pb.ExamineResp {
 	client := u.NewClient()
 	client := u.NewClient()
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()
@@ -175,7 +177,7 @@ func (u *userCenter) UserDel(req pb.UserIdReq) *pb.ExamineResp {
 	return resp
 	return resp
 }
 }
 
 
-//清用户缓存
+// 清用户缓存
 func (u *userCenter) WorkDesktopClearUserInfo(req pb.WorkDesktopClearUserInfoReq) *pb.WorkDesktopClearUserInfoResp {
 func (u *userCenter) WorkDesktopClearUserInfo(req pb.WorkDesktopClearUserInfoReq) *pb.WorkDesktopClearUserInfoResp {
 	client := u.NewClient()
 	client := u.NewClient()
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()
@@ -190,7 +192,7 @@ func (u *userCenter) WorkDesktopClearUserInfo(req pb.WorkDesktopClearUserInfoReq
 	return resp
 	return resp
 }
 }
 
 
-//用户菜单获取
+// 用户菜单获取
 func (u *userCenter) WorkDesktopMenuInfo(req pb.WorkDesktopMenuInfoReq) *pb.WorkDesktopMenuInfoResp {
 func (u *userCenter) WorkDesktopMenuInfo(req pb.WorkDesktopMenuInfoReq) *pb.WorkDesktopMenuInfoResp {
 	client := u.NewClient()
 	client := u.NewClient()
 	//defer client.Conn().Close()
 	//defer client.Conn().Close()