modify the cat history bug

cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportPayload.java

@@ -148,10 +148,15 @@ public abstract class AbstractReportPayload<A extends Action> implements ActionP
 		} else {
 			temp = m_date + (ONE_HOUR * 24);
 		}
-		cal.setTimeInMillis(temp -1000);
+		cal.setTimeInMillis(temp);
 		return cal.getTime();
 	}
-	
+
+	public Date getHistoryDisplayEndDate() {
+		Date date = getHistoryEndDate();
+		return new Date(date.getTime() - 1000);
+	}
+
 	public Date getHistoryStartDate() {
 		if (m_customStart != null) {
 			try {
@@ -161,7 +166,7 @@ public abstract class AbstractReportPayload<A extends Action> implements ActionP
 		}
 		return new Date(m_date);
 	}
-	
+
 	public String getIpAddress() {
 		return m_ipAddress;
 	}

cat-home/src/main/webapp/css/body.css

@@ -125,6 +125,10 @@ a.long-sql {
 	background-color: #6699CC;
 }
 
+a.long-service {
+	background-color: #7799FF;
+}
+
 a.url {
 	background-color: #cc0000;
 }

cat-home/src/main/webapp/jsp/report/crossHistoryHost.jsp

@@ -10,7 +10,7 @@
 <a:historyReport title="Cross Report"
 	navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}">
 
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 
 <res:useCss value="${res.css.local.cross_css}" target="head-css" />

cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp

@@ -10,7 +10,7 @@
 <a:historyReport title="Cross Report"
 	navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}">
 
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 
 <res:useCss value="${res.css.local.cross_css}" target="head-css" />

cat-home/src/main/webapp/jsp/report/crossHistoryProject.jsp

@@ -10,7 +10,7 @@
 <a:historyReport title="Cross Report"
 	navUrlPrefix="ip=${model.ipAddress}&domain=${model.domain}">
 
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 
 <res:useCss value="${res.css.local.cross_css}" target="head-css" />

cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp

@@ -8,7 +8,7 @@
 <jsp:useBean id="model"	type="com.dianping.cat.report.page.event.Model" scope="request" />
 
 <a:historyReport title="History Report" navUrlPrefix="type=${payload.type}&ip=${model.ipAddress}">
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.event_css}" target="head-css" />
 	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>

cat-home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp

@@ -8,7 +8,7 @@
 <jsp:useBean id="model" type="com.dianping.cat.report.page.heartbeat.Model" scope="request" />
 
 <a:historyReport title="HeartBeat History Report">
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.transaction_css}" target="head-css" />
 	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>

cat-home/src/main/webapp/jsp/report/matrixHistoryReport.jsp

@@ -8,7 +8,7 @@
 <jsp:useBean id="model"	type="com.dianping.cat.report.page.matrix.Model" scope="request" />
 
 <a:historyReport title="History Report" navUrlPrefix="domain=${model.domain}">
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.matrix_css}" target="head-css" />
 </br>

cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp

@@ -9,7 +9,7 @@
 
 <a:historyReport title="History Report" navUrlPrefix="threshold=${model.threshold}&sqlThreshold=${model.sqlThreshold}&ip=${model.ipAddress}">
 
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.problem_css}" target="head-css"/>
 	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />

cat-home/src/main/webapp/jsp/report/transactionHistoryReport.jsp

@@ -8,7 +8,7 @@
 <jsp:useBean id="model"	type="com.dianping.cat.report.page.transaction.Model" scope="request" />
 
 <a:historyReport title="History Report" navUrlPrefix="type=${payload.type}&queryname=${model.queryName}">
-	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
+	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.transaction_css}" target="head-css" />
 	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>

cat-home/src/test/java/com/dianping/cat/demo/TestSendMessage.java

@@ -65,7 +65,7 @@ public class TestSendMessage {
 	public void sendPigeonServerTransaction() throws Exception {
 		for (int i = 0; i < 100; i++) {
 			Transaction t = Cat.getProducer().newTransaction("PigeonService", "Method6");
-			Cat.getProducer().newEvent("PigeonCall.client", "192.168.7.77");
+			Cat.getProducer().newEvent("PigeonService.client", "192.168.7.77");
 			t.addData("key and value");
 
 			Thread.sleep(1);
@@ -73,7 +73,7 @@ public class TestSendMessage {
 		}
 		for (int i = 0; i < 200; i++) {
 			Transaction t = Cat.getProducer().newTransaction("PigeonService", "Method8");
-			Cat.getProducer().newEvent("PigeonCall.client", "192.168.7.20");
+			Cat.getProducer().newEvent("PigeonService.client", "192.168.7.20");
 			t.addData("key and value");
 
 			Thread.sleep(1);
@@ -82,7 +82,7 @@ public class TestSendMessage {
 
 		for (int i = 0; i < 300; i++) {
 			Transaction t = Cat.getProducer().newTransaction("PigeonService", "Method5");
-			Cat.getProducer().newEvent("PigeonCall.client", "192.168.7.231");
+			Cat.getProducer().newEvent("PigeonService.client", "192.168.7.231");
 			t.addData("key and value");
 
 			Thread.sleep(1);

cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java

@@ -200,6 +200,6 @@ public class PayloadTest {
 	}
 	
 	private Date adjustEndDate(Date date){
-		return new Date(date.getTime()+1000);
+		return new Date(date.getTime());
 	}
 }