From 3c7d4e78910f0f58cd29714210a476ff42c34833 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 12 Apr 2016 17:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84traceid=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2url=EF=BC=8C=E9=81=BF=E5=85=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/skywalking/web/controller/SearchController.java | 7 +++++-- .../main/webapp/bower_components/skywalking/js/tracelog.js | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java index 84adbbcc9..5619ef7df 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java @@ -10,6 +10,7 @@ import com.ai.cloud.skywalking.web.util.StringUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -17,9 +18,11 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; + import java.util.ArrayList; import java.util.List; @@ -47,9 +50,9 @@ public class SearchController extends BaseController { return ""; } - @RequestMapping(value = "/search/traceId/{traceId:.+}", produces = "application/json; charset=UTF-8") + @RequestMapping(value = "/search/traceId", produces = "application/json; charset=UTF-8") @ResponseBody - public String loadTraceTree(@PathVariable("traceId") String traceId) { + public String loadTraceTree(@RequestParam("traceId") String traceId) { JSONObject jsonObject = new JSONObject(); try { if (StringUtil.isBlank(traceId)) { diff --git a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js index 914d1852d..eca33ae50 100644 --- a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js +++ b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js @@ -88,11 +88,12 @@ function changeData(data) { } function loadTraceTreeData(baseUrl) { - var url = baseUrl + "/search/traceId/" + $("#searchKey").val(); + var url = baseUrl + "/search/traceId"; $.ajax({ type: 'POST', url: url, dataType: 'json', + data: {traceId:$("#searchKey").val()}, async: true, success: function (data) { if (data.code == '200') {