From 7a9ce055479cf7fe0aa18cf68b74484475c13df8 Mon Sep 17 00:00:00 2001 From: birdie7761 Date: Wed, 7 Sep 2022 12:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=E4=B8=BAJSON=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cat/system/page/router/Handler.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java index cac4599887..4394588438 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java @@ -27,6 +27,7 @@ import javax.servlet.ServletException; +import com.alibaba.fastjson.JSON; import org.unidal.lookup.annotation.Inject; import org.unidal.web.mvc.PageHandler; import org.unidal.web.mvc.annotation.InboundActionMeta; @@ -141,9 +142,9 @@ public void handleOutbound(Context ctx) throws ServletException, IOException { model.setContent(routerInfo); break; case JSON: - Map kvs = buildKvs(report, domain, ip); + Map> kvs = buildKvs(report, domain, ip); - model.setContent(kvs.toString()); + model.setContent(JSON.toJSONString(kvs)); break; case BUILD: Date period = TimeHelper.getCurrentDay(-1); @@ -160,15 +161,17 @@ public void handleOutbound(Context ctx) throws ServletException, IOException { ctx.getHttpServletResponse().getWriter().write(model.getContent()); } - private Map buildKvs(RouterConfig report, String domain, String ip) { - Map kvs = new HashMap(); + private Map> buildKvs(RouterConfig report, String domain, String ip) { + Map map = new HashMap<>(); - kvs.put("block", String.valueOf(m_configManager.shouldBlock(ip))); - kvs.put("routers", buildRouterInfo(ip, domain, report)); - kvs.put("sample", String.valueOf(buildSampleInfo(domain))); - kvs.put("startTransactionTypes", m_filterManager.getAtomicStartTypes()); - kvs.put("matchTransactionTypes", m_filterManager.getAtomicMatchTypes()); + map.put("block", String.valueOf(m_configManager.shouldBlock(ip))); + map.put("routers", buildRouterInfo(ip, domain, report)); + map.put("sample", String.valueOf(buildSampleInfo(domain))); + map.put("startTransactionTypes", m_filterManager.getAtomicStartTypes()); + map.put("matchTransactionTypes", m_filterManager.getAtomicMatchTypes()); - return kvs; + Map> kvConfig = new HashMap<>(); + kvConfig.put("kvs",map); + return kvConfig; } } \ No newline at end of file