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

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

@@ -190,19 +190,22 @@ public class ServletUtils {
} }
} }
HttpServletRequest request = getRequest(); HttpServletRequest request = getRequest();
String uri = request.getRequestURI(); if (request != null){
if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils String uri = request.getRequestURI();
.equalsIgnoreCase(request.getParameter("__ajax"), "xml")){ if (StringUtils.endsWithIgnoreCase(uri, ".xml") || StringUtils
return XmlMapper.toXml(resultMap); .equalsIgnoreCase(request.getParameter("__ajax"), "xml")){
}else{ return XmlMapper.toXml(resultMap);
String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return JsonMapper.toJsonp(functionName, resultMap);
}else{ }else{
return JsonMapper.toJson(resultMap); String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return JsonMapper.toJsonp(functionName, resultMap);
}else{
return JsonMapper.toJson(resultMap);
}
} }
}else{
return JsonMapper.toJson(resultMap);
} }
} }
/** /**