Merge branch 'master' of code.dianpingoa.com:arch/cat

cat-broker/src/test/java/com/dianping/cat/broker/CdnTest.java

@@ -2,9 +2,13 @@ package com.dianping.cat.broker;
 
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 
+import org.junit.Test;
 import org.unidal.helper.Files;
 
 public class CdnTest {
@@ -20,6 +24,15 @@ public class CdnTest {
 		}
 	}
 
+	@Test
+	public void test() throws UnsupportedEncodingException{
+		String url = "http://localhost:2765/broker-service/api/cdn?v=1&tt=";
+		String url2 = url+URLEncoder.encode("http://sfsd/cat?sdf=tt&gg=yy","utf-8");
+		
+		System.out.println(URLDecoder.decode(url,"utf-8"));
+		System.out.println(URLDecoder.decode(url2,"utf-8"));
+	}
+	
 	public static void sendCdnRequest() throws Exception {
 		String url = "http://localhost:2765/broker-service/api/cdn?v=1";
 		URLConnection conn = new URL(url).openConnection();

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

@@ -39,7 +39,7 @@ public class Handler implements PageHandler<Context> {
 	@Inject
 	private AlterationDao m_alterationDao;
 
-	private SimpleDateFormat m_sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	private SimpleDateFormat m_sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	private final static String EMPTY = "N/A";
 

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

@@ -65,6 +65,8 @@ public class Payload extends AbstractReportPayload<Action, ReportPage> {
 
 	private SimpleDateFormat m_sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
+	private SimpleDateFormat m_secondFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
 	public Payload() {
 		super(ReportPage.ALTERATION);
 	}
@@ -80,7 +82,12 @@ public class Payload extends AbstractReportPayload<Action, ReportPage> {
 
 	public Date getAlterationDate() {
 		try {
-			return m_sdf.parse(m_alterationDate);
+			if (m_alterationDate.length() == 16) {
+				return m_sdf.parse(m_alterationDate);
+			} else {
+				return m_secondFormat.parse(m_alterationDate);
+			}
+
 		} catch (ParseException e) {
 			return new Date();
 		}