kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

使用新的traceid 查询url，避免问题 #45

This commit is contained in:
wusheng 2016-04-12 17:26:56 +08:00
parent 1781d700dd
commit 3c7d4e7891
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/controller/SearchController.java
View File

@ -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)) {

3
skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js vendored
View File

@ -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') {