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

feat:session 缓存时间

wangshan 2 жил өмнө
parent
commit
a6955acd9c

+ 2 - 2
src/config.json

@@ -323,9 +323,9 @@
   "optimalTime": "2021-08-03 12:00:00",
   "pcFilterFlag": true,
   "pcSessionFlag": true,
-  "sessionTimeout": 24,
+  "sessionTimeout": 2,
   "pcSessionTimeout": 168,
-  "setSessionTimeout": 720,
+  "setSessionTimeout": 3,
   "shareRedisName": "other",
   "wxWebdomain": "https://web-ws.jydev.jianyu360.com",
   "wxOrgUrl": "/page_entbase_mobile/page/invite/inviting.html",

+ 2 - 1
src/jfw/modules/app/src/config.json

@@ -216,5 +216,6 @@
     "expurasingtime":true,
     "winnerMap":true
   },
-  "keepShowRedSpot": true
+  "keepShowRedSpot": true,
+  "sessionTimeout": 2
 }

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

@@ -64,7 +64,7 @@ func initXweb() {
 	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.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 24))
 	xweb.RootApp().AppConfig.CacheTemplates = Sysconfig["cacheflag"].(bool)
 	xweb.RootApp().AddTmplVar("Msg", tag.Msg)
 	xweb.RootApp().AddTmplVar("Cdns", tag.Cdns)

+ 2 - 1
src/jfw/modules/bidfileinter/src/config.json

@@ -76,5 +76,6 @@
   "appids": {
     "jianyu": "10000"
   },
-  "pointCount": 500
+  "pointCount": 500,
+  "sessionTimeout": 2
 }

+ 3 - 1
src/jfw/modules/bidfileinter/src/service/a/init.go

@@ -1,6 +1,8 @@
 package init
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
+	. "jy/src/jfw/modules/bidfileinter/src/service/config"
 	"time"
 
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
@@ -14,7 +16,7 @@ func init() {
 	xweb.RootApp().AppConfig.CheckXsrf = false
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(Sysconfig.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().BasePath = "/bidfileinter"

+ 1 - 0
src/jfw/modules/bidfileinter/src/service/config/config.go

@@ -48,6 +48,7 @@ type config struct {
 	IntegralUrl       map[string]interface{}
 	Appids            map[string]interface{}
 	PointCount        int
+	SessionTimeout    int
 }
 
 type mgoConf struct {

+ 3 - 1
src/jfw/modules/bigmember/src/a/init.go

@@ -1,6 +1,8 @@
 package a
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
+	"jy/src/jfw/modules/bigmember/src/config"
 	"time"
 
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
@@ -18,6 +20,6 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 }

+ 2 - 1
src/jfw/modules/bigmember/src/config.json

@@ -181,5 +181,6 @@
     "listPage": "https://databi-web.jydev.jianyu360.com/nzj/app/nzj.app/nzj_claim.spg"
   },
   "contextOldVipLimit": 1664553600,
-  "potentialCount": 1000
+  "potentialCount": 1000,
+  "sessionTimeout": 2
 }

+ 2 - 1
src/jfw/modules/bigmember/src/config/config.go

@@ -66,7 +66,8 @@ type config struct {
 		ListPage string `json:"listPage"`
 	} `json:"claim"`
 	ContextOldVipLimit int64 `json:"contextOldVipLimit"` //超级订阅部分用户:--- 超前项目权限
-	PotentialCount     int   `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量
+	PotentialCount     int   `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量,
+	SessionTimeout     int   `json:"sessionTimeout"`     //用户信息session缓存数据 单位小时
 }
 
 type CustomerInfo struct {

+ 3 - 1
src/jfw/modules/datareport/src/a/init.go

@@ -1,6 +1,8 @@
 package initxweb
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
+	"jy/src/jfw/modules/datareport/src/config"
 	"jy/src/jfw/modules/datareport/src/service"
 	"time"
 
@@ -17,7 +19,7 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 
 	xweb.AddRouter("/datareport/api", &service.NewDataReport{})

+ 3 - 2
src/jfw/modules/datareport/src/config.json

@@ -28,5 +28,6 @@
     }
   ],
   "orderTimeoutHours": 72,
