Merge branch 'dev/v4.8.83_dx' of qmx/jy into feature/v4.8.83

src/jfw/front/shorturl.go

@@ -1217,19 +1217,6 @@ func (s *Short) NologinArticle(stype, id string) error {
 	}
 
 	if userId != "" { //已登录用户直接跳转至正常三级页
-		if stype == "content" && !mobileReg.MatchString(s.Header("User-Agent")) {
-			if !strings.Contains(s.Request.URL.String(), "aside") && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
-				paramSuffix := ".html?aside=0"
-				replaceStr := ".html"
-				if strings.Contains(s.Request.URL.String(), "?") {
-					replaceStr = ".html?"
-					paramSuffix = ".html?aside=0&"
-				}
-				//p415 首页改版 三级页登录跳转第一版修改
-				urlStr := strings.ReplaceAll(s.Request.URL.String(), "nologin", "article")
-				return s.Redirect(strings.Replace(urlStr, replaceStr, paramSuffix, 1), 302)
-			}
-		}
 		return s.LoginCommon(sess, stype, id, mobileReg.MatchString(s.Header("User-Agent"))) //是否是移动端
 	}
 	if detailNeedMosaic == nil {