Explorar el Código

wangchuangjin

yuelujie hace 3 semanas
padre
commit
0fb1094b47

+ 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=

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1428 - 1310
src/jfw/front/front.go


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 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=

+ 64 - 63
src/jfw/modules/app/src/main.go

@@ -1,77 +1,78 @@
 package main
 
 import (
-	"jy/src/jfw/modules/app/src/app/active"
-	_ "jy/src/jfw/modules/app/src/app/active/pullnew"
-	_ "jy/src/jfw/modules/app/src/app/config"
-	_ "jy/src/jfw/modules/app/src/app/filter"
-	_ "jy/src/jfw/modules/app/src/app/followent"
-	_ "jy/src/jfw/modules/app/src/app/front"
-	_ "jy/src/jfw/modules/app/src/app/miniprogram"
-	"jy/src/jfw/modules/app/src/app/tag"
-	. "jy/src/jfw/modules/app/src/jfw/config"
-	_ "jy/src/jfw/modules/app/src/public"
-	"net/http"
-	"strings"
-	"time"
+    "jy/src/jfw/modules/app/src/app/active"
+    _ "jy/src/jfw/modules/app/src/app/active/pullnew"
+    _ "jy/src/jfw/modules/app/src/app/config"
+    _ "jy/src/jfw/modules/app/src/app/filter"
+    _ "jy/src/jfw/modules/app/src/app/followent"
+    _ "jy/src/jfw/modules/app/src/app/front"
+    _ "jy/src/jfw/modules/app/src/app/miniprogram"
+    "jy/src/jfw/modules/app/src/app/tag"
+    . "jy/src/jfw/modules/app/src/jfw/config"
+    _ "jy/src/jfw/modules/app/src/public"
+    "net/http"
+    "strings"
+    "time"
 
-	util "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/fsw"
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jylog" //日志文件
-	"app.yhyue.com/moapp/jypkg/public"
+    util "app.yhyue.com/moapp/jybase/common"
+    "app.yhyue.com/moapp/jybase/fsw"
+    "app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+    "app.yhyue.com/moapp/jybase/go-xweb/xweb"
+    "app.yhyue.com/moapp/jylog" //日志文件
+    "app.yhyue.com/moapp/jypkg/public"
 )
 
 func init() {
-	initXweb()
+    initXweb()
 }
 
 func main() {
-	//开启web
-	//限制全文检索查询
-	go public.InitLimitSearchText(true, Sysconfig)
-	//敏感词初始化
-	fsw.ReadFswDict()
-	active.Init()
-	//
-	mux1 := http.NewServeMux()
-	mux1.HandleFunc("/jyapp/res/", func(w http.ResponseWriter, r *http.Request) {
-		if strings.HasSuffix(r.URL.String(), ".apk") {
-			w.Header().Set("Content-Type", "application/vnd.android.package-archive")
-		}
-		if strings.HasSuffix(r.URL.String(), ".xlsx") {
-			w.Header().Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-		}
-		http.StripPrefix("/jyapp/res/", http.FileServer(http.Dir("web/staticres/jyapp/res"))).ServeHTTP(w, r)
-	})
-	xweb.RunBase(":"+Sysconfig["webport"].(string), mux1)
+    //开启web
+    //限制全文检索查询
+    go public.InitLimitSearchText(true, Sysconfig)
+    //敏感词初始化
+    fsw.ReadFswDict()
+    active.Init()
+    //
+    mux1 := http.NewServeMux()
+    mux1.HandleFunc("/jyapp/res/", func(w http.ResponseWriter, r *http.Request) {
+        if strings.HasSuffix(r.URL.String(), ".apk") {
+            w.Header().Set("Content-Type", "application/vnd.android.package-archive")
+        }
+        if strings.HasSuffix(r.URL.String(), ".xlsx") {
+            w.Header().Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+        }
+        http.StripPrefix("/jyapp/res/", http.FileServer(http.Dir("web/staticres/jyapp/res"))).ServeHTTP(w, r)
+    })
+    xweb.RunBase(":"+Sysconfig["webport"].(string), mux1)
 }
 
 func initXweb() {
-	//开启redissession
-	httpsession.IsRedisSessionStore = true
-	httpsession.RedisNotLoginKey = "userId"
-	if redisSessionLockSize := util.IntAll(Sysconfig["redisSessionLockSize"]); redisSessionLockSize > 0 {
-		httpsession.RedisSessionLockSize = redisSessionLockSize
-	}
-	httpsession.Domain = util.ObjToString(Sysconfig["cookiedomain"])
-	xweb.Config.Profiler = true
-	xweb.RootApp().AppConfig.TemplateDir = "web/templates"
-	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
-	xweb.RootApp().AppConfig.StaticFileVersion = false
-	xweb.RootApp().AppConfig.CheckXsrf = false
-	xweb.RootApp().AppConfig.EnableHttpCache = false
-	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().SetConfig("schecm", Sysconfig["agreement"])
-	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
-	xweb.RootApp().AppConfig.CacheTemplates = Sysconfig["cacheflag"].(bool)
-	xweb.RootApp().AddTmplVar("Msg", tag.Msg)
-	xweb.RootApp().AddTmplVar("Cdns", tag.Cdns)
-	xweb.RootApp().AddTmplVar("Export", tag.Export)
-	xweb.RootApp().AddTmplVar("Ad", tag.Ad)
-	xweb.RootApp().AddTmplVar("SafeUrl", tag.SafeUrl)
-	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
-	xweb.RootApp().Logger.SetOutput(jylog.GetWriter())
+    //开启redissession
+    httpsession.IsRedisSessionStore = true
+    httpsession.RedisNotLoginKey = "userId"
+    if redisSessionLockSize := util.IntAll(Sysconfig["redisSessionLockSize"]); redisSessionLockSize > 0 {
+        httpsession.RedisSessionLockSize = redisSessionLockSize
+    }
+    httpsession.Domain = util.ObjToString(Sysconfig["cookiedomain"])
+    xweb.Config.Profiler = true
+    xweb.AddConfig("keepOriginalUrl", "^/jyapp/free/sess/")
+    xweb.RootApp().AppConfig.TemplateDir = "web/templates"
+    xweb.RootApp().AppConfig.StaticDir = "web/staticres"
+    xweb.RootApp().AppConfig.StaticFileVersion = false
+    xweb.RootApp().AppConfig.CheckXsrf = false
+    xweb.RootApp().AppConfig.EnableHttpCache = false
+    xweb.RootApp().AppConfig.Mode = xweb.Product
+    xweb.RootApp().SetConfig("schecm", Sysconfig["agreement"])
+    xweb.RootApp().AppConfig.ReloadTemplates = true
+    xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+    xweb.RootApp().AppConfig.CacheTemplates = Sysconfig["cacheflag"].(bool)
+    xweb.RootApp().AddTmplVar("Msg", tag.Msg)
+    xweb.RootApp().AddTmplVar("Cdns", tag.Cdns)
+    xweb.RootApp().AddTmplVar("Export", tag.Export)
+    xweb.RootApp().AddTmplVar("Ad", tag.Ad)
+    xweb.RootApp().AddTmplVar("SafeUrl", tag.SafeUrl)
+    xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
+    xweb.RootApp().Logger.SetOutput(jylog.GetWriter())
 }

+ 2 - 0
src/main.go

@@ -13,6 +13,7 @@ import (
 	_ "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 +98,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

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio