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

增加日期快速选择示例，详见操作日志查询功能。

Browse Source
This commit is contained in:
thinkgem
2020-04-05 15:00:36 +08:00
parent 06c6f278ba
commit 82c0fa0620
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ public class ServletUtils {
return XmlMapper.toXml(resultMap);
}else{
if (response != null){
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE+";charset=UTF-8");
}
if (ObjectUtils.toBoolean(PropertiesUtils.getInstance().getProperty("web.jsonp.enabled"))) {
String functionName = request.getParameter("__callback");
@@ -225,7 +225,7 @@ public class ServletUtils {
}
}else{
if (response != null){
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE+";charset=UTF-8");
}
return JsonMapper.toJson(resultMap);
}
@@ -300,7 +300,7 @@ public class ServletUtils {
if (type == null && StringUtils.isBlank(response.getContentType())){
if ((StringUtils.startsWith(string, "{") && StringUtils.endsWith(string, "}"))
|| (StringUtils.startsWith(string, "[") && StringUtils.endsWith(string, "]"))){
type = MediaType.APPLICATION_JSON_VALUE;
type = MediaType.APPLICATION_JSON_VALUE+";charset=UTF-8";
}else if (StringUtils.startsWith(string, "<") && StringUtils.endsWith(string, ">")){
if (StringUtils.startsWith(string, "<!DOCTYPE")){
type = MediaType.TEXT_HTML_VALUE+";charset=UTF-8";