From 82c0fa06200f007c8d851beeff525b91bd2d9be6 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 5 Apr 2020 15:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E9=80=89=E6=8B=A9=E7=A4=BA=E4=BE=8B=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E8=A7=81=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/web/http/ServletUtils.java     |  6 +++---
 .../src/main/resources/views/modules/sys/logList.html | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
index f9277f17..b3d76c64 100644
--- a/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
+++ b/common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
@@ -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";
diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html
index a229970a..c6b8f9f0 100644
--- a/modules/core/src/main/resources/views/modules/sys/logList.html
+++ b/modules/core/src/main/resources/views/modules/sys/logList.html
@@ -26,7 +26,7 @@
 				</div>
 				<div class="form-group">
 					<label class="control-label">日志类型：</label>
-					<div class="control-inline width-90">
+					<div class="control-inline Wdate-date nobg">
 						<#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
 					</div>
 				</div>
@@ -61,11 +61,16 @@
 					<label class="control-label">操作时间：</label>
 					<div class="control-inline">
 						<#form:input path="createDate_gte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
-							dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,onpicked:function(){createDate_lte.click()}});"/>
-						&nbsp;--&nbsp;
+							dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,onpicked:function(){createDate_lte.click()}});"/> -
 						<#form:input path="createDate_lte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
 							dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 					</div>
+					<div class="control-inline" style="width:75px;">
+						<select onchange="js.quickSelectDate(this.value, 'createDate_gte', 'createDate_lte');" class="form-control">
+							<option value="0">常用</option><option value="1">今日</option><option value="2">本周</option>
+							<option value="3">本月</option><option value="4">本季度</option><option value="5">上月</option>
+						</select>
+					</div>
 				</div>
 				<div class="form-group">
 					<label class="control-label">客户端IP：</label>