gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整 application explore 接口相应内容

Browse Source
This commit is contained in:
shizhendong
2024-08-12 14:07:09 +08:00
parent f3d048c240
commit 76e52d91e9
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java
View File

@@ -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);
}
}

4
src/main/java/net/geedge/asw/module/app/service/IApplicationService.java
View File

@@ -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);
}

20
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
View File

@@ -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);
log.debug("[generateKibanaDiscoverUrl] [url: {}]", kibanaDiscoverUrl);
}
// redirect
response.sendRedirect(redirectUrl);
return kibanaDiscoverUrl;
}
}