Merge branch 'feature/v4.8.81_ws' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.8.81_ws

src/jfw/active/active.go

@@ -55,7 +55,7 @@ func init() {
 	xweb.AddAction(&Active{})
 }
 
-//测试首页
+// 测试首页
 func (a *Active) TransitRoute(key string) error {
 	redirectUrl := "/"
 	if key != "" {
@@ -63,11 +63,11 @@ func (a *Active) TransitRoute(key string) error {
 		if shortUrls != nil && len(*shortUrls) > 0 {
 			shortUrl := (*shortUrls)[0]
 			//登录用户跳转地址
-			if util.ObjToString(shortUrl["url"]) != "" {
+			if util.ObjToString(a.GetSession("userId")) != "" && util.ObjToString(shortUrl["url"]) != "" {
 				redirectUrl = util.ObjToString(shortUrl["url"])
 			}
 			//未登录用户跳转地址
-			if util.ObjToString(shortUrl["href"]) != "" && util.ObjToString(a.GetSession("userId")) == "" {
+			if util.ObjToString(a.GetSession("userId")) == "" && util.ObjToString(shortUrl["href"]) != "" {
 				redirectUrl = util.ObjToString(shortUrl["href"])
 			}
 		}

src/jfw/front/shorturl.go

@@ -139,6 +139,7 @@ func (s *Short) Article(stype, id string) error {
 }
 
 func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bool) error {
+	log.Println(stype, "----stype:---", id)
 	//电脑端 剑鱼快照页面访问
 	if stype == "content" && !bm {
 		//工作桌面内嵌 快照页
@@ -221,7 +222,8 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 	} else if stype == "entservice" { //大客户数据快照展示
 		//se := util.SimpleEncrypt{"entservice"}
 		sid := encrypt.SE3.DecodeString(id)
-		if userId == "" || len(sid) == 0 || (len(sid) > 0 && sid == "") { //未登录用户没有权限访问
+		log.Println("----sid:---", sid)
+		if len(sid) == 0 || (len(sid) > 0 && sid == "") { //未登录用户没有权限访问---userId == "" ||   未登录可以访问来自陈 11.29
 			s.Redirect("/notin/page", 302)
 			return nil
 		}

src/phoneFilter.json

@@ -22,8 +22,9 @@
     "^/weixin/(\\w+)/paySuccess",
     "^/stl/exhibitionActive",
     "^/swordfish/SingleLogin",
-    "^/weixin/frontPage/bigmember/free/perfect_info_exhibition",
-    "^/orgstructure/invaction/(.*)"
+    "^/weixin/frontPage/bigmember/free/perfect_info_*",
+    "^/orgstructure/invaction/(.*)",
+    "^/active/transit/(.*)"
 	],
 	"sessUrl":{
 		"/jyTreasureBox/treasureBox":"",