Revert "feat:session 缓存时间"

This reverts commit a6955acd9c398e3a88c66df90a885caf15cebf22.

src/config.json

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

src/jfw/modules/app/src/config.json

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

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 = time.Hour * time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 24))
+	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)

src/jfw/modules/bidfileinter/src/config.json

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

src/jfw/modules/bidfileinter/src/service/a/init.go

@@ -1,8 +1,6 @@
 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"
@@ -16,7 +14,7 @@ func init() {
 	xweb.RootApp().AppConfig.CheckXsrf = false
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(Sysconfig.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().BasePath = "/bidfileinter"

src/jfw/modules/bidfileinter/src/service/config/config.go

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

src/jfw/modules/bigmember/src/a/init.go

@@ -1,8 +1,6 @@
 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"
@@ -20,6 +18,6 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 }

src/jfw/modules/bigmember/src/config.json

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

src/jfw/modules/bigmember/src/config/config.go

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

src/jfw/modules/datareport/src/a/init.go

@@ -1,8 +1,6 @@
 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"
 
@@ -19,7 +17,7 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 
 	xweb.AddRouter("/datareport/api", &service.NewDataReport{})

src/jfw/modules/datareport/src/config.json

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

src/jfw/modules/datareport/src/config/config.go

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

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-20230110071808-0c8ff7f798c6 h1:Szt9G37MxAN5xJXGGS87EtMdIKoucilK5inP3zRLUIE=
-app.yhyue.com/moapp/jybase v0.0.0-20230110071808-0c8ff7f798c6/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
+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=
 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=

src/jfw/modules/distribution/src/config.json

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

src/jfw/modules/distribution/src/service/a/init.go

@@ -1,8 +1,6 @@
 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"
@@ -16,7 +14,7 @@ func init() {
 	xweb.RootApp().AppConfig.CheckXsrf = false
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Sysconfig.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().BasePath = "/distribution"

src/jfw/modules/distribution/src/service/config/config.go

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

src/jfw/modules/publicapply/src/a/init.go

@@ -1,8 +1,6 @@
 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"
@@ -12,7 +10,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
@@ -20,6 +18,6 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 }

src/jfw/modules/publicapply/src/config.json

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

src/jfw/modules/publicapply/src/config/config.go

@@ -1,73 +1,72 @@
 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
-	SessionTimeout int
+    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
 }
 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() {

src/jfw/modules/subscribepay/src/a/init.go

@@ -1,9 +1,7 @@
 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"
@@ -23,7 +21,7 @@ func init() {
 	xweb.RootApp().AppConfig.EnableHttpCache = false
 	xweb.RootApp().AppConfig.Mode = xweb.Product
 	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(config.Config.SessionTimeout, 24))
+	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1) //输出日志,改为4则不输出任何日志
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
 	xweb.RootApp().AppConfig.TemplateDir = "web/templates"

src/jfw/modules/subscribepay/src/config.json

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

src/jfw/modules/subscribepay/src/config/config.go

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