manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2024-05-27 15:30:06 +08:00
parent 15947015f8
commit 5c09f28266
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java
View File

@@ -108,7 +108,7 @@ public class FrontController extends BaseController {
if (category.getHref().startsWith(request.getContextPath())) { if (category.getHref().startsWith(request.getContextPath())) {
category.setHref(category.getHref().replaceFirst(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())) { if (article.getHref().startsWith(request.getContextPath())) {
article.setHref(article.getHref().replaceFirst(request.getContextPath(), "")); article.setHref(article.getHref().replaceFirst(request.getContextPath(), ""));
} }
return "redirect:" + article.getHref(); return REDIRECT + article.getHref();
} }
model.addAttribute("article", article); model.addAttribute("article", article);

14
modules/core/src/main/java/com/jeesite/modules/sys/interceptor/MobileInterceptor.java
View File

@@ -4,15 +4,15 @@
*/ */
package com.jeesite.modules.sys.interceptor; package com.jeesite.modules.sys.interceptor;
import javax.servlet.http.HttpServletRequest; import com.jeesite.common.lang.StringUtils;
import javax.servlet.http.HttpServletResponse; import com.jeesite.common.service.BaseService;
import com.jeesite.common.web.BaseController;
import com.jeesite.common.web.http.UserAgentUtils;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.jeesite.common.lang.StringUtils; import javax.servlet.http.HttpServletRequest;
import com.jeesite.common.service.BaseService; import javax.servlet.http.HttpServletResponse;
import com.jeesite.common.web.http.UserAgentUtils;
/** /**
* 手机端视图拦截器 * 手机端视图拦截器
@@ -32,7 +32,7 @@ public class MobileInterceptor extends BaseService implements HandlerInterceptor
ModelAndView modelAndView) throws Exception { ModelAndView modelAndView) throws Exception {
if (modelAndView != null){ 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()); modelAndView.setViewName("mobile/" + modelAndView.getViewName());
} }
} }