diff --git a/cat-home/pom.xml b/cat-home/pom.xml index 6efa73564f62e57a9c6f5d925a46f9c271d8caeb..74354fb0067081004be974e0aae77784108ca5b6 100755 --- a/cat-home/pom.xml +++ b/cat-home/pom.xml @@ -150,7 +150,7 @@ org.unidal.maven.plugins codegen-maven-plugin - 2.0.8 + 2.0.5 generate plexus component descriptor diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java index bbe6fbce76bc985e96f85c0c3b449c5726e237c9..74948c26bd6ce6f4711506db1a4bfe277fb91f4d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java @@ -174,7 +174,9 @@ public class Handler implements PageHandler { m_externalInfoBuilder.buildExceptionInfoOnGraph(payload, model, topologyGraph); model.setReportStart(new Date(payload.getDate())); model.setReportEnd(new Date(payload.getDate() + TimeUtil.ONE_HOUR - 1)); - model.setTopologyGraph(new DefaultJsonBuilder().build(topologyGraph)); + String build = new DefaultJsonBuilder().buildJson(topologyGraph); + + model.setTopologyGraph(build); break; case LINE_CHART: DependencyReport dependencyReport = queryDependencyReport(payload); diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java index 1d3adbccedb9a18324ed6e089b125ba17df00eae..086806bd6ad928329154829ef7bd154a4d299589 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/statistics/Model.java @@ -69,7 +69,7 @@ public class Model extends AbstractReportModel { } public String getBugs() { - return new DefaultJsonBuilder().build(m_bugReport); + return new DefaultJsonBuilder().buildJson(m_bugReport); } public List getCacheServices() { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java index 9835dd69dd77311c93c0b205d437c89121f33233..e3c4e9d3234d0d5dc81bc5d7cad9098f76014c23 100755 --- a/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/transaction/Handler.java @@ -85,7 +85,7 @@ public class Handler implements PageHandler { if (payload != null && report != null) { boolean isCurrent = payload.getPeriod().isCurrent(); double seconds; - + if (isCurrent) { seconds = (System.currentTimeMillis() - payload.getCurrentDate()) / (double) 1000; } else { @@ -175,7 +175,6 @@ public class Handler implements PageHandler { normalize(model, payload); String type = payload.getType(); - switch (payload.getAction()) { case HOURLY_REPORT: showHourlyReport(model, payload); diff --git a/cat-home/src/main/resources/META-INF/app.properties b/cat-home/src/main/resources/META-INF/app.properties new file mode 100644 index 0000000000000000000000000000000000000000..a47ade75d19538d46c3a6a8d64bf1749dc91a8e4 --- /dev/null +++ b/cat-home/src/main/resources/META-INF/app.properties @@ -0,0 +1,2 @@ +app.name=test +app.swimlane=test \ No newline at end of file diff --git a/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java b/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java deleted file mode 100644 index 518b1ecc57e11b4cf29d5fd82334edb7de9a9609..0000000000000000000000000000000000000000 --- a/cat-home/src/test/java/com/dianping/cat/report/page/dependency/DependencyGraphReport.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.dianping.cat.report.page.dependency; - -import org.junit.Test; -import org.unidal.helper.Files; - -import com.dianping.cat.home.dependency.graph.entity.TopologyGraph; -import com.dianping.cat.home.dependency.graph.transform.DefaultJsonBuilder; -import com.dianping.cat.home.dependency.graph.transform.DefaultSaxParser; - -public class DependencyGraphReport { - - @Test - public void test() throws Exception { - String oldXml = Files.forIO().readFrom(getClass().getResourceAsStream("graph.xml"), "utf-8"); - TopologyGraph front = DefaultSaxParser.parse(oldXml); - DefaultJsonBuilder build = new DefaultJsonBuilder(); - - System.out.println(build.build(front)); - } -}