-  "termValidity": 60
-}
+  "termValidity": 60,
+  "sessionTimeout": 2
+}

+ 2 - 1
src/jfw/modules/datareport/src/config/config.go

@@ -27,7 +27,8 @@ type config struct {
 		User string
 	}
 	OrderTimeoutHours int
-	TermValidity int
+	TermValidity      int
+	SessionTimeout    int
 }
 
 var Config *config

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

@@ -1,6 +1,6 @@
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
-app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170 h1:gjx6+x7P1Vp/++OyfuEdR3Bcjj4/HrgIaRnE1cMTP3k=
-app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170/go.mod h1:efAeRPDpJ13JuNODuqtfLlKQSQgCbnUcwGPzhFU5krY=
+app.yhyue.com/moapp/jybase v0.0.0-20230110071808-0c8ff7f798c6 h1:Szt9G37MxAN5xJXGGS87EtMdIKoucilK5inP3zRLUIE=
+app.yhyue.com/moapp/jybase v0.0.0-20230110071808-0c8ff7f798c6/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 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.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

+ 2 - 1
src/jfw/modules/distribution/src/config.json

@@ -107,5 +107,6 @@
   "regurl": [
     "^distribution/share/shareLink$"
   ],
-  "smsServiceRpc": "127.0.0.1:932"
+  "smsServiceRpc": "127.0.0.1:932",
+  "sessionTimeout": 2
 }

+ 3 - 1
src/jfw/modules/distribution/src/service/a/init.go

@@ -1,6 +1,8 @@
 package init
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
+	"jy/src/jfw/modules/distribution/src/service/config"
 	"time"
 
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
@@ -14,7 +16,7 @@ func init() {
 	xweb.RootApp().AppConfig.CheckXsrf = false
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Sysconfig.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().BasePath = "/distribution"

+ 1 - 0
src/jfw/modules/distribution/src/service/config/config.go

@@ -49,6 +49,7 @@ type config struct {
 	AccountMergeOnline string
 	Regurl             []string
 	SmsServiceRpc      string
+	SessionTimeout     int
 }
 
 type BalanceRes struct {

+ 4 - 2
src/jfw/modules/publicapply/src/a/init.go

@@ -1,6 +1,8 @@
 package a
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
+	"jy/src/jfw/modules/publicapply/src/config"
 	"time"
 
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
@@ -10,7 +12,7 @@ import (
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
-	httpsession.RedisNotLoginKey  = "userId"
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	xweb.RootApp().BasePath = "/publicapply"
 	xweb.RootApp().AppConfig.StaticFileVersion = false
@@ -18,6 +20,6 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 }

+ 2 - 1
src/jfw/modules/publicapply/src/config.json

@@ -54,5 +54,6 @@
   },
   "tipInfo": {
     "box_moving": 1670774400
-  }
+  },
+  "sessionTimeout": 2
 }

+ 53 - 52
src/jfw/modules/publicapply/src/config/config.go

