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

增加ctxPath参数，当映射根路径不同的时候使用

Browse Source
This commit is contained in:
thinkgem
2024-05-28 14:38:49 +08:00
parent 0a29bed4ad
commit cc0794c3fc
15 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/jeesite/common/web/CookieUtils.java
View File

@@ -7,7 +7,6 @@ package com.jeesite.common.web;
import com.jeesite.common.codec.EncodeUtils;
import com.jeesite.common.io.PropertiesUtils;
import com.jeesite.common.lang.StringUtils;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -96,7 +95,8 @@ public class CookieUtils {
* @return 值
*/
public static String getCookie(HttpServletRequest request, HttpServletResponse response, String name, boolean isRemove) {
return getCookie(request, response, name, request != null ? request.getContextPath() : "", false);
String ctxPath = PropertiesUtils.getInstance().getProperty("ctxPath", request != null ? request.getContextPath() : StringUtils.EMPTY);
return getCookie(request, response, name, ctxPath, isRemove);
}
/**

11
common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
View File

@@ -12,14 +12,14 @@ import com.jeesite.common.lang.ExceptionUtils;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.mapper.JsonMapper;
import com.jeesite.common.mapper.XmlMapper;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.Validate;
import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.Map.Entry;
@@ -56,7 +56,7 @@ public class ServletUtils {
// 是否打印错误信息参数到视图页面（生产环境关闭）
private static final Boolean PRINT_ERROR_INFO = PROPS.getPropertyToBoolean("error.page.printErrorInfo", "true");
/**
* 获取当前请求对象
* web.xml: <listener><listener-class>
@@ -106,7 +106,8 @@ public class ServletUtils {
if (StringUtils.contains(url, "://")){
response.sendRedirect(url);
}else{
response.sendRedirect(request.getContextPath() + url);
String ctxPath = PropertiesUtils.getInstance().getProperty("ctxPath", request.getContextPath());
response.sendRedirect(ctxPath + url);
}
}
} catch (Exception e) {