From f14763512ead8ed5103198d1f810a77aeef381bd Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Thu, 15 Aug 2024 17:54:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pcap=20webshark=20upload=20error=20?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/geedge/asw/module/feign/FeignClientConfiguration.java | 2 +-
 .../net/geedge/asw/module/feign/client/WebSharkClient.java    | 3 ++-
 .../geedge/asw/module/runner/controller/PcapController.java   | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/feign/FeignClientConfiguration.java b/src/main/java/net/geedge/asw/module/feign/FeignClientConfiguration.java
index a6ab90f..5e18154 100644
--- a/src/main/java/net/geedge/asw/module/feign/FeignClientConfiguration.java
+++ b/src/main/java/net/geedge/asw/module/feign/FeignClientConfiguration.java
@@ -71,7 +71,7 @@ public class FeignClientConfiguration {
         log.info("[webSharkClient] [url: {}]", url);
         return Feign.builder()
                 .encoder(new FormEncoder())
-                //.decoder(new Fastjson2Decoder())
+                .decoder(new Fastjson2Decoder())
                 .client(new Http2Client())
                 .target(WebSharkClient.class, url);
     }
diff --git a/src/main/java/net/geedge/asw/module/feign/client/WebSharkClient.java b/src/main/java/net/geedge/asw/module/feign/client/WebSharkClient.java
index 602b687..0b28e84 100644
--- a/src/main/java/net/geedge/asw/module/feign/client/WebSharkClient.java
+++ b/src/main/java/net/geedge/asw/module/feign/client/WebSharkClient.java
@@ -1,5 +1,6 @@
 package net.geedge.asw.module.feign.client;
 
+import cn.hutool.json.JSONObject;
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
@@ -13,5 +14,5 @@ public interface WebSharkClient {
 
     @RequestLine("POST /webshark/upload")
     @Headers("Content-Type: multipart/form-data")
-    void upload(@Param("fileKey") File file);
+    JSONObject upload(@Param("fileKey") File file);
 }
diff --git a/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java b/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java
index 6f6865e..f7ac873 100644
--- a/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java
+++ b/src/main/java/net/geedge/asw/module/runner/controller/PcapController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.net.url.UrlBuilder;
+import cn.hutool.json.JSONObject;
 import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -143,7 +144,7 @@ public class PcapController {
         File newFile = FileUtil.copy(pcapFile, FileUtil.file(Constants.TEMP_PATH, uploadFileName), false);
         try {
             WebSharkClient webSharkClient = (WebSharkClient) SpringContextUtils.getBean("webSharkClient");
-            webSharkClient.upload(newFile);
+            JSONObject obj = webSharkClient.upload(newFile);
 
             String baseUrl = UrlBuilder.ofHttp(websharkurl)
                     .addPath("/webshark")
@@ -152,6 +153,7 @@ public class PcapController {
             result.put("url", baseUrl);
         }catch (Exception e){
             log.error(e, "webshark upload pcap error, id: {}", pcap.getId());
+            throw new ASWException(RCode.PCAP_UPLOAD_WEB_SHARK_ERROR);
         }finally {
             FileUtil.del(newFile);
         }