@@ -1,72 +1,73 @@
 package config
 
 import (
-    qutil "app.yhyue.com/moapp/jybase/common"
-    "app.yhyue.com/moapp/jypkg/compatible"
-    "app.yhyue.com/moapp/jypkg/middleground"
-    "github.com/gogf/gf/v2/frame/g"
-    "github.com/gogf/gf/v2/os/gcfg"
-    "github.com/gogf/gf/v2/os/gctx"
+	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jypkg/compatible"
+	"app.yhyue.com/moapp/jypkg/middleground"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcfg"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 type config struct {
-    WebPort string
-    Mail    []struct {
-        Addr string
-        Port int
-        Pwd  string
-        User string
-    }
-    Industry              string
-    Frequency             string
-    HotWords              []string
-    DefaultEntList        []string //企业查询默认展示企业
-    BidSearchOldUserLimit int64
-    File_number           int
-    AttachmentRPC         string
-    FollowPushRpc         string
-    SmsServiceRpc         string
-    FileSignBool          bool
-    FollowCustomer        struct {
-        CustomerNumb   int
-        EnterpriseNumb int
-    }
-    ExhibitionLog string
-    TipInfo       map[string]int64
+	WebPort string
+	Mail    []struct {
+		Addr string
+		Port int
+		Pwd  string
+		User string
+	}
+	Industry              string
+	Frequency             string
+	HotWords              []string
+	DefaultEntList        []string //企业查询默认展示企业
+	BidSearchOldUserLimit int64
+	File_number           int
+	AttachmentRPC         string
+	FollowPushRpc         string
+	SmsServiceRpc         string
+	FileSignBool          bool
+	FollowCustomer        struct {
+		CustomerNumb   int
+		EnterpriseNumb int
+	}
+	ExhibitionLog  string
+	TipInfo        map[string]int64
+	SessionTimeout int
 }
 type BidColl struct {
-    PayUserCollLimit      int    //付费用户收藏数量最大限制
-    FreeUserCollLimit     int    //免费用户收藏数量最大限制
-    Pagesize              int    //付费用户收藏列表每页展示数量
-    FreePageSize          int    //免费用户收藏列表展示数量
-    LabelMaxCount         int    //标签数量最大限制
-    CollRedisDb           string //收藏的bid redis key
-    IsCollRedisTime       int    //是否收藏redis过期时间
-    CollListRedisTime     int    //收藏列表redis过期时间
-    CollListRedisMaxCount int    //收藏列表redis最大条数限制
+	PayUserCollLimit      int    //付费用户收藏数量最大限制
+	FreeUserCollLimit     int    //免费用户收藏数量最大限制
+	Pagesize              int    //付费用户收藏列表每页展示数量
+	FreePageSize          int    //免费用户收藏列表展示数量
+	LabelMaxCount         int    //标签数量最大限制
+	CollRedisDb           string //收藏的bid redis key
+	IsCollRedisTime       int    //是否收藏redis过期时间
+	CollListRedisTime     int    //收藏列表redis过期时间
+	CollListRedisMaxCount int    //收藏列表redis最大条数限制
 }
 
 type AdLeague struct {
-    Exposure string //广告曝光记录接口
-    Click    string //点击接口
+	Exposure string //广告曝光记录接口
+	Click    string //点击接口
 }
 
 type ShareF struct {
-    JobNum     int
-    WorkerNum  int
-    ShareRedis string
-    Webdomain  string
-    SaveTime   int
-    MayActive  string //活动标识
+	JobNum     int
+	WorkerNum  int
+	ShareRedis string
+	Webdomain  string
+	SaveTime   int
+	MayActive  string //活动标识
 }
 
 var (
-    Config        *config
-    BidCollConfig *BidColl
-    AdLeaguefig   *AdLeague
-    ShareConfig   *ShareF
-    Middleground  *middleground.Middleground
-    Compatible    *compatible.Compatible
+	Config        *config
+	BidCollConfig *BidColl
+	AdLeaguefig   *AdLeague
+	ShareConfig   *ShareF
+	Middleground  *middleground.Middleground
+	Compatible    *compatible.Compatible
 )
 
 func init() {

+ 3 - 1
src/jfw/modules/subscribepay/src/a/init.go

@@ -1,7 +1,9 @@
 package initxweb
 
 import (
+	util "app.yhyue.com/moapp/jybase/common"
 	"jy/src/jfw/modules/subscribepay/src/active"
+	"jy/src/jfw/modules/subscribepay/src/config"
 	"jy/src/jfw/modules/subscribepay/src/report"
 	"jy/src/jfw/modules/subscribepay/src/service"
 	"time"
@@ -21,7 +23,7 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
+	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().AppConfig.TemplateDir = "web/templates"

+ 2 - 1
src/jfw/modules/subscribepay/src/config.json

@@ -154,5 +154,6 @@
     "etcd": {
     	"hosts": "192.168.3.149:2379",
     	"key": "powercheck.rpc"
-    }
+    },
+  "sessionTimeout": 2
 }

+ 1 - 0
src/jfw/modules/subscribepay/src/config/config.go

@@ -113,6 +113,7 @@ type config struct {
 	}
 	KeywordsLimit     int
 	BreakRenewTipTime string
+	SessionTimeout    int
 }
 type mgoConf struct {
 	Address           string