Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
d442dd3d
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,发现更多精彩内容 >>
提交
d442dd3d
编写于
2月 17, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
差异文件
merged
上级
828a42cd
fd03e5af
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
42 addition
and
181 deletion
+42
-181
cat-home/src/main/java/com/dianping/cat/report/ReportManager.java
.../src/main/java/com/dianping/cat/report/ReportManager.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/build/ComponentsConfigurator.java
...com/dianping/cat/report/build/ComponentsConfigurator.java
+8
-8
cat-home/src/main/java/com/dianping/cat/report/page/failure/FailureManager.java
.../com/dianping/cat/report/page/failure/FailureManager.java
+2
-2
cat-home/src/main/java/com/dianping/cat/report/page/failure/Handler.java
...in/java/com/dianping/cat/report/page/failure/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/ip/Handler.java
...rc/main/java/com/dianping/cat/report/page/ip/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/ip/IpManager.java
.../main/java/com/dianping/cat/report/page/ip/IpManager.java
+2
-2
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
...ava/com/dianping/cat/report/page/transaction/Handler.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/transaction/TransactionManager.java
...nping/cat/report/page/transaction/TransactionManager.java
+2
-2
cat-home/src/main/java/com/dianping/cat/report/tool/ReportUtils.java
...c/main/java/com/dianping/cat/report/tool/ReportUtils.java
+2
-2
cat-home/src/main/resources/META-INF/plexus/components.xml
cat-home/src/main/resources/META-INF/plexus/components.xml
+11
-11
cat-home/src/main/webapp/css/default.css
cat-home/src/main/webapp/css/default.css
+0
-2
cat-home/src/main/webapp/css/jqgrid.css
cat-home/src/main/webapp/css/jqgrid.css
+0
-136
cat-home/src/main/webapp/css/style.css
cat-home/src/main/webapp/css/style.css
+0
-1
cat-home/src/main/webapp/js/transaction.js
cat-home/src/main/webapp/js/transaction.js
+1
-1
cat-home/src/test/resources/com/dianping/cat/report/tool/TransactionReportMergeResult.xml
...dianping/cat/report/tool/TransactionReportMergeResult.xml
+8
-8
cat-home/src/test/resources/com/dianping/cat/report/tool/TransactionReportOld.xml
...ces/com/dianping/cat/report/tool/TransactionReportOld.xml
+2
-2
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/ReportManage.java
→
cat-home/src/main/java/com/dianping/cat/report/ReportManage
r
.java
浏览文件 @
d442dd3d
...
...
@@ -11,7 +11,7 @@ import com.dianping.cat.report.tool.Constants;
import
com.dianping.cat.report.tool.DateUtils
;
import
com.site.helper.Files
;
public
abstract
class
ReportManage
{
public
abstract
class
ReportManage
r
{
public
String
getRemotePageContent
(
String
urlStr
)
{
try
{
URL
url
=
new
URL
(
urlStr
);
...
...
cat-home/src/main/java/com/dianping/cat/report/build/ComponentsConfigurator.java
浏览文件 @
d442dd3d
...
...
@@ -8,13 +8,13 @@ import com.dianping.cat.message.spi.MessageConsumerRegistry;
import
com.dianping.cat.message.spi.internal.DefaultMessageConsumerRegistry
;
import
com.dianping.cat.report.ReportModule
;
import
com.dianping.cat.report.ServerConfig
;
import
com.dianping.cat.report.page.failure.FailureManage
;
import
com.dianping.cat.report.page.ip.IpManage
;
import
com.dianping.cat.report.page.failure.FailureManage
r
;
import
com.dianping.cat.report.page.ip.IpManage
r
;
import
com.dianping.cat.report.page.service.provider.FailureModelProvider
;
import
com.dianping.cat.report.page.service.provider.IpModelProvider
;
import
com.dianping.cat.report.page.service.provider.ModelProvider
;
import
com.dianping.cat.report.page.service.provider.TransactionModelProvider
;
import
com.dianping.cat.report.page.transaction.TransactionManage
;
import
com.dianping.cat.report.page.transaction.TransactionManage
r
;
import
com.site.lookup.configuration.Component
;
import
com.site.web.configuration.AbstractWebComponentsConfigurator
;
...
...
@@ -33,8 +33,8 @@ public class ComponentsConfigurator extends AbstractWebComponentsConfigurator {
}
all
.
add
(
C
(
ServerConfig
.
class
)
//
.
config
(
E
(
"consumerServers"
).
value
(
"1
92.168.32.68:2281,192.168.32.68
:2281"
))
//
.
config
(
E
(
"fileServer"
).
value
(
"1
92.168.32.68
"
)));
.
config
(
E
(
"consumerServers"
).
value
(
"1
27.0.0.1:2281,127.0.0.1
:2281"
))
//
.
config
(
E
(
"fileServer"
).
value
(
"1
27.0.0.1
"
)));
all
.
add
(
C
(
ModelProvider
.
class
,
"failure"
,
FailureModelProvider
.
class
).
req
(
MessageConsumer
.
class
,
"realtime"
));
...
...
@@ -43,11 +43,11 @@ public class ComponentsConfigurator extends AbstractWebComponentsConfigurator {
all
.
add
(
C
(
ModelProvider
.
class
,
"ip"
,
IpModelProvider
.
class
).
req
(
MessageConsumer
.
class
,
"realtime"
));
all
.
add
(
C
(
FailureManage
.
class
));
all
.
add
(
C
(
FailureManage
r
.
class
));
all
.
add
(
C
(
TransactionManage
.
class
));
all
.
add
(
C
(
TransactionManage
r
.
class
));
all
.
add
(
C
(
IpManage
.
class
));
all
.
add
(
C
(
IpManage
r
.
class
));
// Please keep it last
defineModuleRegistry
(
all
,
ReportModule
.
class
,
ReportModule
.
class
);
...
...
cat-home/src/main/java/com/dianping/cat/report/page/failure/FailureManage.java
→
cat-home/src/main/java/com/dianping/cat/report/page/failure/FailureManage
r
.java
浏览文件 @
d442dd3d
...
...
@@ -2,10 +2,10 @@ package com.dianping.cat.report.page.failure;
import
java.util.Date
;
import
com.dianping.cat.report.ReportManage
;
import
com.dianping.cat.report.ReportManage
r
;
import
com.dianping.cat.report.tool.DateUtils
;
public
class
FailureManage
extends
ReportManage
{
public
class
FailureManage
r
extends
ReportManager
{
public
String
getConnectionUrl
(
String
server
,
String
domain
,
String
ip
,
String
duration
){
StringBuffer
result
=
new
StringBuffer
(
"http://"
).
append
(
server
).
append
(
"/cat/r/service?model=failure"
);
...
...
cat-home/src/main/java/com/dianping/cat/report/page/failure/Handler.java
浏览文件 @
d442dd3d
...
...
@@ -33,7 +33,7 @@ public class Handler implements PageHandler<Context> {
private
JspViewer
m_jspViewer
;
@Inject
private
FailureManage
m_manager
;
private
FailureManage
r
m_manager
;
@Override
@PayloadMeta
(
Payload
.
class
)
...
...
cat-home/src/main/java/com/dianping/cat/report/page/ip/Handler.java
浏览文件 @
d442dd3d
...
...
@@ -38,7 +38,7 @@ public class Handler implements PageHandler<Context> {
private
ServerConfig
serverConfig
;
@Inject
private
IpManage
m_manager
;
private
IpManage
r
m_manager
;
@Override
@PayloadMeta
(
Payload
.
class
)
...
...
cat-home/src/main/java/com/dianping/cat/report/page/ip/IpManage.java
→
cat-home/src/main/java/com/dianping/cat/report/page/ip/IpManage
r
.java
浏览文件 @
d442dd3d
...
...
@@ -2,10 +2,10 @@ package com.dianping.cat.report.page.ip;
import
java.util.Date
;
import
com.dianping.cat.report.ReportManage
;
import
com.dianping.cat.report.ReportManage
r
;
import
com.dianping.cat.report.tool.DateUtils
;
public
class
IpManage
extends
ReportManage
{
public
class
IpManage
r
extends
ReportManager
{
public
String
getConnectionUrl
(
String
server
,
String
domain
,
String
duration
){
StringBuffer
result
=
new
StringBuffer
(
"http://"
).
append
(
server
).
append
(
"/cat/r/service?model=ip"
);
...
...
cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java
浏览文件 @
d442dd3d
...
...
@@ -36,7 +36,7 @@ public class Handler implements PageHandler<Context> {
private
ServerConfig
serverConfig
;
@Inject
private
TransactionManage
m_manager
;
private
TransactionManage
r
m_manager
;
@Override
@PayloadMeta
(
Payload
.
class
)
...
...
cat-home/src/main/java/com/dianping/cat/report/page/transaction/TransactionManage.java
→
cat-home/src/main/java/com/dianping/cat/report/page/transaction/TransactionManage
r
.java
浏览文件 @
d442dd3d
...
...
@@ -2,10 +2,10 @@ package com.dianping.cat.report.page.transaction;
import
java.util.Date
;
import
com.dianping.cat.report.ReportManage
;
import
com.dianping.cat.report.ReportManage
r
;
import
com.dianping.cat.report.tool.DateUtils
;
public
class
TransactionManage
extends
ReportManage
{
public
class
TransactionManage
r
extends
ReportManager
{
public
String
getConnectionUrl
(
String
server
,
String
domain
,
String
duration
){
StringBuffer
result
=
new
StringBuffer
(
"http://"
).
append
(
server
).
append
(
"/cat/r/service?model=transaction"
);
...
...
cat-home/src/main/java/com/dianping/cat/report/tool/ReportUtils.java
浏览文件 @
d442dd3d
...
...
@@ -71,7 +71,7 @@ public class ReportUtils {
// TODO Auto-generated method stub
//super.mergeName(old, name);
old
.
setTotalCount
(
old
.
getTotalCount
()
+
name
.
getTotalCount
());
old
.
setFailCount
(
old
.
getFailCount
()
+
name
.
get
Tota
lCount
());
old
.
setFailCount
(
old
.
getFailCount
()
+
name
.
get
Fai
lCount
());
old
.
setFailPercent
(
old
.
getFailCount
()*
100.0
/
old
.
getTotalCount
());
double
min
=
name
.
getMin
();
if
(
min
<
old
.
getMin
())
{
...
...
@@ -114,7 +114,7 @@ public class ReportUtils {
//super.mergeType(old, type);
old
.
setTotalCount
(
old
.
getTotalCount
()
+
name
.
getTotalCount
());
old
.
setFailCount
(
old
.
getFailCount
()
+
name
.
get
Tota
lCount
());
old
.
setFailCount
(
old
.
getFailCount
()
+
name
.
get
Fai
lCount
());
old
.
setFailPercent
(
old
.
getFailCount
()*
100.0
/
old
.
getTotalCount
());
double
min
=
name
.
getMin
();
if
(
min
<
old
.
getMin
())
{
...
...
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
d442dd3d
...
...
@@ -18,8 +18,8 @@
<role>
com.dianping.cat.report.ServerConfig
</role>
<implementation>
com.dianping.cat.report.ServerConfig
</implementation>
<configuration>
<consumerServers>
1
92.168.32.68:2281,192.168.32.68
:2281
</consumerServers>
<fileServer>
1
92.168.32.68
</fileServer>
<consumerServers>
1
27.0.0.1:2281,127.0.0.1
:2281
</consumerServers>
<fileServer>
1
27.0.0.1
</fileServer>
</configuration>
</component>
<component>
...
...
@@ -56,16 +56,16 @@
</requirements>
</component>
<component>
<role>
com.dianping.cat.report.page.failure.FailureManage
</role>
<implementation>
com.dianping.cat.report.page.failure.FailureManage
</implementation>
<role>
com.dianping.cat.report.page.failure.FailureManage
r
</role>
<implementation>
com.dianping.cat.report.page.failure.FailureManage
r
</implementation>
</component>
<component>
<role>
com.dianping.cat.report.page.transaction.TransactionManage
</role>
<implementation>
com.dianping.cat.report.page.transaction.TransactionManage
</implementation>
<role>
com.dianping.cat.report.page.transaction.TransactionManage
r
</role>
<implementation>
com.dianping.cat.report.page.transaction.TransactionManage
r
</implementation>
</component>
<component>
<role>
com.dianping.cat.report.page.ip.IpManage
</role>
<implementation>
com.dianping.cat.report.page.ip.IpManage
</implementation>
<role>
com.dianping.cat.report.page.ip.IpManage
r
</role>
<implementation>
com.dianping.cat.report.page.ip.IpManage
r
</implementation>
</component>
<component>
<role>
com.site.web.mvc.model.ModuleRegistry
</role>
...
...
@@ -104,7 +104,7 @@
<role>
com.dianping.cat.report.ServerConfig
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.report.page.transaction.TransactionManage
</role>
<role>
com.dianping.cat.report.page.transaction.TransactionManage
r
</role>
</requirement>
</requirements>
</component>
...
...
@@ -123,7 +123,7 @@
<role>
com.dianping.cat.report.page.failure.JspViewer
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.report.page.failure.FailureManage
</role>
<role>
com.dianping.cat.report.page.failure.FailureManage
r
</role>
</requirement>
</requirements>
</component>
...
...
@@ -158,7 +158,7 @@
<role>
com.dianping.cat.report.ServerConfig
</role>
</requirement>
<requirement>
<role>
com.dianping.cat.report.page.ip.IpManage
</role>
<role>
com.dianping.cat.report.page.ip.IpManage
r
</role>
</requirement>
</requirements>
</component>
...
...
cat-home/src/main/webapp/css/default.css
浏览文件 @
d442dd3d
...
...
@@ -8,8 +8,6 @@ body {
font
:
Message-Box
;
}
h1
{
font-family
:
Verdana
,
Arial
,
Helvetica
,
sans-serif
;
font-size
:
18px
;
font-weight
:
bold
}
html
{
margin
:
0
}
a
{
...
...
cat-home/src/main/webapp/css/jqgrid.css
已删除
100644 → 0
浏览文件 @
828a42cd
/*Grid*/
.ui-jqgrid
{
position
:
relative
;
font-size
:
11px
;}
.ui-jqgrid
.ui-jqgrid-view
{
position
:
relative
;
left
:
0px
;
top
:
0px
;
padding
:
.0em
;}
/* caption*/
.ui-jqgrid
.ui-jqgrid-titlebar
{
padding
:
.3em
.2em
.2em
.3em
;
position
:
relative
;
border-left
:
0px
none
;
border-right
:
0px
none
;
border-top
:
0px
none
;}
.ui-jqgrid
.ui-jqgrid-title
{
float
:
left
;
margin
:
.1em
0
.2em
;
}
.ui-jqgrid
.ui-jqgrid-titlebar-close
{
position
:
absolute
;
top
:
50%
;
width
:
19px
;
margin
:
-10px
0
0
0
;
padding
:
1px
;
height
:
18px
;}
.ui-jqgrid
.ui-jqgrid-titlebar-close
span
{
display
:
block
;
margin
:
1px
;
}
.ui-jqgrid
.ui-jqgrid-titlebar-close
:hover
{
padding
:
0
;
}
/* header*/
.ui-jqgrid
.ui-jqgrid-hdiv
{
position
:
relative
;
margin
:
0em
;
padding
:
0em
;
overflow-x
:
hidden
;
border-left
:
0px
none
!important
;
border-top
:
0px
none
!important
;
border-right
:
0px
none
!important
;}
.ui-jqgrid
.ui-jqgrid-hbox
{
float
:
left
;
padding-right
:
20px
;}
.ui-jqgrid
.ui-jqgrid-htable
{
table-layout
:
fixed
;
margin
:
0em
;}
.ui-jqgrid
.ui-jqgrid-htable
th
{
height
:
22px
;
padding
:
0
2px
0
2px
;}
.ui-jqgrid
.ui-jqgrid-htable
th
div
{
overflow
:
hidden
;
position
:
relative
;
height
:
17px
;}
.ui-th-column
,
.ui-jqgrid
.ui-jqgrid-htable
th
.ui-th-column
{
overflow
:
hidden
;
white-space
:
nowrap
;
text-align
:
center
;
border-top
:
0px
none
;
border-bottom
:
0px
none
;}
.ui-th-ltr
,
.ui-jqgrid
.ui-jqgrid-htable
th
.ui-th-ltr
{
border-left
:
0px
none
;}
.ui-th-rtl
,
.ui-jqgrid
.ui-jqgrid-htable
th
.ui-th-rtl
{
border-right
:
0px
none
;}
.ui-first-th-ltr
{
border-right
:
1px
solid
;
}
.ui-first-th-rtl
{
border-left
:
1px
solid
;
}
.ui-jqgrid
.ui-th-div-ie
{
white-space
:
nowrap
;
zoom
:
1
;
height
:
17px
;}
.ui-jqgrid
.ui-jqgrid-resize
{
height
:
20px
!important
;
position
:
relative
;
cursor
:
e-resize
;
display
:
inline
;
overflow
:
hidden
;}
.ui-jqgrid
.ui-grid-ico-sort
{
overflow
:
hidden
;
position
:
absolute
;
display
:
inline
;
cursor
:
pointer
!important
;}
.ui-jqgrid
.ui-icon-asc
{
margin-top
:
-3px
;
height
:
12px
;}
.ui-jqgrid
.ui-icon-desc
{
margin-top
:
3px
;
height
:
12px
;}
.ui-jqgrid
.ui-i-asc
{
margin-top
:
0px
;
height
:
16px
;}
.ui-jqgrid
.ui-i-desc
{
margin-top
:
0px
;
margin-left
:
13px
;
height
:
16px
;}
.ui-jqgrid
.ui-jqgrid-sortable
{
cursor
:
pointer
;}
.ui-jqgrid
tr
.ui-search-toolbar
th
{
border-top-width
:
1px
!important
;
border-top-color
:
inherit
!important
;
border-top-style
:
ridge
!important
}
tr
.ui-search-toolbar
input
{
margin
:
1px
0px
0px
0px
}
tr
.ui-search-toolbar
select
{
margin
:
1px
0px
0px
0px
}
/* body */
.ui-jqgrid
.ui-jqgrid-bdiv
{
position
:
relative
;
margin
:
0em
;
padding
:
0
;
overflow
:
auto
;
text-align
:
left
;}
.ui-jqgrid
.ui-jqgrid-btable
{
table-layout
:
fixed
;
margin
:
0em
;
outline-style
:
none
;
}
.ui-jqgrid
tr
.jqgrow
{
outline-style
:
none
;
}
.ui-jqgrid
tr
.jqgroup
{
outline-style
:
none
;
}
.ui-jqgrid
tr
.jqgrow
td
{
font-weight
:
normal
;
overflow
:
hidden
;
white-space
:
pre
;
height
:
22px
;
padding
:
0
2px
0
2px
;
border-bottom-width
:
1px
;
border-bottom-color
:
inherit
;
border-bottom-style
:
solid
;}
.ui-jqgrid
tr
.jqgfirstrow
td
{
padding
:
0
2px
0
2px
;
border-right-width
:
1px
;
border-right-style
:
solid
;}
.ui-jqgrid
tr
.jqgroup
td
{
font-weight
:
normal
;
overflow
:
hidden
;
white-space
:
pre
;
height
:
22px
;
padding
:
0
2px
0
2px
;
border-bottom-width
:
1px
;
border-bottom-color
:
inherit
;
border-bottom-style
:
solid
;}
.ui-jqgrid
tr
.jqfoot
td
{
font-weight
:
bold
;
overflow
:
hidden
;
white-space
:
pre
;
height
:
22px
;
padding
:
0
2px
0
2px
;
border-bottom-width
:
1px
;
border-bottom-color
:
inherit
;
border-bottom-style
:
solid
;}
.ui-jqgrid
tr
.ui-row-ltr
td
{
text-align
:
left
;
border-right-width
:
1px
;
border-right-color
:
inherit
;
border-right-style
:
solid
;}
.ui-jqgrid
tr
.ui-row-rtl
td
{
text-align
:
right
;
border-left-width
:
1px
;
border-left-color
:
inherit
;
border-left-style
:
solid
;}
.ui-jqgrid
td
.jqgrid-rownum
{
padding
:
0
2px
0
2px
;
margin
:
0px
;
border
:
0px
none
;}
.ui-jqgrid
.ui-jqgrid-resize-mark
{
width
:
2px
;
left
:
0
;
background-color
:
#777
;
cursor
:
e-resize
;
cursor
:
col-resize
;
position
:
absolute
;
top
:
0
;
height
:
100px
;
overflow
:
hidden
;
display
:
none
;
border
:
0
none
;}
/* footer */
.ui-jqgrid
.ui-jqgrid-sdiv
{
position
:
relative
;
margin
:
0em
;
padding
:
0em
;
overflow
:
hidden
;
border-left
:
0px
none
!important
;
border-top
:
0px
none
!important
;
border-right
:
0px
none
!important
;}
.ui-jqgrid
.ui-jqgrid-ftable
{
table-layout
:
fixed
;
margin-bottom
:
0em
;}
.ui-jqgrid
tr
.footrow
td
{
font-weight
:
bold
;
overflow
:
hidden
;
white-space
:
nowrap
;
height
:
21px
;
padding
:
0
2px
0
2px
;
border-top-width
:
1px
;
border-top-color
:
inherit
;
border-top-style
:
solid
;}
.ui-jqgrid
tr
.footrow-ltr
td
{
text-align
:
left
;
border-right-width
:
1px
;
border-right-color
:
inherit
;
border-right-style
:
solid
;}
.ui-jqgrid
tr
.footrow-rtl
td
{
text-align
:
right
;
border-left-width
:
1px
;
border-left-color
:
inherit
;
border-left-style
:
solid
;}
/* Pager*/
.ui-jqgrid
.ui-jqgrid-pager
{
border-left
:
0px
none
!important
;
border-right
:
0px
none
!important
;
border-bottom
:
0px
none
!important
;
margin
:
0px
!important
;
padding
:
0px
!important
;
position
:
relative
;
height
:
25px
;
white-space
:
nowrap
;
overflow
:
hidden
;}
.ui-jqgrid
.ui-pager-control
{
position
:
relative
;}
.ui-jqgrid
.ui-pg-table
{
position
:
relative
;
padding-bottom
:
2px
;
width
:
auto
;
margin
:
0em
;}
.ui-jqgrid
.ui-pg-table
td
{
font-weight
:
normal
;
vertical-align
:
middle
;
padding
:
1px
;}
.ui-jqgrid
.ui-pg-button
{
height
:
19px
!important
;}
.ui-jqgrid
.ui-pg-button
span
{
display
:
block
;
margin
:
1px
;
float
:
left
;}
.ui-jqgrid
.ui-pg-button
:hover
{
padding
:
0px
;
}
.ui-jqgrid
.ui-state-disabled
:hover
{
padding
:
1px
;}
.ui-jqgrid
.ui-pg-input
{
height
:
13px
;
font-size
:
.8em
;
margin
:
0em
;}
.ui-jqgrid
.ui-pg-selbox
{
font-size
:
.8em
;
line-height
:
18px
;
display
:
block
;
height
:
18px
;
margin
:
0em
;}
.ui-jqgrid
.ui-separator
{
height
:
18px
;
border-left
:
1px
solid
#ccc
;
border-right
:
1px
solid
#ccc
;
margin
:
1px
;
float
:
right
;}
.ui-jqgrid
.ui-paging-info
{
font-weight
:
normal
;
height
:
19px
;
margin-top
:
3px
;
margin-right
:
4px
;}
.ui-jqgrid
.ui-jqgrid-pager
.ui-pg-div
{
padding
:
1px
0
;
float
:
left
;
list-style-image
:
none
;
list-style-position
:
outside
;
list-style-type
:
none
;
position
:
relative
;}
.ui-jqgrid
.ui-jqgrid-pager
.ui-pg-button
{
cursor
:
pointer
;
}
.ui-jqgrid
.ui-jqgrid-pager
.ui-pg-div
span
.ui-icon
{
float
:
left
;
margin
:
0
2px
;}
.ui-jqgrid
td
input
,
.ui-jqgrid
td
select
.ui-jqgrid
td
textarea
{
margin
:
0em
;}
.ui-jqgrid
td
textarea
{
width
:
auto
;
height
:
auto
;}
.ui-jqgrid
.ui-jqgrid-toppager
{
border-left
:
0px
none
!important
;
border-right
:
0px
none
!important
;
border-top
:
0px
none
!important
;
margin
:
0px
!important
;
padding
:
0px
!important
;
position
:
relative
;
height
:
25px
!important
;
white-space
:
nowrap
;
overflow
:
hidden
;}
/*subgrid*/
.ui-jqgrid
.ui-jqgrid-btable
.ui-sgcollapsed
span
{
display
:
block
;}
.ui-jqgrid
.ui-subgrid
{
margin
:
0em
;
padding
:
0em
;
width
:
100%
;}
.ui-jqgrid
.ui-subgrid
table
{
table-layout
:
fixed
;}
.ui-jqgrid
.ui-subgrid
tr
.ui-subtblcell
td
{
height
:
18px
;
border-right-width
:
1px
;
border-right-color
:
inherit
;
border-right-style
:
solid
;
border-bottom-width
:
1px
;
border-bottom-color
:
inherit
;
border-bottom-style
:
solid
;}
.ui-jqgrid
.ui-subgrid
td
.subgrid-data
{
border-top
:
0px
none
!important
;}
.ui-jqgrid
.ui-subgrid
td
.subgrid-cell
{
border-width
:
0px
0px
1px
0px
;}
.ui-jqgrid
.ui-th-subgrid
{
height
:
20px
;}
/* loading */
.ui-jqgrid
.loading
{
position
:
absolute
;
top
:
45%
;
left
:
45%
;
width
:
auto
;
z-index
:
101
;
padding
:
6px
;
margin
:
5px
;
text-align
:
center
;
font-weight
:
bold
;
display
:
none
;
border-width
:
2px
!important
;}
.ui-jqgrid
.jqgrid-overlay
{
display
:
none
;
z-index
:
100
;}
*
html
.jqgrid-overlay
{
width
:
expression
(
this
.
parentNode
.
offsetWidth
+
'px'
);
height
:
expression
(
this
.
parentNode
.
offsetHeight
+
'px'
);}
*
.jqgrid-overlay
iframe
{
position
:
absolute
;
top
:
0
;
left
:
0
;
z-index
:
-1
;
width
:
expression
(
this
.
parentNode
.
offsetWidth
+
'px'
);
height
:
expression
(
this
.
parentNode
.
offsetHeight
+
'px'
);}
/* end loading div */
/* toolbar */
.ui-jqgrid
.ui-userdata
{
border-left
:
0px
none
;
border-right
:
0px
none
;
height
:
21px
;
overflow
:
hidden
;
}
/*Modal Window */
.ui-jqdialog
{
display
:
none
;
width
:
300px
;
position
:
absolute
;
padding
:
.2em
;
font-size
:
11px
;
overflow
:
visible
;}
.ui-jqdialog
.ui-jqdialog-titlebar
{
padding
:
.3em
.2em
;
position
:
relative
;
}
.ui-jqdialog
.ui-jqdialog-title
{
margin
:
.1em
0
.2em
;
}
.ui-jqdialog
.ui-jqdialog-titlebar-close
{
position
:
absolute
;
top
:
50%
;
width
:
19px
;
margin
:
-10px
0
0
0
;
padding
:
1px
;
height
:
18px
;
}
.ui-jqdialog
.ui-jqdialog-titlebar-close
span
{
display
:
block
;
margin
:
1px
;
}
.ui-jqdialog
.ui-jqdialog-titlebar-close
:hover
,
.ui-jqdialog
.ui-jqdialog-titlebar-close
:focus
{
padding
:
0
;
}
.ui-jqdialog-content
,
.ui-jqdialog
.ui-jqdialog-content
{
border
:
0
;
padding
:
.3em
.2em
;
background
:
none
;
height
:
auto
;}
.ui-jqdialog
.ui-jqconfirm
{
padding
:
.4em
1em
;
border-width
:
3px
;
position
:
absolute
;
bottom
:
10px
;
right
:
10px
;
overflow
:
visible
;
display
:
none
;
height
:
80px
;
width
:
220px
;
text-align
:
center
;}
/* end Modal window*/
/* Form edit */
.ui-jqdialog-content
.FormGrid
{
margin
:
0px
;}
.ui-jqdialog-content
.EditTable
{
width
:
100%
;
margin-bottom
:
0em
;}
.ui-jqdialog-content
.DelTable
{
width
:
100%
;
margin-bottom
:
0em
;}
.EditTable
td
input
,
.EditTable
td
select
,
.EditTable
td
textarea
{
margin
:
0em
;}
.EditTable
td
textarea
{
width
:
auto
;
height
:
auto
;}
.ui-jqdialog-content
td
.EditButton
{
text-align
:
right
;
border-top
:
0px
none
;
border-left
:
0px
none
;
border-right
:
0px
none
;
padding-bottom
:
5px
;
padding-top
:
5px
;}
.ui-jqdialog-content
td
.navButton
{
text-align
:
center
;
border-left
:
0px
none
;
border-top
:
0px
none
;
border-right
:
0px
none
;
padding-bottom
:
5px
;
padding-top
:
5px
;}
.ui-jqdialog-content
input
.FormElement
{
padding
:
.3em
}
.ui-jqdialog-content
.data-line
{
padding-top
:
.1em
;
border
:
0px
none
;}
.ui-jqdialog-content
.CaptionTD
{
text-align
:
left
;
vertical-align
:
middle
;
border
:
0px
none
;
padding
:
2px
;
white-space
:
nowrap
;}
.ui-jqdialog-content
.DataTD
{
padding
:
2px
;
border
:
0px
none
;
vertical-align
:
top
;}
.ui-jqdialog-content
.form-view-data
{
white-space
:
pre
}
.fm-button
{
display
:
inline-block
;
margin
:
0
4px
0
0
;
padding
:
.4em
.5em
;
text-decoration
:
none
!important
;
cursor
:
pointer
;
position
:
relative
;
text-align
:
center
;
zoom
:
1
;
}
.fm-button-icon-left
{
padding-left
:
1.9em
;
}
.fm-button-icon-right
{
padding-right
:
1.9em
;
}
.fm-button-icon-left
.ui-icon
{
right
:
auto
;
left
:
.2em
;
margin-left
:
0
;
position
:
absolute
;
top
:
50%
;
margin-top
:
-8px
;
}
.fm-button-icon-right
.ui-icon
{
left
:
auto
;
right
:
.2em
;
margin-left
:
0
;
position
:
absolute
;
top
:
50%
;
margin-top
:
-8px
;}
#nData
,
#pData
{
float
:
left
;
margin
:
3px
;
padding
:
0
;
width
:
15px
;
}
/* End Eorm edit */
/*.ui-jqgrid .edit-cell {}*/
.ui-jqgrid
.selected-row
,
div
.ui-jqgrid
.selected-row
td
{
font-style
:
normal
;
border-left
:
0px
none
;}
/* Tree Grid */
.ui-jqgrid
.tree-wrap
{
float
:
left
;
position
:
relative
;
height
:
18px
;
white-space
:
nowrap
;
overflow
:
hidden
;}
.ui-jqgrid
.tree-minus
{
position
:
absolute
;
height
:
18px
;
width
:
18px
;
overflow
:
hidden
;}
.ui-jqgrid
.tree-plus
{
position
:
absolute
;
height
:
18px
;
width
:
18px
;
overflow
:
hidden
;}
.ui-jqgrid
.tree-leaf
{
position
:
absolute
;
height
:
18px
;
width
:
18px
;
overflow
:
hidden
;}
.ui-jqgrid
.treeclick
{
cursor
:
pointer
;}
/* moda dialog */
*
iframe
.jqm
{
position
:
absolute
;
top
:
0
;
left
:
0
;
z-index
:
-1
;
width
:
expression
(
this
.
parentNode
.
offsetWidth
+
'px'
);
height
:
expression
(
this
.
parentNode
.
offsetHeight
+
'px'
);}
.ui-jqgrid-dnd
tr
td
{
border-right-width
:
1px
;
border-right-color
:
inherit
;
border-right-style
:
solid
;
height
:
20px
}
/* RTL Support */
.ui-jqgrid
.ui-jqgrid-title-rtl
{
float
:
right
;
margin
:
.1em
0
.2em
;
}
.ui-jqgrid
.ui-jqgrid-hbox-rtl
{
float
:
right
;
padding-left
:
20px
;}
.ui-jqgrid
.ui-jqgrid-resize-ltr
{
float
:
right
;
margin
:
-2px
-2px
-2px
0px
;}
.ui-jqgrid
.ui-jqgrid-resize-rtl
{
float
:
left
;
margin
:
-2px
0px
-1px
-3px
;}
.ui-jqgrid
.ui-sort-rtl
{
left
:
0px
;}
.ui-jqgrid
.tree-wrap-ltr
{
float
:
left
;}
.ui-jqgrid
.tree-wrap-rtl
{
float
:
right
;}
.ui-jqgrid
.ui-ellipsis
{
text-overflow
:
ellipsis
;
-moz-binding
:
url('ellipsis-xbl.xml#ellipsis')
;}
cat-home/src/main/webapp/css/style.css
浏览文件 @
d442dd3d
...
...
@@ -233,7 +233,6 @@ CAPTION
color
:
#985D2E
}
h1
{
font-family
:
Verdana
,
Arial
,
Helvetica
,
sans-serif
;
font-size
:
18px
;
font-weight
:
bold
}
h2
{
font-family
:
Verdana
,
Arial
,
Helvetica
,
sans-serif
;
font-size
:
12px
;
font-weight
:
bold
}
.tr0
{
}
...
...
cat-home/src/main/webapp/js/transaction.js
浏览文件 @
d442dd3d
...
...
@@ -5,7 +5,7 @@ function renderTable(container, data) {
function
makeRow
(
row
)
{
var
tr
=
$
(
'
<tr />
'
);
[
"
<a href='?domain=
"
+
domain
+
"
&type=
"
+
row
.
id
+
"
'>
"
+
row
.
id
+
"
</a>
"
,
row
.
totalCount
,
row
.
failCount
,
row
.
failPercent
,
'
<a href="
'
+
row
.
successMessageUrl
+
'
" >success</a>
'
,
'
<a href="
\
m
\\
'
+
row
.
successMessageUrl
+
'
" >success</a>
'
,
row
.
min
+
"
/
"
+
row
.
max
+
"
/
"
+
row
.
avg
+
"
/
"
+
row
.
std
]
.
forEach
(
function
(
e
)
{
$
(
'
<td />
'
).
html
(
e
).
appendTo
(
tr
);
...
...
cat-home/src/test/resources/com/dianping/cat/report/tool/TransactionReportMergeResult.xml
浏览文件 @
d442dd3d
<transaction-report
domain=
"Cat"
startTime=
"2012-02-16 23:00:00"
endTime=
"2012-02-16 23:59:00"
>
<domain>
Cat
</domain>
<type
id=
"URL"
totalCount=
"22"
failCount=
"11"
failPercent=
"50.00"
min=
"0.0"
max=
"194.0"
avg=
"47.1"
sum=
"1036.0"
sum2=
"147884.0"
std=
"67.1"
>
<name
id=
"home"
totalCount=
"2"
failCount=
"
1"
failPercent=
"5
0.00"
min=
"175.0"
max=
"175.0"
avg=
"175.0"
sum=
"350.0"
sum2=
"61250.0"
std=
"0.0"
>
<name
id=
"home"
totalCount=
"2"
failCount=
"
0"
failPercent=
"
0.00"
min=
"175.0"
max=
"175.0"
avg=
"175.0"
sum=
"350.0"
sum2=
"61250.0"
std=
"0.0"
>
</name>
<name
id=
"service"
totalCount=
"16"
failCount=
"
8"
failPercent=
"50
.00"
min=
"1.0"
max=
"58.0"
avg=
"13.0"
sum=
"208.0"
sum2=
"7904.0"
std=
"18.0"
>
<name
id=
"service"
totalCount=
"16"
failCount=
"
4"
failPercent=
"25
.00"
min=
"1.0"
max=
"58.0"
avg=
"13.0"
sum=
"208.0"
sum2=
"7904.0"
std=
"18.0"
>
</name>
<name
id=
"t"
totalCount=
"2"
failCount=
"
1"
failPercent=
"5
0.00"
min=
"193.0"
max=
"193.0"
avg=
"193.0"
sum=
"386.0"
sum2=
"74498.0"
std=
"0.0"
>
<name
id=
"t"
totalCount=
"2"
failCount=
"
0"
failPercent=
"
0.00"
min=
"193.0"
max=
"193.0"
avg=
"193.0"
sum=
"386.0"
sum2=
"74498.0"
std=
"0.0"
>
</name>
<name
id=
"ip"
totalCount=
"2"
failCount=
"
1"
failPercent=
"5
0.00"
min=
"46.0"
max=
"46.0"
avg=
"46.0"
sum=
"92.0"
sum2=
"4232.0"
std=
"0.0"
>
<name
id=
"ip"
totalCount=
"2"
failCount=
"
0"
failPercent=
"
0.00"
min=
"46.0"
max=
"46.0"
avg=
"46.0"
sum=
"92.0"
sum2=
"4232.0"
std=
"0.0"
>
</name>
</type>
<type
id=
"MVC"
totalCount=
"66"
failCount=
"
33"
failPercent=
"50.00
"
min=
"0.0"
max=
"191.0"
avg=
"15.1"
sum=
"998.0"
sum2=
"136754.0"
std=
"42.9"
>
<name
id=
"InboundPhase"
totalCount=
"22"
failCount=
"
11"
failPercent=
"5
0.00"
min=
"0.0"
max=
"17.0"
avg=
"1.5"
sum=
"34.0"
sum2=
"578.0"
std=
"4.9"
>
<type
id=
"MVC"
totalCount=
"66"
failCount=
"
44"
failPercent=
"66.67
"
min=
"0.0"
max=
"191.0"
avg=
"15.1"
sum=
"998.0"
sum2=
"136754.0"
std=
"42.9"
>
<name
id=
"InboundPhase"
totalCount=
"22"
failCount=
"
0"
failPercent=
"
0.00"
min=
"0.0"
max=
"17.0"
avg=
"1.5"
sum=
"34.0"
sum2=
"578.0"
std=
"4.9"
>
</name>
<name
id=
"TransitionPhase"
totalCount=
"22"
failCount=
"
11"
failPercent=
"5
0.00"
min=
"0.0"
max=
"4.9E-324"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
std=
"0.0"
>
<name
id=
"TransitionPhase"
totalCount=
"22"
failCount=
"
0"
failPercent=
"
0.00"
min=
"0.0"
max=
"4.9E-324"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
std=
"0.0"
>
</name>
<name
id=
"OutboundPhase"
totalCount=
"22"
failCount=
"
11"
failPercent=
"5
0.00"
min=
"1.0"
max=
"191.0"
avg=
"43.8"
sum=
"964.0"
sum2=
"136176.0"
std=
"65.3"
>
<name
id=
"OutboundPhase"
totalCount=
"22"
failCount=
"
0"
failPercent=
"
0.00"
min=
"1.0"
max=
"191.0"
avg=
"43.8"
sum=
"964.0"
sum2=
"136176.0"
std=
"65.3"
>
</name>
</type>
<type
id=
"OLD1"
totalCount=
"33"
failCount=
"0"
failPercent=
"0.00"
min=
"0.0"
max=
"191.0"
avg=
"15.1"
sum=
"499.0"
sum2=
"68377.0"
std=
"42.9"
>
...
...
cat-home/src/test/resources/com/dianping/cat/report/tool/TransactionReportOld.xml
浏览文件 @
d442dd3d
...
...
@@ -8,7 +8,7 @@
<successmessageurl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successmessageurl>
</name>
<name
id=
"service"
totalCount=
"8"
failCount=
"
0"
failPercent=
"
0.00"
<name
id=
"service"
totalCount=
"8"
failCount=
"
4"
failPercent=
"5
0.00"
min=
"1.0"
max=
"58.0"
avg=
"13.0"
sum=
"104.0"
sum2=
"3952.0"
std=
"18.0"
>
<successmessageurl>
20120216/23/Cat/b10bdefb-1eca-45e1-a9c3-52367078b5a2.html
</successmessageurl>
...
...
@@ -26,7 +26,7 @@
<successmessageurl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successmessageurl>
</type>
<type
id=
"MVC"
totalCount=
"33"
failCount=
"
0"
failPercent=
"0.00
"
<type
id=
"MVC"
totalCount=
"33"
failCount=
"
11"
failPercent=
"33.33
"
min=
"0.0"
max=
"191.0"
avg=
"15.1"
sum=
"499.0"
sum2=
"68377.0"
std=
"42.9"
>
<name
id=
"InboundPhase"
totalCount=
"11"
failCount=
"0"
failPercent=
"0.00"
min=
"0.0"
max=
"17.0"
avg=
"1.5"
sum=
"17.0"
sum2=
"289.0"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录