wangchuanjin 3 týždňov pred
rodič
commit
2913830ff0

+ 1 - 1
src/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
-	app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa
+	app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jypkg v1.33.13
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21

+ 2 - 2
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-20250403014436-53740a2395aa h1:F45Yi0O0W7ezagpb4EWc57CGNoQ60HN3Ut7npO/sto4=
-app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa/go.mod h1:OEtMbsn7wY/7MLgV7yDUpVDKExUoj3B8h+4w4ZckJQQ=
+app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8 h1:RwTxiG+yf5cvB9pDQuwAyqg/JsR1waxWKdLMJVHD5mc=
+app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8/go.mod h1:OEtMbsn7wY/7MLgV7yDUpVDKExUoj3B8h+4w4ZckJQQ=
 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=

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

@@ -889,6 +889,7 @@ var bindUrl = "/front/account/phone/bind?mode=mergeBind"
 // 微信跳转创建session
 func (m *Front) Sess(ostr string) error {
 	defer util.Catch()
+	ostr = strings.TrimPrefix(l.Request.RequestURI, "/front/sess/")
 	if strings.Contains(ostr, "&") {
 		ostr = strings.Split(ostr, "&")[0]
 	}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 596 - 593
src/jfw/modules/app/src/app/front/login.go


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

@@ -3,7 +3,7 @@ module jy/src/jfw/modules/app/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa
+	app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jypkg v1.33.12
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb

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

@@ -17,8 +17,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-20250403014436-53740a2395aa h1:F45Yi0O0W7ezagpb4EWc57CGNoQ60HN3Ut7npO/sto4=
-app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa/go.mod h1:OEtMbsn7wY/7MLgV7yDUpVDKExUoj3B8h+4w4ZckJQQ=
+app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8 h1:RwTxiG+yf5cvB9pDQuwAyqg/JsR1waxWKdLMJVHD5mc=
+app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8/go.mod h1:OEtMbsn7wY/7MLgV7yDUpVDKExUoj3B8h+4w4ZckJQQ=
 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=

+ 1 - 0
src/jfw/modules/app/src/main.go

@@ -57,6 +57,7 @@ func initXweb() {
 	}
 	httpsession.Domain = util.ObjToString(Sysconfig["cookiedomain"])
 	xweb.Config.Profiler = true
+	xweb.AddConfig("keepOriginalUrl", "^/jyapp/front/sess/")
 	xweb.RootApp().AppConfig.TemplateDir = "web/templates"
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

+ 7 - 3
src/main.go

@@ -1,18 +1,21 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/jybase/fsw"
-	"app.yhyue.com/moapp/jylog"
-	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	_ "jy/src/jfw/active"
 	"jy/src/jfw/config"
 	. "jy/src/jfw/config"
 	_ "jy/src/jfw/site"
+
+	"app.yhyue.com/moapp/jybase/fsw"
+	"app.yhyue.com/moapp/jylog"
+	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
+
 	// _ "jy/src/jfw/modules/app/src/jfw/course"  线下课程 dev3.5.2 21年2.24 下线
 
 	_ "jy/src/jfw/filter"
 	"jy/src/jfw/front"
 	_ "jy/src/jfw/nodemgr"
+
 	//_ "jy/src/jfw/modules/app/src/jfw/pay"
 	"jy/src/jfw/qrmanager"
 	"jy/src/jfw/rpcfollow"
@@ -97,6 +100,7 @@ func initXweb() {
 	}
 	httpsession.Domain = util.ObjToString(Sysconfig["cookiedomain"])
 	xweb.Config.Profiler = true
+	xweb.AddConfig("keepOriginalUrl", "^/front/sess/")
 	xweb.RootApp().AppConfig.TemplateDir = "web/templates"
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov