Merge branch 'release' into dev4.5.9.10

src/jfw/filter/pcfilter.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/jyutil"
+	"jfw/public"
 	"net/http"
 	"qfw/util"
 	"qfw/util/redis"
@@ -28,7 +29,7 @@ func (this *pcFilter) Do() bool {
 	if this.R.Method == "POST" {
 		return true
 	}
-	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) {
+	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) || public.CheckWxBrowser(this.R) {
 		//wx
 		return true
 	}

src/main.go

@@ -103,7 +103,6 @@ func initXweb() {
 	xweb.RootApp().SetConfig("schecm", Sysconfig["agreement"])
 	xweb.RootApp().AppConfig.ReloadTemplates = true
 	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 168))
-	log.Println("~~~", time.Hour*time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 168)))
 	xweb.RootApp().AppConfig.CacheTemplates = Sysconfig["cacheflag"].(bool)
 	xweb.RootApp().AddTmplVar("Msg", tag.Msg)
 	xweb.RootApp().AddTmplVar("Ad", tag.Ad)