Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
641ebeec
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
641ebeec
编写于
4月 14, 2015
作者:
J
jialinsun
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of code.dianpingoa.com:arch/cat
上级
71dd59ee
4d9b9ecc
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
22 addition
and
2 deletion
+22
-2
cat-broker/src/test/java/com/dianping/cat/broker/CdnTest.java
...broker/src/test/java/com/dianping/cat/broker/CdnTest.java
+13
-0
cat-home/src/main/java/com/dianping/cat/report/page/alteration/Handler.java
...java/com/dianping/cat/report/page/alteration/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/alteration/Payload.java
...java/com/dianping/cat/report/page/alteration/Payload.java
+8
-1
未找到文件。
cat-broker/src/test/java/com/dianping/cat/broker/CdnTest.java
浏览文件 @
641ebeec
...
...
@@ -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
浏览文件 @
641ebeec
...
...
@@ -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
浏览文件 @
641ebeec
...
...
@@ -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
{
if
(
m_alterationDate
.
length
()
==
16
)
{
return
m_sdf
.
parse
(
m_alterationDate
);
}
else
{
return
m_secondFormat
.
parse
(
m_alterationDate
);
}
}
catch
(
ParseException
e
)
{
return
new
Date
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录