From 0a29bed4ad59c2faa486cf0d8705f31a79754893 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 27 May 2024 15:30:14 +0800 Subject: [PATCH] update --- .../com/jeesite/modules/cmsfront/web/FrontController.java | 4 ++-- .../jeesite/modules/sys/interceptor/MobileInterceptor.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java index 6a0330cf..b64388d2 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java @@ -108,7 +108,7 @@ public class FrontController extends BaseController { if (category.getHref().startsWith(request.getContextPath())) { category.setHref(category.getHref().replaceFirst(request.getContextPath(), "")); } - return "redirect:" + category.getHref(); + return REDIRECT + category.getHref(); } // 获取站点信息 @@ -269,7 +269,7 @@ public class FrontController extends BaseController { if (article.getHref().startsWith(request.getContextPath())) { article.setHref(article.getHref().replaceFirst(request.getContextPath(), "")); } - return "redirect:" + article.getHref(); + return REDIRECT + article.getHref(); } model.addAttribute("article", article); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java index c0906e16..96f43ae2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java @@ -4,6 +4,7 @@ */ package com.jeesite.modules.sys.interceptor; +import com.jeesite.common.web.BaseController; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -32,7 +33,7 @@ public class MobileInterceptor extends BaseService implements HandlerInterceptor ModelAndView modelAndView) throws Exception { if (modelAndView != null){ // 如果是手机或平板访问的话，则跳转到手机视图页面。 - if(UserAgentUtils.isMobileOrTablet(request) && !StringUtils.startsWithIgnoreCase(modelAndView.getViewName(), "redirect:")){ + if(UserAgentUtils.isMobileOrTablet(request) && !StringUtils.startsWithIgnoreCase(modelAndView.getViewName(), BaseController.REDIRECT)){ modelAndView.setViewName("mobile/" + modelAndView.getViewName()); } }