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

__ajax=json 支持添加到 header 里面

Browse Source
This commit is contained in:
thinkgem
2020-05-21 12:16:05 +08:00
parent 18f1e939da
commit 7cc4372da7
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,12 +103,22 @@ public class ServletUtils {
public static boolean isAjaxRequest(HttpServletRequest request){ public static boolean isAjaxRequest(HttpServletRequest request){
String accept = request.getHeader("accept"); String accept = request.getHeader("accept");
if (accept != null && accept.indexOf(MediaType.APPLICATION_JSON_VALUE) != -1){ if (StringUtils.contains(accept, MediaType.APPLICATION_JSON_VALUE)){
return true; return true;
} }
String xRequestedWith = request.getHeader("X-Requested-With"); String xRequestedWith = request.getHeader("X-Requested-With");
if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1){ if (StringUtils.contains(xRequestedWith, "XMLHttpRequest")){
return true;
}
String ajaxHeader = request.getHeader("__ajax");
if (StringUtils.inStringIgnoreCase(ajaxHeader, "json", "xml")){
return true;
}
String ajaxParameter = request.getParameter("__ajax");
if (StringUtils.inStringIgnoreCase(ajaxParameter, "json", "xml")){
return true; return true;
} }
@@ -118,11 +128,6 @@ public class ServletUtils {
return true; return true;
} }
String ajax = request.getParameter("__ajax");
if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")){
return true;
}
return false; return false;
} }