wangchuanjin 2 жил өмнө
parent
commit
7ab1e7318e

+ 2 - 2
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-20230128052315-811c057c385c
+	app.yhyue.com/moapp/jypkg v0.0.0-20230128080513-0e6d62aa230b
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.2.6
 	go.mongodb.org/mongo-driver v1.11.1
@@ -14,7 +14,7 @@ require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230128033309-a6b26e74a68c // indirect
-	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230116052827-9b32b243b46f // indirect
+	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect

+ 4 - 4
src/jfw/modules/publicapply/src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 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-20230128052315-811c057c385c h1:x1hU6Ks/e8H1yisXyp2ZEcQOGExrgcEhRvEaRtz/ojI=
-app.yhyue.com/moapp/jypkg v0.0.0-20230128052315-811c057c385c/go.mod h1:/DozQdHZf8BFCXvg6mC5tjaaJpn5R5EbHnaLhGtglDc=
+app.yhyue.com/moapp/jypkg v0.0.0-20230128080513-0e6d62aa230b h1:LDwhdHs2Ca45Q1Zu78AF5fJpZHVo1LD1qjeFcWV+1JM=
+app.yhyue.com/moapp/jypkg v0.0.0-20230128080513-0e6d62aa230b/go.mod h1:MqJfBFTSfZhrNDEnE4e19BmaLkaMr+lYActLXm6lrpw=
 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/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -31,8 +31,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.4/go.mod h1:rRiGzKG4F/fmkN
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220905055615-8540037e1b06/go.mod h1:LS21iwbgP8i3ZHJ1n4yNpLXQ/nzEudUOk0klC6VM2dQ=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230116052827-9b32b243b46f h1:sy6yPSBiLzKAxPZ6Oaw8NpYD82vFuz17F2YcI7gvx/8=
-bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230116052827-9b32b243b46f/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1 h1:LH/gm2iRShZ64FEuF7LTzF62iJhOVVD9AxGVHFd0ORI=
+bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230128064517-23fe8581b7f1/go.mod h1:m7/aZ1r1FapNT2h3gqmCFVb0EV+CaJaNKNPHMzLHx8Y=
 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=

+ 2 - 10
src/jfw/modules/publicapply/src/identity/service/service.go

@@ -68,16 +68,8 @@ func (f *Identity) SwitchIdentity() {
 	token := f.GetString("token")
 	identityInfo := decode(token)
 	status := 0
-	if identityInfo != nil {
-		if identityInfo.PositionType == 0 {
-			if identityInfo.SwitchToPersonal(f.Session()) {
-				status = 1
-			}
-		} else if identityInfo.PositionType == 1 {
-			if identityInfo.SwitchToEnt(f.Session()) {
-				status = 1
-			}
-		}
+	if identityInfo != nil && identityInfo.Switch(f.Session()) {
+		status = 1
 	}
 	f.ServeJson(Result{
 		Data: status,