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

新增 web.jsonp.enabled 参数，默认不开启

Browse Source
This commit is contained in:
thinkgem
2020-02-29 18:53:43 +08:00
parent 12ea728671
commit d6b851a616
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,12 +215,13 @@ public class ServletUtils {
if (response != null){
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
}
String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return JsonMapper.toJsonp(functionName, resultMap);
}else{
return JsonMapper.toJson(resultMap);
if (ObjectUtils.toBoolean(PropertiesUtils.getInstance().getProperty("web.jsonp.enabled"))) {
String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return JsonMapper.toJsonp(functionName, resultMap);
}
}
return JsonMapper.toJson(resultMap);
}
}else{
if (response != null){
@@ -267,12 +268,13 @@ public class ServletUtils {
.equalsIgnoreCase(request.getParameter("__ajax"), "xml")){
return renderString(response, XmlMapper.toXml(object));
}else{
String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return renderString(response, JsonMapper.toJsonp(functionName, object));
}else{
return renderString(response, JsonMapper.toJson(object));
if (ObjectUtils.toBoolean(PropertiesUtils.getInstance().getProperty("web.jsonp.enabled"))) {
String functionName = request.getParameter("__callback");
if (StringUtils.isNotBlank(functionName)){
return renderString(response, JsonMapper.toJsonp(functionName, object));
}
}
return renderString(response, JsonMapper.toJson(object));
}
}