wangshan 3 週間 前
コミット
70fefc2a07

+ 1 - 1
src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	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.28
+	app.yhyue.com/moapp/jypkg v1.33.29
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

+ 18 - 17
src/jfw/filter/cookie.go

@@ -1,29 +1,30 @@
 package filter
 
 import (
-    "app.yhyue.com/moapp/jybase/go-xweb/httpsession"
-    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-    "net/http"
-    "strings"
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	fx "app.yhyue.com/moapp/jypkg/filter/xweb"
+	"net/http"
+	"strings"
 )
 
 // CookieInfo 信息
 type CookieInfo struct {
-    W       http.ResponseWriter
-    R       *http.Request
-    IsLogin bool
-    Session *httpsession.Session
+	W       http.ResponseWriter
+	R       *http.Request
+	IsLogin bool
+	Session *httpsession.Session
 }
 
 // Do 继承过滤器方法
 func (ci *CookieInfo) Do() {
-    if crr := ci.R.Referer(); !ci.IsLogin && crr != "" {
-        if strings.Contains(crr, "cooperate") {
-            match := strings.Split(crr, "cooperate/")
-            if len(match) > 1 {
-                ci.Session.Set("RSource", match[1])
-                jy.SetCookieValue(ci.W, jy.ChannelCookieName, match[1], 7*24*60*60)
-            }
-        }
-    }
+	if crr := ci.R.Referer(); !ci.IsLogin && crr != "" {
+		if strings.Contains(crr, "cooperate") {
+			match := strings.Split(crr, "cooperate/")
+			if len(match) > 1 {
+				fx.SetVisitSource(ci.Session, match[1])
+				jy.SetCookieValue(ci.W, jy.ChannelCookieName, match[1], 7*24*60*60)
+			}
+		}
+	}
 }

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

@@ -52,7 +52,7 @@ func (m *Jyshare) Share(pid string) error {
 	}
 	source := m.GetString("source") //企业信用报告新增
 	if source != "" {
-		m.Session().Set("RSource", source)
+		fx.SetVisitSource(m.Session(), source)
 	}
 	//page_action  页面请求 GetLoginNum 函数,页面对应id,会有二维码不经过此函数,直接获取二维码。此时 page_action 没有值,后续可以把GetLoginNum 逻辑放在此处
 	go ErBindVisitInfo(pid, m.Session(), m.Request)

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

@@ -99,7 +99,7 @@ func (l *Login) Login() error {
 		sourceLabel := fx.GetVisitSource(l.Session()) //qutil.InterfaceToStr(l.Session().Get("RSource"))
 		if sourceLabel == "" && source != "" {
 			sourceLabel = source
-			l.Session().Set("RSource", source)
+			fx.SetVisitSource(l.Session(), source)
 		}
 		if reqType == "phoneLogin" { //手机号登录
 			phone := l.GetString("phone")

+ 2 - 1
src/jfw/front/material.go

@@ -3,6 +3,7 @@ package front
 import (
 	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	fx "app.yhyue.com/moapp/jypkg/filter/xweb"
 	"app.yhyue.com/moapp/jypkg/public"
 	"bytes"
 	"encoding/base64"
@@ -66,7 +67,7 @@ func (m *Material) LinkTransfer(mid, personChannel string) error {
 	if realUrl == "" && imgWebpage == "" {
 		return m.Redirect(util.InterfaceToStr(config.Sysconfig["webdomain"]))
 	}
-	m.SetSession("RSource", fmt.Sprintf("materials_%s", personChannel))
+	fx.SetVisitSource(m.Session(), fmt.Sprintf("materials_%s", personChannel))
 	//redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", m.Session().Id()), fmt.Sprintf("materials_%s", personChannel), 7 * 24 * 60 * 60) //登录注册 用户标识
 	addLog(sess, m.Request, mlid, types, personChannel, realUrl)
 

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

@@ -176,7 +176,7 @@ func (l *Login) Login() error {
 		sourceLabel := fx.GetVisitSource(l.Session()) //qutil.InterfaceToStr(l.Session().Get("RSource")) // redis.GetStr("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))
 		if sourceLabel == "" && activityCode != "" {
 			sourceLabel = activityCode
-			l.Session().Set("RSource", activityCode)
+			fx.SetVisitSource(l.Session(), activityCode)
 		}
 		if reqType == "phoneLogin" {
 			phone := l.GetString("phone")
@@ -941,7 +941,7 @@ func (l *Login) WxLogin() {
 				"s_rsource":  channelCode,
 				"s_reg_page": l.GetSession("appLoginReferer"), //注册页面
 			}
-			sourceLabel := qutil.InterfaceToStr(l.Session().Get("RSource")) //redis.GetStr("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))
+			sourceLabel := fx.GetVisitSource(l.Session()) //qutil.InterfaceToStr(l.Session().Get("RSource")) //redis.GetStr("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))
 			if sourceLabel != "" {
 				newUser["s_rsource"] = sourceLabel
 				channelCode = sourceLabel

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

@@ -5,7 +5,7 @@ go 1.20
 require (
 	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.28
+	app.yhyue.com/moapp/jypkg v1.33.29
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67

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

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250710095910-bbc834d8b6e8/go.mod h1:OEtMbsn7
 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=
-app.yhyue.com/moapp/jypkg v1.33.28 h1:ry+CARaF5JG7/NPF876smPMwzTRwY7Vr6crhe8Of8v4=
-app.yhyue.com/moapp/jypkg v1.33.28/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.29 h1:Lu116a0vl3kUdtqZiwFr/jfK+i7wFZk1b0zEOf3nTjI=
+app.yhyue.com/moapp/jypkg v1.33.29/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=