xiugai

src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a
+	app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230220014527-d2ee17034d1e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0

src/go.sum

@@ -4,8 +4,8 @@ app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Y
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a h1:bfuA2SciRXJswIAM5fz5nXuxfKNU8pO6NzVRVXKVFLc=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc h1:IUx5zwfwxnYS5JwlwPKP6LVQOPPxbOTncdFKeEjjUng=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 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=

src/jfw/filter/filter.go

@@ -44,7 +44,7 @@ func (f *Filter) Do(w http.ResponseWriter, r *http.Request) bool {
 		session.Set("mgoUserId", getSession["userId"])
 	}
 	if getSession["base_user_id"] != nil && getSession["positionId"] == nil {
-		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &public.MQFW)
+		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &public.MQFW, false)
 	}
 	if !(&logFilter{w, r, session, getSession, make(map[string]interface{})}).Do() {
 		return false

src/jfw/front/front.go

@@ -817,7 +817,7 @@ func CreateSession(q map[string]interface{}, sess *httpsession.Session, typ stri
 	sessionVal["platform"] = typ
 	sess.SetMultiple(sessionVal)
 	if isSwitchToBestIdentity {
-		SwitchToBest(util.Int64All(sessionVal["base_user_id"]), sess, config.Middleground, &public.MQFW)
+		SwitchToBest(util.Int64All(sessionVal["base_user_id"]), sess, config.Middleground, &public.MQFW, true)
 	}
 	s_nickname := util.If(sessionVal["s_nickname"] != nil, sessionVal["s_nickname"], sessionVal["phone"])
 	if util.ObjToString(s_nickname) == "" {

src/jfw/modules/app/src/app/filter/filter.go

@@ -43,7 +43,7 @@ func (f *Filter) Do(w http.ResponseWriter, r *http.Request) bool {
 		session.Set("mgoUserId", getSession["userId"])
 	}
 	if getSession["base_user_id"] != nil && getSession["positionId"] == nil {
-		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &public.MQFW)
+		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &public.MQFW, false)
 	}
 	if !(&logFilter{w, r, getSession}).Do() {
 		return false

src/jfw/modules/app/src/app/front/login.go

@@ -1110,7 +1110,7 @@ func createSession(s *httpsession.Session, loginId string, loginType int, rw htt
 	}
 	s.SetMultiple(sessVal)
 	if isSwitchToBestIdentity {
-		SwitchToBest(qutil.Int64All(sessVal["base_user_id"]), s, config.Middleground, &public.MQFW)
+		SwitchToBest(qutil.Int64All(sessVal["base_user_id"]), s, config.Middleground, &public.MQFW, true)
 	}
 	//cookie
 	maxAge := int(time.Hour * 72 / time.Second) //3天，单位秒

src/jfw/modules/app/src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a
+	app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230220014527-d2ee17034d1e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0

src/jfw/modules/app/src/go.sum

@@ -4,8 +4,8 @@ app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Y
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a h1:bfuA2SciRXJswIAM5fz5nXuxfKNU8pO6NzVRVXKVFLc=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc h1:IUx5zwfwxnYS5JwlwPKP6LVQOPPxbOTncdFKeEjjUng=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 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=

src/jfw/modules/publicapply/src/filter/sessionfilter.go

@@ -28,7 +28,7 @@ func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 		session.Set("mgoUserId", getSession["userId"])
 	}
 	if getSession["base_user_id"] != nil && getSession["positionId"] == nil {
-		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &Mgo)
+		identity.SwitchToBest(util.Int64All(getSession["base_user_id"]), session, Middleground, &Mgo, false)
 	}
 	if reg.MatchString(req.URL.Path) || reg.MatchString(req.URL.Path) || reg_share.MatchString(req.URL.Path) || reg_nps.MatchString(req.URL.Path) {
 		return true

src/jfw/modules/publicapply/src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a
+	app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230220014527-d2ee17034d1e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.0.6

src/jfw/modules/publicapply/src/go.sum

@@ -4,8 +4,8 @@ app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Y
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a h1:bfuA2SciRXJswIAM5fz5nXuxfKNU8pO6NzVRVXKVFLc=
-app.yhyue.com/moapp/jypkg v0.0.0-20230220054434-ca4534b91c2a/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc h1:IUx5zwfwxnYS5JwlwPKP6LVQOPPxbOTncdFKeEjjUng=
+app.yhyue.com/moapp/jypkg v0.0.0-20230220063100-0b9ec88ed9bc/go.mod h1:Qesky/YEXV3LjT27IQmlXOhn05ghyDTh55swoDFr9Ao=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 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=

src/jfw/modules/publicapply/src/identity/service/service.go

@@ -34,27 +34,19 @@ func decode(v string) *IdentityInfo {
 func (f *Identity) List() {
 	identitys := []map[string]interface{}{}
 	sessVal := f.Session().GetMultiple()
-	var login_positionid int64
-	if mgoUserId, _ := sessVal["mgoUserId"].(string); mgoUserId != "" {
-		user, ok := Mgo.FindById("user", mgoUserId, `{"login_positionid":1}`)
-		if ok && user != nil && len(*user) > 0 {
-			login_positionid = util.Int64All((*user)["login_positionid"])
-		}
-	}
+	positionId := util.Int64All(sessVal["positionId"])
 	if base_user_id := util.Int64All(sessVal["base_user_id"]); base_user_id > 0 {
 		list := Middleground.UserCenter.IdentityList(base_user_id)
 		for k, v := range list {
-			if login_positionid == v.PositionId {
+			if positionId == v.PositionId {
 				break
 			} else if k == len(list)-1 {
-				SwitchToBest(base_user_id, f.Session(), Middleground, &Mgo)
-				sessVal = f.Session().GetMultiple()
-				login_positionid = util.Int64All(sessVal["positionId"])
+				positionId, _ = SwitchToBest(base_user_id, f.Session(), Middleground, &Mgo, false)
 			}
 		}
 		for _, v := range list {
 			checked := 0
-			if login_positionid == v.PositionId {
+			if positionId == v.PositionId {
 				checked = 1
 				NewIdentityInfo(v).Switch(f.Session(), &Mgo)
 			}