From 5b9c2c792d9b00becd0d369100ac54997aa306d2 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui>
Date: Fri, 18 Jan 2019 18:46:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E6=B5=8B=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=83=BD=E9=80=89=E5=8F=96=E4=B8=80=E5=91=A8?=
 =?UTF-8?q?=E5=86=85=E6=97=B6=E9=97=B4=202.=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B8=85=E9=99=A4=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gloam/WebRoot/detection/chart-cpudisk.html           |  2 +-
 gloam/WebRoot/detection/chart-mem.html               |  2 +-
 gloam/WebRoot/detection/chart-net.html               |  2 +-
 .../detection/detectionInfoNew-setDetail.html        |  2 +-
 gloam/src/com/nis/gloam/task/LogTimerTask.java       | 12 ++++++++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gloam/WebRoot/detection/chart-cpudisk.html b/gloam/WebRoot/detection/chart-cpudisk.html
index 38c3be1..c2bef9e 100644
--- a/gloam/WebRoot/detection/chart-cpudisk.html
+++ b/gloam/WebRoot/detection/chart-cpudisk.html
@@ -188,7 +188,7 @@ function createChart() {
 	<input type="hidden" name="titleId" value="#(titleId)"/>
 	<div style="margin:10px 0 10px 15px; position:relative;">
 		<label class="bar">#(_res.get("startTime"))</label>
-		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
+		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
 		<label class="bar">#(_res.get("endTime"))</label>
 		<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
 		<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">
diff --git a/gloam/WebRoot/detection/chart-mem.html b/gloam/WebRoot/detection/chart-mem.html
index 0bf7fbf..11b46aa 100644
--- a/gloam/WebRoot/detection/chart-mem.html
+++ b/gloam/WebRoot/detection/chart-mem.html
@@ -169,7 +169,7 @@ function createChart() {
 	<input type="hidden" name="titleId" value="#(titleId)"/>
 	<div style="margin:10px 0 10px 15px; position:relative;">
 		<label class="bar">#(_res.get("startTime"))</label>
-		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\',lang:'#(_locale)'}'})">&nbsp;
+		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
 		<label class="bar">#(_res.get("endTime"))</label>
 		<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
 		<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">
diff --git a/gloam/WebRoot/detection/chart-net.html b/gloam/WebRoot/detection/chart-net.html
index 73d90c5..d0ae094 100644
--- a/gloam/WebRoot/detection/chart-net.html
+++ b/gloam/WebRoot/detection/chart-net.html
@@ -176,7 +176,7 @@ function createChart() {
 	<input type="hidden" name="titleId" value="#(titleId)"/>
 	<div style="margin:10px 0 10px 15px; position:relative;">
 		<label class="bar">#(_res.get("startTime"))</label>
-		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
+		<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
 		<label class="bar">#(_res.get("endTime"))</label>
 		<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
 		<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">
diff --git a/gloam/WebRoot/detection/detectionInfoNew-setDetail.html b/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
index a3573d3..9441563 100644
--- a/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
+++ b/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
@@ -83,7 +83,7 @@ function mydown(obj) {
 							<div style="margin:0 0 10px 15px; position:relative;">
 								<form id="my-form" action="">
 									<label class="bar">#(_res.get("startTime"))</label>
-									<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
+									<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
 									<label class="bar">#(_res.get("endTime"))</label>
 									<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
 									<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">
diff --git a/gloam/src/com/nis/gloam/task/LogTimerTask.java b/gloam/src/com/nis/gloam/task/LogTimerTask.java
index 8a97dd4..721e28d 100644
--- a/gloam/src/com/nis/gloam/task/LogTimerTask.java
+++ b/gloam/src/com/nis/gloam/task/LogTimerTask.java
@@ -24,9 +24,15 @@ public class LogTimerTask extends TimerTask {
 	}
 	@Override
 	public void run() {
+		int date = 7;//默认七天
+		try {
+			PropKit.use("config.properties");
+			date=Integer.parseInt(PropKit.get("delete_logtime"));
+		} catch (Exception e) {
+			logger.info("获取时间配置失败！使用默认时间："+date);
+		}
+		
 		try {
-		PropKit.use("config.properties");
-		int date = Integer.parseInt(PropKit.get("delete_logtime"));
 		String[] clearTables=PropKit.get("detect_info_clear").split(",");
 		logger.info("clearTables-->"+Arrays.toString(clearTables));
 		Calendar calendar=new GregorianCalendar();
@@ -52,11 +58,13 @@ public class LogTimerTask extends TimerTask {
 		restart(date);
 		} catch (Exception e) {
 			logger.error("监测表清理失败！",e);
+			restart(date);
 		}
 	}
 	//定时删除日志 一周清除一次一周前的日志 可修改配置文件来设定日志保存天数
 	public void restart(int day){
 		timer.schedule(new LogTimerTask(timer), day*24*3600*1000);
+		logger.info("数据清除任务重启完成！");
 	}
 	
 }