From 96c9b992af3df91fdcb31a926c2cee7d867abefa Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Mon, 2 Sep 2024 14:38:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20sharkdApi=20=E5=8D=8F=E8=AE=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asw/module/runner/service/impl/PcapServiceImpl.java | 2 +- .../net/geedge/asw/module/runner/util/PcapParserThread.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java index 85ec946..2877a6c 100644 --- a/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/runner/service/impl/PcapServiceImpl.java @@ -61,7 +61,7 @@ import java.util.stream.Collectors; public class PcapServiceImpl extends ServiceImpl implements IPcapService { private static final Log log = Log.get(); - @Value("${sharkdApi.host:127.0.0.1}") + @Value("${sharkdApi.host:http://127.0.0.1}") private String sharkdApiHostAddr; @Autowired diff --git a/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java b/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java index 9cf6588..8ac890a 100644 --- a/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java +++ b/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java @@ -129,7 +129,7 @@ public class PcapParserThread implements Runnable { String pcapId = pcapEntity.getId(); String pcapName = pcapEntity.getName(); - String sharkdApiHostAddr = properties.getProperty("sharkdApiHostAddr", "127.0.0.1"); + String sharkdApiHostAddr = properties.getProperty("sharkdApiHostAddr", "http://127.0.0.1"); for (Object obj : jsonArray) { JSONObject pojo = (JSONObject) obj; pojo.put("pcap.id", pcapId); @@ -139,11 +139,11 @@ public class PcapParserThread implements Runnable { Long streamId = T.MapUtil.getLong(pojo, "stream_id"); if (T.StrUtil.equalsIgnoreCase("tcp", proto)) { pojo.put("pcap.tcp_stream", streamId); - pojo.put("pcap.stream_url", String.format("http://%s/navi/pcap/%s/tcp/%s", sharkdApiHostAddr, pcapId, streamId)); + pojo.put("pcap.stream_url", String.format("%s/navi/pcap/%s/tcp/%s", sharkdApiHostAddr, pcapId, streamId)); } if (T.StrUtil.equalsIgnoreCase("udp", proto)) { pojo.put("pcap.udp_stream", streamId); - pojo.put("pcap.stream_url", String.format("http://%s/navi/pcap/%s/udp/%s", sharkdApiHostAddr, pcapId, streamId)); + pojo.put("pcap.stream_url", String.format("%s/navi/pcap/%s/udp/%s", sharkdApiHostAddr, pcapId, streamId)); } String resp = T.MapUtil.getStr(pojo, "id.resp_h", "");