feat:撤回

go.mod

@@ -9,7 +9,7 @@ require (
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e
 	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/userCenter v1.2.14-0.20230901063927-295e0133fa8f
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/nsqio/go-nsq v1.1.0
 	github.com/robfig/cron v1.2.0
 	github.com/tealeg/xlsx v1.0.5

go.sum

@@ -15,8 +15,8 @@ bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f7
 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/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-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=
+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=
 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.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

identity/identity.go

@@ -76,13 +76,12 @@ func (i *IdentityInfo) Switch(sess *httpsession.Session, mgo *MongodbSim) bool {
 
 // 切换到最优身份
 func SwitchToBest(userId int64, sess *httpsession.Session, mgd *Middleground, mgo *MongodbSim, isSelectLast bool) (int64, bool) {
-	mgoUserId, _ := sess.Get("mgoUserId").(string)
-	list := mgd.UserCenter.IdentityList(userId, mgoUserId, "10000")
+	list := mgd.UserCenter.IdentityList(userId)
 	if list == nil || len(list) == 0 {
 		return -1, false
 	}
 	if isSelectLast {
-		if mgoUserId != "" {
+		if mgoUserId, _ := sess.Get("mgoUserId").(string); mgoUserId != "" {
 			user, ok := mgo.FindById("user", mgoUserId, `{"login_positionid":1}`)
 			if ok && user != nil && len(*user) > 0 {
 				if login_positionid := Int64All((*user)["login_positionid"]); login_positionid > 0 {

middleground/usercenter.go

@@ -43,16 +43,14 @@ func (u *userCenter) NewClient() zrpc.Client {
 }
 
 // 获取身份列表
-func (u *userCenter) IdentityList(userId int64, mgoUserId, appId string) []*pb.Identity {
+func (u *userCenter) IdentityList(userId int64) []*pb.Identity {
 	client := u.NewClient()
 	if client == nil {
 		return nil
 	}
 	//defer client.Conn().Close()
 	resp, err := usercenter.NewUserCenter(client).IdentityList(context.Background(), &pb.IdentityReq{
-		Id:        userId,
-		MgoUserId: mgoUserId,
-		AppId:     appId,
+		Id: userId,
 	})
 	if err != nil {
 		log.Println(err)