Эх сурвалжийг харах

Merge branch 'hotfix/v4.10.0.4' of https://jygit.jydev.jianyu360.cn/qmx/jy into hotfix/v4.10.0.4

cuiyalong 5 сар өмнө
parent
commit
90c9ddb637

+ 1 - 1
src/jfw/front/login.go

@@ -368,7 +368,7 @@ func (l *Login) ForgetPwd() error {
 			//if l.GetSession("identCodeValue") == nil || l.GetString("identCode") != l.GetSession("identCodeValue") { //验证码不正确
 			//	return "identCodeError"
 			//}
-			l.SetSession("forgetPwdStep", 2)
+			l.SetSession("forgetPwdStep", "2")
 			return "y"
 		} else if reqType == "save" {
 			if l.GetSession("forgetPwdStep") == nil {

+ 3 - 2
src/jfw/modules/app/src/app/front/login.go

@@ -1013,10 +1013,11 @@ func (l *Login) WxLogin() {
 // ForgetPwd 修改登录密码
 func (l *Login) ForgetPwd() error {
 	defer qutil.Catch()
-	log.Println(l.Method(), "----++++++-----", l.GetSession("forgetPwdStep"))
+	log.Println(l.Method(), "--手机号:", l.GetSession("forgetPwdPhone"), "----forgetPwdStep-----", l.GetSession("forgetPwdStep"), "---step--", l.GetString("step"))
 	if l.Method() == "GET" {
 		if l.GetString("step") == "2" {
 			if l.GetSession("forgetPwdStep") == "2" {
+				log.Println("===================================================")
 				return l.Render("/me/forgetPwdTwo.html")
 			}
 		}
@@ -1059,7 +1060,7 @@ func (l *Login) ForgetPwd() error {
 			//if l.GetSession("identCodeValue") == nil || l.GetString("identCode") != l.GetSession("identCodeValue") { //验证码不正确
 			//	return "identCodeError"
 			//}
-			l.SetSession("forgetPwdStep", 2)
+			l.SetSession("forgetPwdStep", "2")
 			l.SetSession("forgetPwdPhone", phone)
 			return "y"
 		} else if reqType == "save" {

+ 1 - 1
src/jfw/modules/publicapply/src/go.mod

@@ -3,7 +3,7 @@ module jy/src/jfw/modules/publicapply/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20250226035759-f8748aad4549
+	app.yhyue.com/moapp/jybase v0.0.0-20250227020441-2a6731d90553
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jypkg v1.32.3
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec

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

@@ -15,8 +15,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJ
 app.yhyue.com/moapp/jybase v0.0.0-20230419121327-bedf77840ba6/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jybase v0.0.0-20231025021840-2f91c944ecdd/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
-app.yhyue.com/moapp/jybase v0.0.0-20250226035759-f8748aad4549 h1:FxoddCbsW5VogN8Rk4vMgHg5KeTDmabiVRCqLBkLoQQ=
-app.yhyue.com/moapp/jybase v0.0.0-20250226035759-f8748aad4549/go.mod h1:/HT/UZ4dKuUKAQqqKrzBBfIZ4vD56DPV4u2QyfH+kbU=
+app.yhyue.com/moapp/jybase v0.0.0-20250227020441-2a6731d90553 h1:D7EX1q1Jf5O/gfqePMXvz3IIqpBsBf4a+YyAwH5i7Nc=
+app.yhyue.com/moapp/jybase v0.0.0-20250227020441-2a6731d90553/go.mod h1:/HT/UZ4dKuUKAQqqKrzBBfIZ4vD56DPV4u2QyfH+kbU=
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=