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

优化ServletUtils.renderResult

Browse Source
This commit is contained in:
thinkgem
2019-05-05 15:41:52 +08:00
parent c31259d5c8
commit 3c92f26684
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,6 +190,7 @@ public class ServletUtils {
} }
} }
HttpServletRequest request = getRequest(); HttpServletRequest request = getRequest();
if (request != null){
String uri = request.getRequestURI(); String uri = request.getRequestURI();
if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils
.equalsIgnoreCase(request.getParameter("__ajax"), "xml")){ .equalsIgnoreCase(request.getParameter("__ajax"), "xml")){
@@ -202,7 +203,9 @@ public class ServletUtils {
return JsonMapper.toJson(resultMap); return JsonMapper.toJson(resultMap);
} }
} }
}else{
return JsonMapper.toJson(resultMap);
}
} }
/** /**