From 76e52d91e961bfc5388dc336e47aec58d25d0757 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Mon, 12 Aug 2024 14:07:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20application=20explo?=
 =?UTF-8?q?re=20=E6=8E=A5=E5=8F=A3=E7=9B=B8=E5=BA=94=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ApplicationController.java | 11 ++++------
 .../app/service/IApplicationService.java      |  4 +---
 .../service/impl/ApplicationServiceImpl.java  | 22 +++++++------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java b/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java
index a182067..2cb127e 100644
--- a/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java
+++ b/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java
@@ -1,7 +1,6 @@
 package net.geedge.asw.module.app.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.servlet.http.HttpServletResponse;
 import net.geedge.asw.common.util.ASWException;
 import net.geedge.asw.common.util.R;
 import net.geedge.asw.common.util.RCode;
@@ -13,7 +12,6 @@ import net.geedge.asw.module.sys.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -125,11 +123,10 @@ public class ApplicationController {
         return R.ok();
     }
 
-    @GetMapping("/analyze")
-    public void analyze(@RequestParam String workspaceId,
-                        @RequestParam String pcapIds,
-                        HttpServletResponse response) throws IOException {
-        applicationService.redirectDiscoverPage(workspaceId, pcapIds, response);
+    @GetMapping("/explore")
+    public R explore(@RequestParam String workspaceId, @RequestParam String pcapIds) {
+        String discoverUrl = applicationService.generateKibanaDiscoverUrl(workspaceId, pcapIds);
+        return R.ok().putData("url", discoverUrl);
     }
 
 }
diff --git a/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java b/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java
index 032e55f..0de8c3d 100644
--- a/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java
+++ b/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java
@@ -2,10 +2,8 @@ package net.geedge.asw.module.app.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import jakarta.servlet.http.HttpServletResponse;
 import net.geedge.asw.module.app.entity.ApplicationEntity;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +25,6 @@ public interface IApplicationService extends IService<ApplicationEntity>{
 
     void restore(String id, String version);
 
-    void redirectDiscoverPage(String workspaceId, String pcapIds, HttpServletResponse response) throws IOException;
+    String generateKibanaDiscoverUrl(String workspaceId, String pcapIds);
 
 }
diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
index 0e582f2..f334423 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
@@ -2,7 +2,6 @@ package net.geedge.asw.module.app.service.impl;
 
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.log.Log;
 import com.alibaba.fastjson2.JSONArray;
@@ -11,8 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import net.geedge.asw.module.feign.client.KibanaClient;
 import net.geedge.asw.common.util.ASWException;
 import net.geedge.asw.common.util.RCode;
 import net.geedge.asw.common.util.T;
@@ -21,6 +18,7 @@ import net.geedge.asw.module.app.entity.ApplicationEntity;
 import net.geedge.asw.module.app.entity.ApplicationLogEntity;
 import net.geedge.asw.module.app.service.IApplicationLogService;
 import net.geedge.asw.module.app.service.IApplicationService;
+import net.geedge.asw.module.feign.client.KibanaClient;
 import net.geedge.asw.module.runner.entity.PcapEntity;
 import net.geedge.asw.module.runner.service.IPcapService;
 import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
@@ -30,7 +28,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -184,11 +181,10 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, Applicat
      * }
      * @param workspaceId
      * @param pcapIds
-     * @param response
-     * @throws IOException
+     * @return kibana discover url
      */
     @Override
-    public void redirectDiscoverPage(String workspaceId, String pcapIds, HttpServletResponse response) throws IOException {
+    public String generateKibanaDiscoverUrl(String workspaceId, String pcapIds) {
         // verify
         WorkspaceEntity workspace = workspaceService.getById(workspaceId);
         T.VerifyUtil.is(workspace).notNull(RCode.SYS_RECORD_NOT_FOUND);
@@ -217,7 +213,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, Applicat
                 .findFirst()
                 .isPresent();
         if (log.isDebugEnabled()) {
-            log.debug("[redirectDiscoverPage] [idnex-pattern: {}] [exists: {}]", indexName, indexExists);
+            log.debug("[generateKibanaDiscoverUrl] [idnex-pattern: {}] [exists: {}]", indexName, indexExists);
         }
 
         // create index
@@ -247,13 +243,11 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, Applicat
         String param3 = String.format("_q=(filters:!(),query:(language:lucene,query:'%s'))", source);
 
         String query = String.format("?%s&%s&%s", param1, param2, param3);
-        String redirectUrl = baseUrl + "#" + query;
+        String kibanaDiscoverUrl = baseUrl + "#" + query;
 
-        if(log.isDebugEnabled()){
-            log.debug("[redirectDiscoverPage] [url: {}]", redirectUrl);
+        if (log.isDebugEnabled()) {
+            log.debug("[generateKibanaDiscoverUrl] [url: {}]", kibanaDiscoverUrl);
         }
-
-        // redirect
-        response.sendRedirect(redirectUrl);
+        return kibanaDiscoverUrl;
     }
 }