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