Merge remote-tracking branch 'zhb/master'

This commit is contained in:
zhouhaibin
2012-08-12 22:29:02 +08:00
20 changed files with 950 additions and 221 deletions
@@ -176,7 +176,7 @@ public class JSONDruidStatService {
Map<String, Object> dataMap = new LinkedHashMap<String, Object>();
dataMap.put("ResultCode", resultCode);
dataMap.put("Content", content);
return JSON.toJSONString(dataMap);
return JSON.toJSONStringWithDateFormat(dataMap, "yyyy-MM-dd hh:mm:ss");
}
}