Compare commits
1 Commits
applicatio
...
dev-applic
| Author | SHA1 | Date | |
|---|---|---|---|
|
e675144a6c |
27
pom.xml
27
pom.xml
@@ -179,33 +179,6 @@
|
||||
<version>2.12.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jgit</groupId>
|
||||
<artifactId>org.eclipse.jgit</artifactId>
|
||||
<version>7.0.0.202409031743-r</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit.archive -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jgit</groupId>
|
||||
<artifactId>org.eclipse.jgit.archive</artifactId>
|
||||
<version>7.0.0.202409031743-r</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
|
||||
<dependency>
|
||||
<groupId>net.lingala.zip4j</groupId>
|
||||
<artifactId>zip4j</artifactId>
|
||||
<version>2.11.5</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import net.geedge.asw.common.util.T;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
@Configuration
|
||||
public class FreeMarkerConfig {
|
||||
|
||||
@Value("${asw.template.path:static}")
|
||||
private String templatePath;
|
||||
|
||||
@Bean
|
||||
public FreeMarkerConfigurationFactoryBean factoryBean() {
|
||||
FreeMarkerConfigurationFactoryBean freeMarkerConfigurationFactoryBean = new FreeMarkerConfigurationFactoryBean();
|
||||
// 设置 FreeMarker 模板位置
|
||||
boolean exist = T.FileUtil.exist(templatePath);
|
||||
templatePath = exist ? templatePath : "classpath:" + templatePath;
|
||||
freeMarkerConfigurationFactoryBean.setTemplateLoaderPath(templatePath);
|
||||
|
||||
// 其他配置
|
||||
Properties settings = new Properties();
|
||||
settings.setProperty("default_encoding", "utf-8");
|
||||
settings.setProperty("number_format", "0.##");
|
||||
|
||||
freeMarkerConfigurationFactoryBean.setFreemarkerSettings(settings);
|
||||
return freeMarkerConfigurationFactoryBean;
|
||||
}
|
||||
}
|
||||
@@ -1,15 +1,11 @@
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.DbType;
|
||||
import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
|
||||
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
import com.baomidou.mybatisplus.annotation.DbType;
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
public class MybatisPlusConfig {
|
||||
@@ -23,29 +19,4 @@ public class MybatisPlusConfig {
|
||||
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MARIADB));//如果配置多个插件,切记分页最后添加
|
||||
return interceptor;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public IdentifierGenerator identifierGenerator() {
|
||||
return new IdentifierGenerator() {
|
||||
|
||||
@Override
|
||||
public Number nextId(Object entity) {
|
||||
return DefaultIdentifierGenerator.getInstance().nextId(entity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 自定义 UUID 生成格式，带有中划线，示例格式：c2ce91d1-d1f4-4629-aae4-414df36d87ca
|
||||
*
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String nextUUID(Object entity) {
|
||||
ThreadLocalRandom random = ThreadLocalRandom.current();
|
||||
return (new UUID(random.nextLong(), random.nextLong())).toString();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
public class Query {
|
||||
|
||||
private Class clz;
|
||||
|
||||
public Class<? extends Object> getClz() {
|
||||
return clz;
|
||||
}
|
||||
|
||||
public void setClz(Class clz) {
|
||||
this.clz = clz;
|
||||
}
|
||||
|
||||
public Query(Class clz) {
|
||||
this.clz = clz;
|
||||
}
|
||||
|
||||
public Page getPage(Map<String, Object> params) {
|
||||
return this.getPage(params, null, false);
|
||||
}
|
||||
|
||||
public Page getPage(Map<String, Object> params, String defaultOrderField, boolean isAsc) {
|
||||
//分页参数
|
||||
long curPage = 1;
|
||||
long limit = Constants.PAGESIZE;
|
||||
|
||||
if(params.get(Constants.PAGE) != null){
|
||||
curPage = Long.parseLong((String)params.get(Constants.PAGE));
|
||||
}
|
||||
if(params.get(Constants.LIMIT) != null){
|
||||
limit = Long.parseLong((String)params.get(Constants.LIMIT));
|
||||
if(limit == -1){
|
||||
limit = Long.MAX_VALUE;
|
||||
curPage = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//分页对象
|
||||
Page page = new Page(curPage, limit);
|
||||
|
||||
//分页参数
|
||||
params.put(Constants.PAGE, page);
|
||||
|
||||
//排序字段 orderBy=id
|
||||
//防止SQL注入（因为sidx、order是通过拼接SQL实现排序的，会有SQL注入风险）
|
||||
String orderField = SQLFilter.sqlInject((String)params.get(Constants.ORDER));
|
||||
|
||||
if (StrUtil.isNotEmpty(orderField)) {
|
||||
boolean matcheFlag = orderField.trim().matches("-?[a-zA-Z_.-]+");
|
||||
if (!matcheFlag) {
|
||||
throw new ASWException(RCode.ERROR);
|
||||
}
|
||||
|
||||
// 获取表名
|
||||
Class<?> clz = this.getClz();
|
||||
String tableName = "";
|
||||
if (clz != null) {
|
||||
TableName table = this.getClz().getAnnotation(TableName.class);
|
||||
tableName = table.value();
|
||||
}
|
||||
// 通过表名获取排序字段映射
|
||||
Map<String, String> columnAliasMap = Constants.TABLE_NAME_ORDER_FIELD_MAPPING.get(tableName);
|
||||
columnAliasMap = T.MapUtil.isEmpty(columnAliasMap) ? new HashMap<>():columnAliasMap;
|
||||
if (orderField.startsWith("-")) {
|
||||
orderField = orderField.substring(1, orderField.length());
|
||||
orderField = columnAliasMap.get(orderField) != null ? columnAliasMap.get(orderField) : orderField;
|
||||
return page.addOrder(OrderItem.desc(orderField));
|
||||
} else {
|
||||
orderField = columnAliasMap.get(orderField) != null ? columnAliasMap.get(orderField) : orderField;
|
||||
return page.addOrder(OrderItem.asc(orderField));
|
||||
}
|
||||
}
|
||||
|
||||
// 默认排序
|
||||
if (StrUtil.isNotEmpty(defaultOrderField)) {
|
||||
if (isAsc) {
|
||||
return page.addOrder(OrderItem.asc(defaultOrderField));
|
||||
} else {
|
||||
return page.addOrder(OrderItem.desc(defaultOrderField));
|
||||
}
|
||||
}
|
||||
|
||||
return page;
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* SQL过滤
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class SQLFilter {
|
||||
|
||||
private static String reg = "(?:')|(?:--)|(/\\*(?:.|[\\n\\r])*?\\*/)|(\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b)";
|
||||
|
||||
private static Pattern sqlPattern = Pattern.compile(reg, Pattern.CASE_INSENSITIVE);
|
||||
|
||||
/**
|
||||
* SQL注入过滤
|
||||
* @param str 待验证的字符串
|
||||
*/
|
||||
public static String sqlInject(String str) {
|
||||
if (T.StrUtil.isBlank(str)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
//转换成小写
|
||||
String str1 = str.toLowerCase();
|
||||
|
||||
String s = "";
|
||||
if (str1.startsWith("-")) {
|
||||
s = str1.substring(1);
|
||||
} else {
|
||||
s = str1;
|
||||
}
|
||||
|
||||
if (sqlPattern.matcher(s).matches()) {
|
||||
throw new ASWException(RCode.ERROR);
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
}
|
||||
@@ -1,109 +0,0 @@
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.http.Method;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.util.JobQueueManager;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.runner.util.RunnerConstant;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* setup初始化操作
|
||||
*/
|
||||
@Component
|
||||
public class SetupRunner implements CommandLineRunner{
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Autowired
|
||||
private JobQueueManager jobQueueManager;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
log.info("Setup inited");
|
||||
List<JobEntity> pendingJobs = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, RunnerConstant.JobStatus.PENDING.getValue()));
|
||||
pendingJobs.forEach(jobQueueManager::addJob);
|
||||
log.info("[SetupRunner] [init pending job to JobQueueManager]");
|
||||
|
||||
|
||||
log.info("[SetupRunner] [begin interrupted running job]");
|
||||
List<JobEntity> runningJobs = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, RunnerConstant.JobStatus.RUNNING.getValue()));
|
||||
for (JobEntity runningJob : runningJobs) {
|
||||
String id = runningJob.getId();
|
||||
EnvironmentEntity environment = environmentService.getById(runningJob.getEnvId());
|
||||
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
|
||||
HttpRequest requestStatus = T.HttpUtil.createGet(String.format("%s/api/v1/env/playbook/%s", url, runningJob.getId()));
|
||||
requestStatus.header("Authorization", token);
|
||||
|
||||
HttpResponse response = requestStatus.execute();
|
||||
if (response.isOk()){
|
||||
String body = response.body();
|
||||
JSONObject result = T.JSONUtil.toBean(body, JSONObject.class);
|
||||
JSONObject data = result.getJSONObject("data");
|
||||
String status = data.getStr("status");
|
||||
if (RunnerConstant.JobStatus.RUNNING.getValue().equals(status)){
|
||||
HttpRequest request = T.HttpUtil.createRequest(Method.DELETE, String.format("%s/api/v1/env/playbook/%s", url, runningJob.getId()));
|
||||
request.header("Authorization", token);
|
||||
request.execute();
|
||||
}
|
||||
}
|
||||
|
||||
Thread runningThread = Constants.RUNNING_JOB_THREAD.get(id);
|
||||
if (runningThread != null) {
|
||||
runningThread.interrupt();
|
||||
}
|
||||
|
||||
Thread resultThread = Constants.RESULT_JOB_THREAD.get(id);
|
||||
if (resultThread != null) {
|
||||
resultThread.interrupt();
|
||||
}
|
||||
EnvironmentSessionEntity session = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getJobId, id)
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
|
||||
if (T.ObjectUtil.isNotEmpty(session)) {
|
||||
environmentService.removeSession(session.getId());
|
||||
}
|
||||
|
||||
T.FileUtil.appendString("Job execution interrupted.", FileUtil.file(runningJob.getLogPath()), "UTF-8");
|
||||
|
||||
// update state
|
||||
jobService.update(new LambdaUpdateWrapper<JobEntity>()
|
||||
.eq(JobEntity::getId, id)
|
||||
.set(JobEntity::getStatus, "failed")
|
||||
);
|
||||
}
|
||||
|
||||
log.info("[SetupRunner] [interrupted running job end!]");
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package net.geedge.asw.common.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
@Configuration
|
||||
public class ThreadPoolConfig {
|
||||
|
||||
@Bean
|
||||
public ExecutorService virtualThreadExecutor() {
|
||||
return Executors.newVirtualThreadPerTaskExecutor();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
package net.geedge.asw.common.config.job;
|
||||
|
||||
import cn.hutool.log.Log;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.job.JobEnvironmentStatusChecker;
|
||||
import net.geedge.asw.module.runner.job.JobPlaybookExecResultChecker;
|
||||
import net.geedge.asw.module.runner.job.JobPlaybookExecutor;
|
||||
import net.geedge.asw.module.sys.service.ISysConfigService;
|
||||
import org.quartz.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.env.Environment;
|
||||
|
||||
import java.util.TimeZone;
|
||||
|
||||
@Configuration
|
||||
public class JobConfig {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
private static final String JOB_NAME_PREFIX = "ASW_JOB";
|
||||
private static final String JOB_DEFAULT_GROUP = "SYSTEM";
|
||||
|
||||
/**
|
||||
* get job key
|
||||
* job_name=ASW_JOB_{name}
|
||||
* group_name=SYSTEM
|
||||
*/
|
||||
private static JobKey getJobKey(String name) {
|
||||
String jobName = T.StrUtil.concat(true, JOB_NAME_PREFIX, "_", name);
|
||||
return new JobKey(jobName, JOB_DEFAULT_GROUP);
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private Scheduler scheduler;
|
||||
|
||||
@Autowired
|
||||
private Environment environment;
|
||||
|
||||
@Autowired
|
||||
private ISysConfigService sysConfigService;
|
||||
|
||||
@Bean
|
||||
public JobDetail JobEnvironmentStatusChecker() {
|
||||
return JobBuilder.newJob(JobEnvironmentStatusChecker.class)
|
||||
.withIdentity(getJobKey(JobEnvironmentStatusChecker.class.getSimpleName()))
|
||||
.storeDurably()
|
||||
.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public JobDetail JobPlaybookExecutor() {
|
||||
return JobBuilder.newJob(JobPlaybookExecutor.class)
|
||||
.withIdentity(getJobKey(JobPlaybookExecutor.class.getSimpleName()))
|
||||
.storeDurably()
|
||||
.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public JobDetail JobPlaybookExecResultChecker() {
|
||||
return JobBuilder.newJob(JobPlaybookExecResultChecker.class)
|
||||
.withIdentity(getJobKey(JobPlaybookExecResultChecker.class.getSimpleName()))
|
||||
.storeDurably()
|
||||
.build();
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
public void init() throws SchedulerException {
|
||||
// JobEnvironmentStatusChecker
|
||||
createCronScheduleJob(JobEnvironmentStatusChecker(), environment.getProperty("asw.cron.JobEnvironmentStatusChecker", "0 0/1 * * * ? *"));
|
||||
// JobPlaybookExecutor
|
||||
createCronScheduleJob(JobPlaybookExecutor(), environment.getProperty("asw.cron.JobPlaybookExecutor", "0/30 * * * * ?"));
|
||||
// JobPlaybookExecResultChecker
|
||||
createCronScheduleJob(JobPlaybookExecResultChecker(), environment.getProperty("asw.cron.JobPlaybookExecResultChecker", "0/10 * * * * ?"));
|
||||
}
|
||||
|
||||
/**
|
||||
* create cron schedule job
|
||||
* 先删后增
|
||||
*/
|
||||
private void createCronScheduleJob(JobDetail jobDetail, String cronExpression) throws SchedulerException {
|
||||
JobKey key = jobDetail.getKey();
|
||||
|
||||
boolean jobExists = scheduler.checkExists(key);
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[createCronScheduleJob] [key: {}] [exists: {}]", key.toString(), jobExists);
|
||||
}
|
||||
if (jobExists) {
|
||||
scheduler.deleteJob(key);
|
||||
log.debug("[createCronScheduleJob] [key: {}] [deleted]", key.toString());
|
||||
}
|
||||
|
||||
String timezone = sysConfigService.getValue("timezone");
|
||||
CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(cronExpression).inTimeZone(TimeZone.getTimeZone(timezone));
|
||||
|
||||
CronTrigger cronTrigger = TriggerBuilder.newTrigger()
|
||||
.forJob(jobDetail)
|
||||
.withSchedule(cronScheduleBuilder)
|
||||
.build();
|
||||
scheduler.scheduleJob(jobDetail, cronTrigger);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,204 +0,0 @@
|
||||
package net.geedge.asw.common.config.websocket;
|
||||
|
||||
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.socket.*;
|
||||
import org.springframework.web.socket.handler.TextWebSocketHandler;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.WebSocket;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.CompletionStage;
|
||||
|
||||
@Component
|
||||
public class EnvironmentNovncWebSocketHandler extends TextWebSocketHandler {
|
||||
private static final Log log = Log.get();
|
||||
|
||||
/**
|
||||
* env id
|
||||
*/
|
||||
private String envId;
|
||||
/**
|
||||
* session
|
||||
*/
|
||||
private String sessionId;
|
||||
|
||||
/**
|
||||
* user id
|
||||
*/
|
||||
private String userId;
|
||||
|
||||
private long lastReceivedTime;
|
||||
|
||||
private Integer sessionTimeout;
|
||||
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
public EnvironmentNovncWebSocketHandler() {
|
||||
}
|
||||
public EnvironmentNovncWebSocketHandler(IEnvironmentService deviceService, IEnvironmentSessionService environmentSessionService, Integer sessionTimeout) {
|
||||
this.environmentService = deviceService;
|
||||
this.environmentSessionService = environmentSessionService;
|
||||
this.sessionTimeout = sessionTimeout;
|
||||
}
|
||||
|
||||
private void initFieldVal(WebSocketSession session) {
|
||||
this.envId = (String) session.getAttributes().get("envId");
|
||||
this.sessionId = (String) session.getAttributes().get("sessionId");
|
||||
this.userId = (String) session.getAttributes().get("userId");
|
||||
Constants.ENV_NOVNC_WEBSOCKET_SESSION.put(sessionId, session);
|
||||
lastReceivedTime = System.currentTimeMillis(); // 初始化接收时间
|
||||
Thread checkSessionTimeout = startConnectionMonitor(session);
|
||||
session.getAttributes().put("checkSessionTimeoutThread", checkSessionTimeout);
|
||||
}
|
||||
|
||||
private Thread startConnectionMonitor(WebSocketSession session) {
|
||||
Thread thread = Thread.ofVirtual().start(() -> {
|
||||
while (true) {
|
||||
try {
|
||||
if (System.currentTimeMillis() - lastReceivedTime > sessionTimeout) {
|
||||
if (session.isOpen()) {
|
||||
log.info("current no connection info, clean no real use connection finshed, sessionId: {}", sessionId);
|
||||
|
||||
// update session status
|
||||
environmentSessionService.update(new LambdaUpdateWrapper<EnvironmentSessionEntity>()
|
||||
.set(EnvironmentSessionEntity::getStatus, 2)
|
||||
.eq(EnvironmentSessionEntity::getId, sessionId));
|
||||
|
||||
session.close(CloseStatus.NORMAL.withReason("current no connection info, clean no real use connection finshed."));
|
||||
break;
|
||||
}
|
||||
}
|
||||
Thread.sleep(300000);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
break;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "Error clean no real use connection");
|
||||
}
|
||||
}
|
||||
});
|
||||
return thread;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
|
||||
super.afterConnectionEstablished(session);
|
||||
this.initFieldVal(session);
|
||||
// token
|
||||
if (T.StrUtil.isEmpty(userId)) {
|
||||
log.warn("Websocket token authentication failed");
|
||||
session.close(CloseStatus.NORMAL.withReason("Websocket token authentication failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
// env session
|
||||
EnvironmentSessionEntity environmentSession = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getId, sessionId).eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
if (environmentSession == null) {
|
||||
log.warn("environment session does not exist. session id: {}", sessionId);
|
||||
session.close(CloseStatus.NORMAL.withReason("Environment session does not exist"));
|
||||
return;
|
||||
}
|
||||
log.info("WebSocket connectioned. after connection established open environment begin... environment id: {}", envId);
|
||||
EnvironmentEntity deviceEntity = environmentService.queryInfo(envId);
|
||||
JSONObject paramJSONObject = deviceEntity.getParamJSONObject();
|
||||
|
||||
String urlStr = String.format("%s%s", paramJSONObject.getStr("url"), Constants.ENV_NOVNC_WEBSOCKET_PATH);
|
||||
urlStr = urlStr.replace("http", "ws");
|
||||
WebSocket webSocket = null;
|
||||
try {
|
||||
HttpClient client = HttpClient.newHttpClient();
|
||||
webSocket = client.newWebSocketBuilder()
|
||||
.buildAsync(URI.create(urlStr), new WebSocketListener(session))
|
||||
.get();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "Environment WebSocket connectioned. after connection established open environment error. session id: {}", sessionId);
|
||||
if (ObjectUtil.isNotNull(webSocket)) {
|
||||
webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "Normal closure");
|
||||
}
|
||||
if (session != null) {
|
||||
session.close(CloseStatus.NORMAL.withReason("Environment WebSocket connectioned. after connection established open environment error!"));
|
||||
IoUtil.close(session);
|
||||
Constants.ENV_NOVNC_WEBSOCKET_SESSION.remove(sessionId);
|
||||
}
|
||||
}
|
||||
log.info("[afterConnectionEstablished] [environment server: {}]", T.JSONUtil.toJsonStr(paramJSONObject));
|
||||
session.getAttributes().put("envWebsocket", webSocket);
|
||||
}
|
||||
|
||||
// WebSocket 监听器实现
|
||||
private static class WebSocketListener implements WebSocket.Listener {
|
||||
private WebSocketSession session;
|
||||
|
||||
public WebSocketListener(WebSocketSession session) {
|
||||
this.session = session;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public CompletionStage<?> onBinary(WebSocket webSocket, ByteBuffer data, boolean last) {
|
||||
|
||||
try {
|
||||
// env -> asw
|
||||
session.sendMessage(new BinaryMessage(data, true));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return WebSocket.Listener.super.onBinary(webSocket, data, last);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String reason) {
|
||||
log.info("Environment webSocket connection closed, Status: " + statusCode + ", Reason: " + reason);
|
||||
return WebSocket.Listener.super.onClose(webSocket, statusCode, reason);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void handleBinaryMessage(WebSocketSession session, BinaryMessage message) {
|
||||
try {
|
||||
// asw -> env
|
||||
WebSocket envSocket = (WebSocket) session.getAttributes().get("envWebsocket");
|
||||
if (envSocket != null) {
|
||||
envSocket.sendBinary(message.getPayload(), true);
|
||||
lastReceivedTime = System.currentTimeMillis(); // 更新接收时间
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[handleBinaryMessage] [error]");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
|
||||
log.info("[afterConnectionClosed] [WebSocket connection closed] [websocket uri: {}]", session.getUri());
|
||||
WebSocket envWebsocket = (WebSocket) session.getAttributes().get("envWebsocket");
|
||||
if (envWebsocket != null) {
|
||||
envWebsocket.sendClose(WebSocket.NORMAL_CLOSURE, "Normal closure");
|
||||
}
|
||||
|
||||
Thread checkSessionTimeoutThread = (Thread) session.getAttributes().get("checkSessionTimeoutThread");
|
||||
if (checkSessionTimeoutThread != null) {
|
||||
checkSessionTimeoutThread.interrupt();
|
||||
}
|
||||
Constants.ENV_NOVNC_WEBSOCKET_SESSION.remove(sessionId);
|
||||
super.afterConnectionClosed(session, status);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,160 +0,0 @@
|
||||
package net.geedge.asw.common.config.websocket;
|
||||
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.socket.CloseStatus;
|
||||
import org.springframework.web.socket.TextMessage;
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
import org.springframework.web.socket.handler.TextWebSocketHandler;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.WebSocket;
|
||||
import java.util.concurrent.CompletionStage;
|
||||
|
||||
@Component
|
||||
public class EnvironmentTerminalWebSocketHandler extends TextWebSocketHandler {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
/**
|
||||
* env id
|
||||
*/
|
||||
private String envId;
|
||||
|
||||
/**
|
||||
* session
|
||||
*/
|
||||
private String sessionId;
|
||||
|
||||
/**
|
||||
* user id
|
||||
*/
|
||||
private String userId;
|
||||
|
||||
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
public EnvironmentTerminalWebSocketHandler(IEnvironmentService environmentService, IEnvironmentSessionService environmentSessionService) {
|
||||
this.environmentService = environmentService;
|
||||
this.environmentSessionService = environmentSessionService;
|
||||
}
|
||||
|
||||
private void initFieldVal(WebSocketSession session) {
|
||||
this.envId = (String) session.getAttributes().get("envId");
|
||||
this.sessionId = (String) session.getAttributes().get("sessionId");
|
||||
this.userId = (String) session.getAttributes().get("userId");
|
||||
Constants.ENV_TERMINAL_WEBSOCKET_SESSION.put(sessionId, session);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
|
||||
super.afterConnectionEstablished(session);
|
||||
|
||||
this.initFieldVal(session);
|
||||
// token
|
||||
if (T.StrUtil.isEmpty(userId)) {
|
||||
log.warn("Websocket token authentication failed");
|
||||
session.close(CloseStatus.NORMAL.withReason("Websocket token authentication failed"));
|
||||
return;
|
||||
}
|
||||
|
||||
// env session
|
||||
EnvironmentSessionEntity environmentSession = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getId, sessionId).eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
if (environmentSession == null) {
|
||||
log.warn("environment session does not exist. session id: {}", sessionId);
|
||||
session.close(CloseStatus.NORMAL.withReason("Environment session does not exist"));
|
||||
return;
|
||||
}
|
||||
log.info("WebSocket connectioned. after connection established open environment terminal begin... environment id: {}", envId);
|
||||
EnvironmentEntity deviceEntity = environmentService.queryInfo(envId);
|
||||
JSONObject paramJSONObject = deviceEntity.getParamJSONObject();
|
||||
|
||||
String urlStr = String.format("%s%s", paramJSONObject.getStr("url"), Constants.ENV_TERMINAL_WEBSOCKET_PATH);
|
||||
urlStr = urlStr.replace("http", "ws");
|
||||
WebSocket webSocket = null;
|
||||
try {
|
||||
HttpClient client = HttpClient.newHttpClient();
|
||||
webSocket = client.newWebSocketBuilder()
|
||||
.buildAsync(URI.create(urlStr), new WebSocketListener(session))
|
||||
.get();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "Environment terminal webSocket connectioned. after connection established open environment terminal error. session id: {}", sessionId);
|
||||
if (ObjectUtil.isNotNull(webSocket)) {
|
||||
webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "Normal closure");
|
||||
}
|
||||
if (ObjectUtil.isNotNull(session)) {
|
||||
session.close(CloseStatus.NORMAL.withReason("Environment terminal webSocket connectioned. after connection established open environment terminal error!"));
|
||||
IoUtil.close(session);
|
||||
Constants.ENV_TERMINAL_WEBSOCKET_SESSION.remove(sessionId);
|
||||
}
|
||||
}
|
||||
log.info("[afterConnectionEstablished] [environment terminal url: {}]", urlStr);
|
||||
session.getAttributes().put("terminalWebsocket", webSocket);
|
||||
}
|
||||
|
||||
|
||||
// WebSocket 监听器实现
|
||||
private static class WebSocketListener implements WebSocket.Listener {
|
||||
private WebSocketSession session;
|
||||
|
||||
public WebSocketListener(WebSocketSession session) {
|
||||
this.session = session;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public CompletionStage<?> onText(WebSocket webSocket, CharSequence message, boolean last) {
|
||||
try {
|
||||
// env -> asw
|
||||
session.sendMessage(new TextMessage(message));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return WebSocket.Listener.super.onText(webSocket, message, last);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String reason) {
|
||||
log.info("Environment terminal webSocket connection closed, Status: " + statusCode + ", Reason: " + reason);
|
||||
return WebSocket.Listener.super.onClose(webSocket, statusCode, reason);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void handleTextMessage(WebSocketSession session, TextMessage message) {
|
||||
WebSocket terminalWebsocket = (WebSocket) session.getAttributes().get("terminalWebsocket");
|
||||
try {
|
||||
if (terminalWebsocket != null) {
|
||||
terminalWebsocket.sendText(message.getPayload(), true);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
|
||||
log.info("[afterConnectionClosed] [Terminal webSocket connection closed] [uri: {}]", session.getUri());
|
||||
WebSocket envWebsocket = (WebSocket) session.getAttributes().get("terminalWebsocket");
|
||||
if (envWebsocket != null) {
|
||||
envWebsocket.sendClose(WebSocket.NORMAL_CLOSURE, "Normal closure");
|
||||
}
|
||||
|
||||
Constants.ENV_TERMINAL_WEBSOCKET_SESSION.remove(sessionId);
|
||||
super.afterConnectionClosed(session, status);
|
||||
}
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package net.geedge.asw.common.config.websocket;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import org.springframework.http.server.ServerHttpRequest;
|
||||
import org.springframework.http.server.ServerHttpResponse;
|
||||
import org.springframework.http.server.ServletServerHttpRequest;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.socket.WebSocketHandler;
|
||||
import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
|
||||
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@Component
|
||||
public class EnvironmentWebSocketInterceptor extends HttpSessionHandshakeInterceptor {
|
||||
private static final Log log = Log.get();
|
||||
|
||||
private String regex = "^/api/v1/env/([^/]+)/session/([^/]+)/(novnc|terminal)$";
|
||||
|
||||
@Override
|
||||
public synchronized boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
|
||||
if (request instanceof ServletServerHttpRequest) {
|
||||
ServletServerHttpRequest servletRequest = (ServletServerHttpRequest) request;
|
||||
String servletPath = servletRequest.getServletRequest().getServletPath();
|
||||
Pattern pattern = Pattern.compile(regex);
|
||||
Matcher matcher = pattern.matcher(servletPath);
|
||||
if (matcher.find()) {
|
||||
attributes.put("envId", matcher.group(1));
|
||||
attributes.put("sessionId", matcher.group(2));
|
||||
}
|
||||
try {
|
||||
String token = servletRequest.getServletRequest().getParameter("token");
|
||||
StpUtil.setTokenValue(token);
|
||||
String userId = StpUtil.getLoginIdAsString();
|
||||
attributes.put("userId", userId);
|
||||
}catch (Exception e){
|
||||
log.error("Websocket token authentication failed");
|
||||
attributes.put("userId", T.StrUtil.EMPTY);
|
||||
}
|
||||
}
|
||||
return super.beforeHandshake(request, response, wsHandler, attributes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
|
||||
super.afterHandshake(request, response, wsHandler, exception);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package net.geedge.asw.common.config.websocket;
|
||||
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.socket.config.annotation.EnableWebSocket;
|
||||
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
|
||||
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
|
||||
|
||||
@Configuration
|
||||
@EnableWebSocket
|
||||
public class WebSocketConfig implements WebSocketConfigurer {
|
||||
|
||||
|
||||
@Value("${session.timeout:1800000}") // 默认为 30 分钟
|
||||
private Integer sessionTimeout;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService deviceService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Override
|
||||
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
|
||||
registry.addHandler(new EnvironmentNovncWebSocketHandler(deviceService, environmentSessionService, sessionTimeout), "/api/v1/env/{envId}/session/{sessionId}/novnc")
|
||||
.addInterceptors(new EnvironmentWebSocketInterceptor())
|
||||
.setAllowedOrigins("*");
|
||||
|
||||
registry.addHandler(new EnvironmentTerminalWebSocketHandler(deviceService, environmentSessionService), "/api/v1/env/{envId}/session/{sessionId}/terminal")
|
||||
.addInterceptors(new EnvironmentWebSocketInterceptor())
|
||||
.setAllowedOrigins("*");
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,7 @@
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class Constants {
|
||||
|
||||
@@ -20,7 +15,6 @@ public class Constants {
|
||||
*/
|
||||
public static final String TEMP_PATH = System.getProperty("user.dir") + File.separator + "tmp";
|
||||
|
||||
|
||||
/**
|
||||
* 国际化语言列表
|
||||
*/
|
||||
@@ -32,132 +26,4 @@ public class Constants {
|
||||
*/
|
||||
public static final List<String> VISIBILITY_LIST = T.ListUtil.of("public", "private");
|
||||
|
||||
/**
|
||||
* 当前页码
|
||||
*/
|
||||
public static final String PAGE = "current";
|
||||
/**
|
||||
* 每页显示记录数
|
||||
*/
|
||||
public static final String LIMIT = "size";
|
||||
/**
|
||||
* 每页显示条数
|
||||
*/
|
||||
public static final long PAGESIZE = 20;
|
||||
/**
|
||||
* 排序方式
|
||||
*/
|
||||
public static final String ORDER = "orderBy";
|
||||
/**
|
||||
* 表名 和 排序字段对应关系 KEY: tablename
|
||||
*/
|
||||
public static final Map<String, Map<String, String>> TABLE_NAME_ORDER_FIELD_MAPPING = T.MapUtil.newHashMap();
|
||||
|
||||
static {
|
||||
Map<String, String> applicationOrderFieldMap = new HashMap<>();
|
||||
TABLE_NAME_ORDER_FIELD_MAPPING.put("application", applicationOrderFieldMap);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* env api path prefix
|
||||
*/
|
||||
public static final String ENV_API_PREFIX = "/api/v1/env";
|
||||
|
||||
public static final String AUTH_TOKEN_CODE = "Authorization";
|
||||
|
||||
|
||||
public static final Map<String, String> CORS_HEADER = T.MapUtil
|
||||
.builder("Access-Control-Allow-Credentials", "true")
|
||||
.put("Access-Control-Allow-Methods", "GET,PUT,POST,PATCH,DELETE,HEAD,OPTIONS")
|
||||
.put("Access-Control-Max-Age", "18000").put("Access-Control-Allow-Origin", "*").build();
|
||||
|
||||
|
||||
/**
|
||||
* env api novnc websocket path
|
||||
*/
|
||||
public static final String ENV_NOVNC_WEBSOCKET_PATH = "/api/v1/env/novnc";
|
||||
|
||||
public static final String ENV_TERMINAL_WEBSOCKET_PATH = "/api/v1/env/terminal";
|
||||
|
||||
/**
|
||||
* env api stop tcpdump path
|
||||
*/
|
||||
public static final String ENV_API_TCPDUMP_PATH = "/api/v1/env/pcap";
|
||||
|
||||
/**
|
||||
* env api status path
|
||||
*/
|
||||
public static final String ENV_API_STATUS_PATH = "/api/v1/env/status";
|
||||
|
||||
/**
|
||||
* novnc websocket 连接信息对应的 env session id 用以进行主动断开服务器连接功能
|
||||
*/
|
||||
public static final Map<String, WebSocketSession> ENV_NOVNC_WEBSOCKET_SESSION = T.MapUtil.newHashMap();
|
||||
|
||||
/**
|
||||
* terminal websocket 连接信息对应的 env session id 用以进行主动断开服务器连接功能
|
||||
*/
|
||||
public static final Map<String, WebSocketSession> ENV_TERMINAL_WEBSOCKET_SESSION = T.MapUtil.newHashMap();
|
||||
|
||||
|
||||
public static final ConcurrentHashMap<String, Thread> RUNNING_JOB_THREAD = new ConcurrentHashMap<>();
|
||||
|
||||
public static final ConcurrentHashMap<String, Thread> RESULT_JOB_THREAD = new ConcurrentHashMap<>();
|
||||
|
||||
|
||||
/**
|
||||
* Android package type
|
||||
*/
|
||||
public static final List<String> ANDROID_PACKAGE_TYPE_LIST = T.ListUtil.of("xapk", "apk");
|
||||
|
||||
public static final String EMPTY_FILE_MD5 = "d41d8cd98f00b204e9800998ecf8427e";
|
||||
|
||||
/**
|
||||
* 系统内置角色
|
||||
*/
|
||||
public static enum BuiltInRoleEnum {
|
||||
OWNER("owner"),
|
||||
|
||||
MAINTAINER("maintainer"),
|
||||
|
||||
DEVELOPER("developer"),
|
||||
|
||||
GUEST("guest");
|
||||
|
||||
private String id;
|
||||
|
||||
BuiltInRoleEnum(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 文件类型
|
||||
*/
|
||||
public static enum FileTypeEnum {
|
||||
PCAP("pcap"),
|
||||
|
||||
PACKAGE("package"),
|
||||
|
||||
PLAYBOOK("playbook"),
|
||||
|
||||
JOB("job"),
|
||||
|
||||
RELEASE("release");
|
||||
|
||||
private String type;
|
||||
|
||||
FileTypeEnum(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class FileResourceUtil {
|
||||
|
||||
private static String ROOT_PATH = T.WebPathUtil.getRootPath();
|
||||
|
||||
public static File createFile(String resourcePath, String workspaceId, String type, String id, String name) {
|
||||
String sub = T.StrUtil.sub(id, 0, 2);
|
||||
File file = T.FileUtil.file(ROOT_PATH, resourcePath, workspaceId, type, sub, id, name);
|
||||
return file;
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
/**
|
||||
|
||||
*
|
||||
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
|
||||
public class HttpContextUtils {
|
||||
|
||||
public static HttpServletRequest getHttpServletRequest() {
|
||||
return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
}
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
/**
|
||||
|
||||
*
|
||||
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import cn.hutool.log.Log;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
|
||||
/**
|
||||
* IP地址
|
||||
*
|
||||
* @author Mark sunlightcs@gmail.com
|
||||
*/
|
||||
public class IPUtils {
|
||||
private static Log logger = Log.get();
|
||||
|
||||
/**
|
||||
* 获取IP地址
|
||||
*
|
||||
* 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
|
||||
* 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
|
||||
*/
|
||||
public static String getIpAddr(HttpServletRequest request) {
|
||||
String ip = null;
|
||||
try {
|
||||
ip = request.getHeader("x-forwarded-for");
|
||||
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
|
||||
ip = request.getHeader("Proxy-Client-IP");
|
||||
}
|
||||
if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
|
||||
ip = request.getHeader("WL-Proxy-Client-IP");
|
||||
}
|
||||
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
|
||||
ip = request.getHeader("HTTP_CLIENT_IP");
|
||||
}
|
||||
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
|
||||
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
|
||||
}
|
||||
if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
|
||||
ip = request.getRemoteAddr();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("IPUtils ERROR ",e);
|
||||
}
|
||||
|
||||
// //使用代理，则获取第一个IP地址
|
||||
// if(StringUtils.isEmpty(ip) && ip.length() > 15) {
|
||||
// if(ip.indexOf(",") > 0) {
|
||||
// ip = ip.substring(0, ip.indexOf(","));
|
||||
// }
|
||||
// }
|
||||
|
||||
return ip;
|
||||
}
|
||||
/**
|
||||
* 功能：判断一个IP是不是在一个网段下的
|
||||
* 格式：isInRange("192.168.8.3", "192.168.9.10/22");
|
||||
*/
|
||||
public static boolean isInRange(String ip, String cidr) {
|
||||
String[] ips = ip.split("\\.");
|
||||
int ipAddr = (Integer.parseInt(ips[0]) << 24)
|
||||
| (Integer.parseInt(ips[1]) << 16)
|
||||
| (Integer.parseInt(ips[2]) << 8) | Integer.parseInt(ips[3]);
|
||||
int type = Integer.parseInt(cidr.replaceAll(".*/", ""));
|
||||
int mask = 0xFFFFFFFF << (32 - type);
|
||||
String cidrIp = cidr.replaceAll("/.*", "");
|
||||
String[] cidrIps = cidrIp.split("\\.");
|
||||
int cidrIpAddr = (Integer.parseInt(cidrIps[0]) << 24)
|
||||
| (Integer.parseInt(cidrIps[1]) << 16)
|
||||
| (Integer.parseInt(cidrIps[2]) << 8)
|
||||
| Integer.parseInt(cidrIps[3]);
|
||||
|
||||
return (ipAddr & mask) == (cidrIpAddr & mask);
|
||||
}
|
||||
}
|
||||
@@ -22,14 +22,6 @@ public enum RCode {
|
||||
ROLE_ID_CANNOT_EMPTY(100010, "role id cannot be empty"),// 权限 ID 不能为空
|
||||
USER_NOT_EXIST(100011, "user does not exist"),
|
||||
ROLE_NOT_EXIST(100012, "role does not exist"),
|
||||
SYS_USER_NAME_CANNOT_EMPTY(100013, "username cannot be empty"),
|
||||
SYS_ACCESS_LEVEL_CANNOT_EMPTY(100014, "accessLevel cannot be empty"),
|
||||
SYS_WORKSPACE_ROLES_CANNOT_EMPTY(100015, "workspaceRoles cannot be empty"),
|
||||
SYS_USER_BUILT_IN(100016, "Built-in user are not allowed to delete or update"),
|
||||
SYS_ROLE_BUILT_IN(100017, "Built-in role are not allowed to delete or update"),
|
||||
SYS_ROLE_NOT_DELETE(100018, "Used role cannot be deleted"),
|
||||
SYS_USER_OLDPWD_INCORRECT(100019, "Incorrect old password. Please try again."),
|
||||
SYS_SYSTEM_USER_NOT_LOGIN(100020, "System user cannot login."),
|
||||
|
||||
|
||||
// Application
|
||||
@@ -47,29 +39,12 @@ public enum RCode {
|
||||
APP_SIGNATURE_CONTENT_CANNOT_EMPTY(201012, "application signature content cannot be empty"),
|
||||
APP_SIGNATURE_NOT_EXIST(201013, "application signature does not exist"),
|
||||
APP_NOTE_CONTENT_CANNOT_EMPTY(201014, "application note content cannot be empty"),
|
||||
APP_ATTACHMENT_NOT_EXIST(201015, "application attachment does not exist"),
|
||||
APP_PROPERTIES_FORMAT_ERROR(201016, "application properties format error"),
|
||||
APP_IMPORT_FILE_FORMAT_ERROR(201017, "application import file format error"),
|
||||
|
||||
|
||||
|
||||
// Package
|
||||
PACKAGE_ID_CANNOT_EMPTY(202001, "package id cannot be empty"),
|
||||
PACKAGE_DESCRIPTION_CANNOT_EMPTY(202002, "package description cannot be empty"),
|
||||
PACKAGE_FILE_TYPE_ERROR(202003, "package invalid file"),
|
||||
PACKAGE_CANNOT_DELETE(202004, "The referenced package cannot be deleted"),
|
||||
|
||||
|
||||
// GIT
|
||||
GIT_COMMIT_CONFLICT_ERROR(203001, "Commit failed; fix conflicts and then commit the result"),
|
||||
GIT_MERGE_FAILED(203002, "Merge failed,error message: {0}"),
|
||||
GIT_PARENT_COMMITID_NOT_FOUND(203003, "Parent commitId not found"),
|
||||
GIT_BINARY_CONFLICT_ERROR(203004, "Binary file conflict found; resolve conflicts in binary files manually"),
|
||||
GIT_MERGE_NOT_SUPPORTED(203005, "Cannot merge in the {0} state"),
|
||||
GIT_MERGE_TARGET_BRANCH_NOT_EXIST(203006, "The target branch {0} does not exist."),
|
||||
GIT_TAG_ALREADY_EXISTS(203007, "Tag {0} already exists"),
|
||||
GIT_TAG_NOT_FOUND(203008, "Tag {0} not found"),
|
||||
GIT_TAG_ALREADY_IN_USE(203009,"Tag is already in use. Choose another tag."),
|
||||
|
||||
|
||||
// Runner
|
||||
@@ -78,8 +53,7 @@ public enum RCode {
|
||||
|
||||
// Playbook
|
||||
PLAYBOOK_ID_CANNOT_EMPTY(302001, "playbook id cannot be empty"),
|
||||
PLAYBOOK_NAME_DUPLICATE(302002, "playbook name duplicate "),
|
||||
PLAYBOOK_INVALID_FILE(302003, "playbook Invalid file"),
|
||||
|
||||
|
||||
// Workspace
|
||||
WORKSPACE_ID_CANNOT_EMPTY(401001, "workspace id cannot be empty"),
|
||||
@@ -91,23 +65,11 @@ public enum RCode {
|
||||
WORKSPACE_CANNOT_DELETE(401007, "Built-in workspace cannot be deleted"),
|
||||
WORKSPACE_VISIBILITY_ERROR(401008, "workspace visibility error"),
|
||||
WORKSPACE_BUILT_IN(401009, "Built-in workspace cannot be update"),
|
||||
WORKSPACE_NOT_EXIST(401010, "Workspace does not exist"),
|
||||
WORKSPACE_MEMBER_USER_ID_REPEAT(401011, "Workspace member user repeat"),
|
||||
|
||||
//PCAP
|
||||
PCAP_UPLOAD_WEB_SHARK_ERROR(501001, "web shark upload pcap error"),
|
||||
|
||||
|
||||
//environment
|
||||
ENVIRONMENT_SESSION_NOT_EXIST(601001, "environment session does not exist"),
|
||||
ENVIRONMENT_NOT_EXIST(601002, "environment does not exist"),
|
||||
ENVIRONMENT_USED(601003, "The environment is already in use"),
|
||||
ENVIRONMENT_STATUS_ERROR(601004, "The environment status is unavailable"),
|
||||
ENVIRONMENT_ID_CANNOT_EMPTY(601005, "environment id cannot be empty"),
|
||||
|
||||
|
||||
|
||||
|
||||
SUCCESS(200, "success"); // 成功
|
||||
|
||||
private RCode(Integer code, String msg) {
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.springframework.http.MediaType;
|
||||
|
||||
import com.j256.simplemagic.ContentInfo;
|
||||
import com.j256.simplemagic.ContentInfoUtil;
|
||||
|
||||
import cn.hutool.core.io.IORuntimeException;
|
||||
import cn.hutool.core.util.ReflectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.j256.simplemagic.ContentInfo;
|
||||
import com.j256.simplemagic.ContentInfoUtil;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.http.MediaType;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
public class ResponseUtil {
|
||||
|
||||
@@ -24,7 +25,7 @@ public class ResponseUtil {
|
||||
* @throws IOException
|
||||
*/
|
||||
public static void downloadFile(HttpServletResponse response, String contentType, String filename, byte[] data) throws IORuntimeException, IOException {
|
||||
String fileName = URLEncoder.encode(filename, "UTF-8");
|
||||
String fileName = T.URLUtil.encode(filename, T.CharsetUtil.CHARSET_UTF_8);
|
||||
ReflectUtil.invoke(response, "addHeader", "Content-Disposition", "attachment; filename=" + fileName);
|
||||
ReflectUtil.invoke(response, "addHeader", "Content-Length", "" + data.length);
|
||||
ReflectUtil.invoke(response, "setHeader", "Access-Control-Expose-Headers", "Content-Disposition");
|
||||
@@ -45,7 +46,7 @@ public class ResponseUtil {
|
||||
public static void downloadFile(HttpServletResponse response, String filename, byte[] data)
|
||||
throws IORuntimeException, IOException {
|
||||
response.setContentType(ResponseUtil.getDownloadContentType(filename));
|
||||
String fileName = URLEncoder.encode(filename, "UTF-8");
|
||||
String fileName = T.URLUtil.encode(filename, T.CharsetUtil.CHARSET_UTF_8);
|
||||
// response.addHeader("Content-Disposition", "attachment; filename=" + fileName);
|
||||
// response.addHeader("Content-Length", "" + data.length);
|
||||
// response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
|
||||
|
||||
@@ -310,6 +310,27 @@ public class T {
|
||||
* @author xiaoleilu
|
||||
*/
|
||||
public static class PageUtil extends cn.hutool.core.util.PageUtil {
|
||||
public static final Integer DEFAULT_PAGENO = 1;
|
||||
public static final Integer DEFAULT_PAGESIZE = 20;
|
||||
|
||||
public static Page getPage(Map<String, Object> params) {
|
||||
// 分页参数
|
||||
Integer pageNo = T.MapUtil.getInt(params, "current", DEFAULT_PAGENO);
|
||||
Integer pageSize = T.MapUtil.getInt(params, "size", DEFAULT_PAGESIZE);
|
||||
if (pageSize == -1) {
|
||||
pageNo = 0;
|
||||
pageSize = Integer.MAX_VALUE;
|
||||
}
|
||||
|
||||
Page page = Page.of(pageNo, pageSize);
|
||||
|
||||
String orderBy = T.MapUtil.getStr(params, "orderBy");
|
||||
if (T.StrUtil.isNotEmpty(orderBy)) {
|
||||
page.addOrder(T.PageUtil.decodeOrderByStr(orderBy));
|
||||
}
|
||||
return page;
|
||||
}
|
||||
|
||||
public static OrderItem decodeOrderByStr(String orderBy) {
|
||||
if (cn.hutool.core.util.StrUtil.isBlank(orderBy)) {
|
||||
return null;
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
package net.geedge.asw.common.util;
|
||||
|
||||
import freemarker.cache.StringTemplateLoader;
|
||||
import freemarker.template.Configuration;
|
||||
import freemarker.template.Template;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class TemplateUtil {
|
||||
|
||||
public static Template stringToTemplate(String templateStr,String templateKey) throws IOException {
|
||||
|
||||
// 创建配置类
|
||||
Configuration configuration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
|
||||
//创建模板加载器
|
||||
StringTemplateLoader templateLoader = new StringTemplateLoader();
|
||||
// 存入模板
|
||||
templateLoader.putTemplate(templateKey, templateStr); //template = 虚拟名称, 用来当作获取静态文件的key
|
||||
//加载模板加载器
|
||||
configuration.setTemplateLoader(templateLoader);
|
||||
//得到模板
|
||||
Template template = configuration.getTemplate(templateKey, "utf-8");
|
||||
|
||||
return template;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,183 +1,181 @@
|
||||
package net.geedge.asw.module.app.controller;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationAttachmentEntity;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.entity.ApplicationNoteEntity;
|
||||
import net.geedge.asw.module.app.entity.ApplicationSignatureEntity;
|
||||
import net.geedge.asw.module.app.service.ApplicationAttachmentService;
|
||||
import net.geedge.asw.module.app.service.ApplicationNoteService;
|
||||
import net.geedge.asw.module.app.service.ApplicationSignatureService;
|
||||
import net.geedge.asw.module.app.service.IApplicationService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
@RequestMapping("/api/v1/application")
|
||||
public class ApplicationController {
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
private IApplicationService applicationService;
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/application/{applicationName}")
|
||||
public R infoApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@PathVariable("applicationName") String applicationName) {
|
||||
Map<Object, Object> record = applicationService.infoApplication(workspaceId, branchName, applicationName);
|
||||
return R.ok().putData("record", record);
|
||||
@Autowired
|
||||
private ApplicationSignatureService signatureService;
|
||||
|
||||
@Autowired
|
||||
private ApplicationNoteService noteService;
|
||||
|
||||
@Autowired
|
||||
private ApplicationAttachmentService attachmentService;
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id, String workspaceId) {
|
||||
T.VerifyUtil.is(workspaceId).notNull();
|
||||
ApplicationEntity entity = applicationService.detail(id, workspaceId);
|
||||
if (T.ObjectUtil.isNull(entity)) {
|
||||
throw new ASWException(RCode.APP_NOT_EXIST);
|
||||
}
|
||||
return R.ok().putData("record", entity);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/application")
|
||||
public R listApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestParam(value = "q", required = false) String q) {
|
||||
List<Map<Object, Object>> records = applicationService.listApplication(workspaceId, branchName, q);
|
||||
return R.ok().putData("records", records);
|
||||
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
Page page = applicationService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/branch/{branchName}/application")
|
||||
public synchronized R newApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestBody Map<String, String> body) {
|
||||
String applicationName = T.MapUtil.getStr(body, "name");
|
||||
T.VerifyUtil.is(applicationName).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
@PostMapping
|
||||
public R add(@RequestBody ApplicationEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getName()).notEmpty(RCode.APP_NAME_CANNOT_EMPTY)
|
||||
//.and(entity.getSignature()).notEmpty(RCode.APP_SURROGATES_CANNOT_EMPTY)
|
||||
//.and(entity.getNote()).notEmpty(RCode.APP_PROPERTIES_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
applicationService.newApplication(workspaceId, branchName, applicationName);
|
||||
ApplicationEntity applicationEntity = applicationService.saveApplication(entity);
|
||||
return R.ok().putData("id", applicationEntity.getId());
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public R update(@RequestBody ApplicationEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getId()).notEmpty(RCode.ID_CANNOT_EMPTY)
|
||||
.and(entity.getName()).notEmpty(RCode.NAME_CANNOT_EMPTY)
|
||||
//.and(entity.getSignature()).notEmpty(RCode.APP_SURROGATES_CANNOT_EMPTY)
|
||||
//.and(entity.getNote()).notEmpty(RCode.APP_PROPERTIES_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
ApplicationEntity applicationEntity = applicationService.updateApplication(entity);
|
||||
return R.ok().putData("id", applicationEntity.getId());
|
||||
}
|
||||
|
||||
|
||||
@PutMapping("/{id}/basic")
|
||||
public R basic(@PathVariable String id, @RequestBody ApplicationEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getName()).notEmpty(RCode.NAME_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
entity.setId(id);
|
||||
ApplicationEntity app = applicationService.updateBasic(entity);
|
||||
return R.ok().putData("id", app.getId());
|
||||
}
|
||||
|
||||
@PutMapping("/{applicationId}/signature")
|
||||
public R updateSignature(@PathVariable("applicationId") String applicationId, @RequestBody ApplicationSignatureEntity signature) {
|
||||
T.VerifyUtil.is(signature).notNull()
|
||||
.and(signature.getContent()).notEmpty(RCode.APP_SURROGATES_CANNOT_EMPTY)
|
||||
.and(signature.getContent()).json(RCode.APP_SURROGATES_CANNOT_EMPTY);
|
||||
|
||||
signatureService.saveSignature(signature, applicationId);
|
||||
return R.ok().putData("id", signature.getId());
|
||||
}
|
||||
|
||||
@PutMapping("/{applicationId}/note")
|
||||
public R updateNote(@PathVariable("applicationId") String applicationId, @RequestBody ApplicationNoteEntity note) {
|
||||
T.VerifyUtil.is(note).notNull()
|
||||
.and(note.getContent()).notEmpty(RCode.APP_NOTE_CONTENT_CANNOT_EMPTY);
|
||||
|
||||
noteService.saveNote(note, applicationId);
|
||||
return R.ok().putData("id", note.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
public R delete(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
applicationService.removeApplication(T.ListUtil.of(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/{workspaceId}/branch/{branchName}/application/commit")
|
||||
public synchronized R updateApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestBody Map<String, Object> body) {
|
||||
String lastCommitId = T.MapUtil.getStr(body, "lastCommitId");
|
||||
String message = T.MapUtil.getStr(body, "message");
|
||||
@GetMapping("/{applicationId}/attachment")
|
||||
public R queryAttachment(@PathVariable String applicationId) {
|
||||
T.VerifyUtil.is(applicationId).notNull();
|
||||
|
||||
T.VerifyUtil.is(lastCommitId).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(message).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
|
||||
List<Map<String, String>> files = T.MapUtil.get(body, "files", List.class, T.ListUtil.list(true));
|
||||
if (T.CollUtil.isEmpty(files)) {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
for (Map<String, String> file : files) {
|
||||
String action = T.MapUtil.getStr(file, "action");
|
||||
String path = T.MapUtil.getStr(file, "path");
|
||||
if (T.StrUtil.hasEmpty(action, path)) {
|
||||
return R.error(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
if (T.StrUtil.equalsAny(action, "create", "update")) {
|
||||
String content = T.MapUtil.getStr(file, "content");
|
||||
T.VerifyUtil.is(content).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
}
|
||||
applicationService.updateApplication(workspaceId, branchName, lastCommitId, message, files);
|
||||
return R.ok();
|
||||
List<ApplicationAttachmentEntity> list = attachmentService.list(new LambdaQueryWrapper<ApplicationAttachmentEntity>().eq(ApplicationAttachmentEntity::getApplicationId, applicationId));
|
||||
return R.ok().putData("records", list);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/branch/{branchName}/application/{applicationName}")
|
||||
public synchronized R deleteApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@PathVariable("applicationName") String applicationName) {
|
||||
applicationService.deleteApplication(workspaceId, branchName, applicationName);
|
||||
|
||||
@PostMapping("/{applicationId}/attachment")
|
||||
public R uploadAttachment(@PathVariable String applicationId, @RequestParam("files") List<MultipartFile> fileList) {
|
||||
|
||||
List<ApplicationAttachmentEntity> recordList = T.ListUtil.list(true);
|
||||
for (int i = 0; i < fileList.size(); i++) {
|
||||
MultipartFile file = fileList.get(i);
|
||||
ApplicationAttachmentEntity attachmentEntity = attachmentService.saveAttachment(file.getResource(), applicationId);
|
||||
recordList.add(attachmentEntity);
|
||||
}
|
||||
return R.ok().putData("records", recordList);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{applicationId}/attachment")
|
||||
public R removedAttachment(@PathVariable String applicationId, @RequestParam String ids) {
|
||||
|
||||
attachmentService.removedAttachment(applicationId, ids);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/application/{applicationName}/commit")
|
||||
public R listApplicationCommit(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@PathVariable("applicationName") String applicationName,
|
||||
@RequestParam(required = false) String file) {
|
||||
List<Map<Object, Object>> records = applicationService.listApplicationCommit(workspaceId, branchName, applicationName, file);
|
||||
return R.ok().putData("records", records);
|
||||
@GetMapping("/{applicationId}/signature")
|
||||
public R querySignature(@PathVariable String applicationId) {
|
||||
T.VerifyUtil.is(applicationId).notNull();
|
||||
List<ApplicationSignatureEntity> signatureList = signatureService.queryList(applicationId);
|
||||
return R.ok().putData("records", signatureList);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/application/{applicationName}/commit/{commitId}/content")
|
||||
public R infoApplicationFileContent(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@PathVariable("applicationName") String applicationName,
|
||||
@PathVariable("commitId") String commitId,
|
||||
@RequestParam(required = true) String file) {
|
||||
Map<Object, Object> record = applicationService.infoApplicationFileContent(workspaceId, branchName, applicationName, commitId, file);
|
||||
return R.ok().putData("record", record);
|
||||
@GetMapping("/explore")
|
||||
public R explore(@RequestParam String workspaceId, @RequestParam String pcapIds) {
|
||||
String discoverUrl = applicationService.generateKibanaDiscoverUrl(workspaceId, pcapIds);
|
||||
return R.ok().putData("url", discoverUrl);
|
||||
}
|
||||
|
||||
@GetMapping("/{applicationId}/signature/{oldVersion}/{newVersion}")
|
||||
public R signatureCompare(@PathVariable("applicationId") String applicationId,
|
||||
@PathVariable("oldVersion") String oldVersion,
|
||||
@PathVariable("newVersion") String newVersion) {
|
||||
List<ApplicationSignatureEntity> list = signatureService.compare(applicationId, oldVersion, newVersion);
|
||||
return R.ok().putData("records", list);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/{workspaceId}/branch/{branchName}/application/import")
|
||||
public synchronized R importApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestParam(defaultValue = "tsg2402") String format,
|
||||
@RequestParam(value = "files") List<MultipartFile> fileList) {
|
||||
// validate
|
||||
WorkspaceEntity workspace = workspaceService.getById(workspaceId);
|
||||
T.VerifyUtil.is(workspace).notNull(RCode.WORKSPACE_NOT_EXIST);
|
||||
|
||||
List<JSONObject> dataList = T.ListUtil.list(true);
|
||||
try {
|
||||
for (MultipartFile multipartFile : fileList) {
|
||||
String str = T.IoUtil.readUtf8(multipartFile.getInputStream());
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(str);
|
||||
if (null == jsonObject.getJSONArray("applications")) {
|
||||
continue;
|
||||
}
|
||||
dataList.add(jsonObject);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new ASWException(RCode.APP_IMPORT_FILE_FORMAT_ERROR);
|
||||
}
|
||||
|
||||
// 名称重复校验
|
||||
List<Object> applicationList = dataList.stream()
|
||||
.map(entries -> entries.getJSONArray("applications"))
|
||||
.flatMap(Collection::stream)
|
||||
.collect(Collectors.toList());
|
||||
long distinctNameCount = applicationList.stream()
|
||||
.map(obj -> ((JSONObject) obj).getStr("app_name"))
|
||||
.distinct()
|
||||
.count();
|
||||
long size = applicationList.size();
|
||||
if (T.ObjectUtil.notEqual(size, distinctNameCount)) {
|
||||
throw new ASWException(RCode.APP_DUPLICATE_RECORD);
|
||||
}
|
||||
|
||||
// import
|
||||
List<ApplicationEntity> entityList = applicationService.importAppByFormat(workspaceId, branchName, format, dataList);
|
||||
List<Map<String, String>> records = entityList.stream()
|
||||
.map(entity -> Map.of("name", entity.getName()))
|
||||
.collect(Collectors.toList());
|
||||
return R.ok().putData("records", records);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/application/export")
|
||||
public void exportApplication(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestParam String names,
|
||||
@RequestParam(defaultValue = "tsg2402") String format,
|
||||
HttpServletResponse response) throws IOException {
|
||||
// validate
|
||||
List<ApplicationEntity> appList = applicationService.listApplication(workspaceId, branchName, T.StrUtil.splitToArray(names, ","));
|
||||
T.VerifyUtil.is(appList).notEmpty(RCode.APP_NOT_EXIST);
|
||||
|
||||
// format
|
||||
byte[] bytes = applicationService.exportAppByFormat(appList, format);
|
||||
|
||||
// response
|
||||
T.ResponseUtil.downloadFile(response, T.StrUtil.concat(true, "application_", System.currentTimeMillis() + ".json"), bytes);
|
||||
@PutMapping("/{applicationId}/signature/{version}/restore")
|
||||
public R restore(@PathVariable("applicationId") String applicationId,
|
||||
@PathVariable("version") String version) {
|
||||
signatureService.restore(applicationId, version);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
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.*;
|
||||
import net.geedge.asw.module.app.entity.ApplicationReleaseEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationReleaseService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
public class ApplicationReleaseController {
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
private IApplicationReleaseService releaseService;
|
||||
|
||||
@GetMapping("/{workspaceId}/release/{id}")
|
||||
public R detail(@PathVariable("workspaceId") String workspaceId, @PathVariable("id") String id) {
|
||||
ApplicationReleaseEntity record = releaseService.queryInfo(id);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/release")
|
||||
public R list(@PathVariable("workspaceId") String workspaceId, @RequestParam Map<String, Object> params) {
|
||||
// workspaceId
|
||||
params = T.MapUtil.defaultIfEmpty(params, new HashMap<>());
|
||||
params.put("workspaceId", workspaceId);
|
||||
|
||||
Page page = releaseService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/release")
|
||||
public R add(@PathVariable("workspaceId") String workspaceId, @RequestBody Map<String, String> requestBody) {
|
||||
String name = T.MapUtil.getStr(requestBody, "name", "");
|
||||
String tagName = T.MapUtil.getStr(requestBody, "tagName", "");
|
||||
String description = T.MapUtil.getStr(requestBody, "description", "");
|
||||
if (T.StrUtil.hasEmpty(name, tagName)) {
|
||||
throw new ASWException(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
|
||||
ApplicationReleaseEntity record = releaseService.saveRelease(workspaceId, name, tagName, description);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/release")
|
||||
public R update(@PathVariable("workspaceId") String workspaceId, @RequestBody Map<String, String> requestBody) {
|
||||
String id = T.MapUtil.getStr(requestBody, "id", "");
|
||||
String name = T.MapUtil.getStr(requestBody, "name", "");
|
||||
String description = T.MapUtil.getStr(requestBody, "description", "");
|
||||
if (T.StrUtil.hasEmpty(id, name)) {
|
||||
throw new ASWException(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
|
||||
ApplicationReleaseEntity record = releaseService.updateRelease(id, name, description);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/release/{id}")
|
||||
public R delete(@PathVariable("workspaceId") String workspaceId, @PathVariable("id") String id) {
|
||||
releaseService.removeRelease(id);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/release/{id}/file")
|
||||
public void download(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("id") String id,
|
||||
HttpServletResponse response) throws IOException {
|
||||
ApplicationReleaseEntity release = releaseService.getById(id);
|
||||
T.VerifyUtil.is(release).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
WorkspaceEntity workspace = workspaceService.getById(workspaceId);
|
||||
T.VerifyUtil.is(workspace).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String fileName = T.StrUtil.concat(true, workspace.getName(), "-", release.getTagName(), ".zip");
|
||||
byte[] fileBytes = T.FileUtil.readBytes(T.FileUtil.file(release.getPath()));
|
||||
ResponseUtil.downloadFile(response, MediaType.APPLICATION_OCTET_STREAM_VALUE, fileName, fileBytes);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
package net.geedge.asw.module.app.controller;
|
||||
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.service.IBranchService;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
public class BranchController {
|
||||
|
||||
@Autowired
|
||||
private IBranchService branchService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@GetMapping("/{workspaceId}/branch")
|
||||
public R listBranch(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam(value = "search", required = false) String search) {
|
||||
List<Map<Object, Object>> list = branchService.listBranch(workspaceId, search);
|
||||
return R.ok().putData("records", list);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}")
|
||||
public R infoBranch(@PathVariable("workspaceId") String workspaceId, @PathVariable("branchName") String branchName) {
|
||||
Map<Object, Object> record = branchService.infoBranch(workspaceId, branchName);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/branch")
|
||||
public synchronized R newBranch(@PathVariable("workspaceId") String workspaceId, @RequestBody Map<String, String> requestBody) {
|
||||
String branch = T.MapUtil.getStr(requestBody, "branch", "");
|
||||
String ref = T.MapUtil.getStr(requestBody, "ref", "");
|
||||
if (T.StrUtil.hasEmpty(branch, ref)) {
|
||||
throw new ASWException(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
|
||||
Map<Object, Object> record = branchService.newBranch(workspaceId, branch, ref);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/branch/{branchName}")
|
||||
public synchronized R deleteBranch(@PathVariable("workspaceId") String workspaceId, @PathVariable("branchName") String branchName) {
|
||||
branchService.deleteBranch(workspaceId, branchName);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/branch/{branchName}/commits")
|
||||
public R listBranchCommit(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@RequestParam(required = false) String path,
|
||||
@RequestParam(required = false) Integer current,
|
||||
@RequestParam(required = false) Integer size) {
|
||||
List<Map<Object, Object>> records = branchService.listBranchCommit(workspaceId, branchName, path);
|
||||
long total = T.CollUtil.size(records);
|
||||
if (null != current && null != size) {
|
||||
int fromIndex = (current - 1) * size;
|
||||
int toIndex = Math.min(fromIndex + size, records.size());
|
||||
records = records.subList(fromIndex, toIndex);
|
||||
}
|
||||
return R.ok().putData("records", records).put("total", total);
|
||||
}
|
||||
|
||||
@GetMapping({
|
||||
"/{workspaceId}/branch/{branchName}/commit/{commitId}/diff",
|
||||
"/{workspaceId}/branch/{branchName}/commit/{commitId}/diff/{oldCommitId}"
|
||||
})
|
||||
public R branchCommitDiff(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("branchName") String branchName,
|
||||
@PathVariable("commitId") String newCommitId,
|
||||
@PathVariable(value = "oldCommitId", required = false) String oldCommitId) throws IOException {
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
if (T.StrUtil.isEmpty(oldCommitId)) {
|
||||
// oldCommitId 为空默认对比 parent commitId
|
||||
RevCommit parentCommit = JGitUtils.getParentCommit(repository, branchName, newCommitId);
|
||||
oldCommitId = parentCommit.getName();
|
||||
}
|
||||
|
||||
RevCommit oldCommit = JGitUtils.infoCommit(repository, oldCommitId);
|
||||
RevCommit newCommit = JGitUtils.infoCommit(repository, newCommitId);
|
||||
|
||||
List<Map<Object, Object>> diffList = JGitUtils.getDiffFileListInCommits(repository, newCommitId, oldCommitId);
|
||||
Map<Object, Object> record = T.MapUtil.builder()
|
||||
.put("oldBranch", branchName)
|
||||
.put("newBranch", branchName)
|
||||
.put("oldCommitId", oldCommitId)
|
||||
.put("newCommitId", newCommitId)
|
||||
.put("oldCommit", JGitUtils.buildAswCommitInfo(oldCommit))
|
||||
.put("newCommit", JGitUtils.buildAswCommitInfo(newCommit))
|
||||
.put("files", diffList)
|
||||
.build();
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,109 +0,0 @@
|
||||
package net.geedge.asw.module.app.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationMergeService;
|
||||
import net.geedge.asw.module.app.service.impl.ApplicationMergeServiceImpl.MergeRequestStatus;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
public class MergeRequestController {
|
||||
|
||||
@Autowired
|
||||
private IApplicationMergeService applicationMergeService;
|
||||
|
||||
@GetMapping("/{workspaceId}/mr")
|
||||
public R listMr(@PathVariable("workspaceId") String workspaceId, @RequestParam Map<String, Object> params) {
|
||||
// workspaceId
|
||||
params = T.MapUtil.defaultIfEmpty(params, new HashMap<>());
|
||||
params.put("workspaceId", workspaceId);
|
||||
|
||||
Page page = applicationMergeService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/mr/{mrId}")
|
||||
public R infoMr(@PathVariable("mrId") String mrId) {
|
||||
ApplicationMergeEntity record = applicationMergeService.queryInfo(mrId);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/mr/{mrId}/commits")
|
||||
public R listMrCommit(@PathVariable("mrId") String mrId) throws IOException {
|
||||
List<Map<Object, Object>> records = applicationMergeService.listMrCommit(mrId);
|
||||
return R.ok().putData("records", records);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/mr/{mrId}/diffs")
|
||||
public R mrDiff(@PathVariable("mrId") String mrId) {
|
||||
Map<Object, Object> record = applicationMergeService.mrCommitDiff(mrId);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/mr/{mrId}/conflicts")
|
||||
public R getMrConflictList(@PathVariable("mrId") String mrId) throws IOException {
|
||||
Map<Object, Object> record = applicationMergeService.getMrConflictList(mrId);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/mr/{mrId}/conflicts")
|
||||
public R resolveMrConflicts(@PathVariable("mrId") String mrId, @RequestBody Map<String, Object> body) throws IOException{
|
||||
String commitId = T.MapUtil.getStr(body, "commitId");
|
||||
String commitMessage = T.MapUtil.getStr(body, "commitMessage");
|
||||
List<Map<String, String>> files = T.MapUtil.get(body, "files", List.class, new ArrayList());
|
||||
T.VerifyUtil.is(commitId).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(commitMessage).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(files).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
|
||||
for (Map<String, String> m : files) {
|
||||
String path = T.MapUtil.getStr(m, "path");
|
||||
String content = T.MapUtil.getStr(m, "content");
|
||||
T.VerifyUtil.is(path).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(content).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
|
||||
applicationMergeService.resolveMrConflicts(mrId, body);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/mr")
|
||||
public R newMr(@PathVariable("workspaceId") String workspaceId, @RequestBody ApplicationMergeEntity entity) throws IOException {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getTitle()).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(entity.getTargetBranch()).notEmpty(RCode.PARAM_CANNOT_EMPTY)
|
||||
.and(entity.getTargetBranch()).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
|
||||
// workspaceId
|
||||
entity.setWorkspaceId(workspaceId);
|
||||
|
||||
ApplicationMergeEntity record = applicationMergeService.newMr(entity);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/mr/{mrId}")
|
||||
public synchronized R mergeMr(@PathVariable("mrId") String mrId, @RequestBody(required = false) Map<String, Object> body) {
|
||||
String action = T.MapUtil.getStr(body, "action");
|
||||
T.VerifyUtil.is(action).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
|
||||
ApplicationMergeEntity record = applicationMergeService.mergeMr(mrId, action);
|
||||
if(T.BooleanUtil.and(
|
||||
T.ObjectUtil.equals("merge", action),
|
||||
T.ObjectUtil.notEqual(MergeRequestStatus.MERGED.toString(), record.getStatus())
|
||||
)){
|
||||
return R.error(RCode.GIT_MERGE_FAILED).putData("record", record);
|
||||
}
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,81 +1,65 @@
|
||||
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.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.ResponseUtil;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.app.service.IPackageService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
@RequestMapping("/api/v1/package")
|
||||
public class PackageController {
|
||||
|
||||
@Autowired
|
||||
private IPackageService packageService;
|
||||
|
||||
@GetMapping("/{workspaceId}/package/{id}")
|
||||
public R detail(@PathVariable("workspaceId") String workspaceId, @PathVariable("id") String id) {
|
||||
PackageEntity entity = packageService.queryInfo(id);
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id) {
|
||||
PackageEntity entity = packageService.getById(id);
|
||||
return R.ok().putData("record", entity);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/package")
|
||||
public R list(@PathVariable("workspaceId") String workspaceId, @RequestParam Map<String, Object> params) {
|
||||
// workspaceId
|
||||
params = T.MapUtil.defaultIfEmpty(params, new HashMap<>());
|
||||
params.put("workspaceId", workspaceId);
|
||||
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
Page page = packageService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/package")
|
||||
public R add(@PathVariable(value = "workspaceId", required = true) String workspaceId,
|
||||
@RequestParam(value = "description", required = false) String description,
|
||||
@RequestParam(value = "file") MultipartFile file) {
|
||||
@PostMapping
|
||||
public R add(@RequestBody PackageEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getName()).notEmpty(RCode.NAME_CANNOT_EMPTY)
|
||||
.and(entity.getDescription()).notEmpty(RCode.PACKAGE_DESCRIPTION_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
PackageEntity entity = packageService.savePackage(workspaceId, description, file.getResource());
|
||||
return R.ok().putData("record", entity);
|
||||
PackageEntity pkgEntity = packageService.savePackage(entity);
|
||||
return R.ok().putData("id", pkgEntity.getId());
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/package")
|
||||
public R update(@PathVariable(value = "workspaceId", required = true) String workspaceId,
|
||||
@RequestParam(value = "packageId", required = true) String packageId,
|
||||
@RequestParam(value = "description", required = false) String description,
|
||||
@RequestParam(value = "name", required = false) String name) {
|
||||
@PutMapping
|
||||
public R update(@RequestBody PackageEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getId()).notEmpty(RCode.ID_CANNOT_EMPTY)
|
||||
.and(entity.getName()).notEmpty(RCode.NAME_CANNOT_EMPTY)
|
||||
.and(entity.getDescription()).notEmpty(RCode.PACKAGE_DESCRIPTION_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
PackageEntity entity = packageService.updatePackage(workspaceId, packageId, name, description);
|
||||
return R.ok().putData("record", entity);
|
||||
PackageEntity pkgEntity = packageService.updatePackage(entity);
|
||||
return R.ok().putData("id", pkgEntity.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/package")
|
||||
@DeleteMapping
|
||||
public R delete(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
packageService.removePackage(T.ListUtil.of(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/package/{id}/download")
|
||||
public void download(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("id") String id,
|
||||
HttpServletResponse response) throws IOException {
|
||||
PackageEntity entity = packageService.getById(id);
|
||||
T.VerifyUtil.is(entity).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
File pkgFile = T.FileUtil.file(entity.getPath());
|
||||
ResponseUtil.downloadFile(response, MediaType.APPLICATION_OCTET_STREAM_VALUE, pkgFile.getName(), T.FileUtil.readBytes(pkgFile));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package net.geedge.asw.module.app.controller;
|
||||
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.service.ITagService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
public class TagController {
|
||||
|
||||
@Autowired
|
||||
private ITagService tagService;
|
||||
|
||||
@GetMapping("/{workspaceId}/tag/{tagName}")
|
||||
public R infoTag(@PathVariable("workspaceId") String workspaceId, @PathVariable("tagName") String name) {
|
||||
Map<Object, Object> record = tagService.infoTag(workspaceId, name);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/tag")
|
||||
public R listTag(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam(value = "search", required = false) String search) {
|
||||
List<Map<Object, Object>> list = tagService.listTag(workspaceId, search);
|
||||
return R.ok().putData("records", list);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/tag")
|
||||
public synchronized R newTag(@PathVariable("workspaceId") String workspaceId, @RequestBody Map<String, String> requestBody) {
|
||||
String name = T.MapUtil.getStr(requestBody, "name", "");
|
||||
String ref = T.MapUtil.getStr(requestBody, "ref", "");
|
||||
String description = T.MapUtil.getStr(requestBody, "description", "");
|
||||
if (T.StrUtil.hasEmpty(name, ref)) {
|
||||
throw new ASWException(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
Map<Object, Object> record = tagService.newTag(workspaceId, name, ref, description);
|
||||
return R.ok().putData("record", record);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/tag/{tagName}")
|
||||
public synchronized R deleteTag(@PathVariable("workspaceId") String workspaceId, @PathVariable("tagName") String name) {
|
||||
tagService.deleteTag(workspaceId, name);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package net.geedge.asw.module.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface ApplicationDao extends BaseMapper<ApplicationEntity>{
|
||||
|
||||
List<ApplicationEntity> queryList(Page page, Map<String, Object> params);
|
||||
|
||||
@Select("select * from ( select * from application union select * from application_log ) app where app.id = #{id} and app.op_version = #{version}")
|
||||
ApplicationEntity queryByApplicationAndLog(String id, String version);
|
||||
|
||||
List<ApplicationEntity> queryLogList(String id);
|
||||
|
||||
List<ApplicationEntity> compare(@Param("params") Map<String, Object> params);
|
||||
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package net.geedge.asw.module.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import net.geedge.asw.module.app.entity.ApplicationHrefEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface ApplicationHrefDao extends BaseMapper<ApplicationHrefEntity> {
|
||||
|
||||
List<ApplicationHrefEntity> queryList(@Param("applicationId") String applicationId);
|
||||
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package net.geedge.asw.module.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface ApplicationMergeDao extends BaseMapper<ApplicationMergeEntity> {
|
||||
List<ApplicationMergeEntity> queryList(Page page, Map<String, Object> params);
|
||||
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package net.geedge.asw.module.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.module.app.entity.ApplicationReleaseEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface ApplicationReleaseDao extends BaseMapper<ApplicationReleaseEntity> {
|
||||
|
||||
List<ApplicationReleaseEntity> queryList(Page page, Map<String, Object> params);
|
||||
|
||||
}
|
||||
@@ -1,26 +1,59 @@
|
||||
package net.geedge.asw.module.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@TableName("application")
|
||||
public class ApplicationEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
|
||||
private String name;
|
||||
private String longName;
|
||||
private String developer;
|
||||
|
||||
private String tags;
|
||||
|
||||
private String packageName;
|
||||
|
||||
private String website;
|
||||
|
||||
private String provider;
|
||||
|
||||
private String status;
|
||||
|
||||
private String description;
|
||||
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private Object packageName;
|
||||
private Long createTimestamp;
|
||||
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private Object properties;
|
||||
private Long updateTimestamp;
|
||||
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private Object signature;
|
||||
private String createUserId;
|
||||
|
||||
private String updateUserId;
|
||||
|
||||
private String workspaceId;
|
||||
|
||||
private Integer opVersion;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private ApplicationSignatureEntity signature;
|
||||
|
||||
@TableField(exist = false)
|
||||
private ApplicationNoteEntity note;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<ApplicationAttachmentEntity> attatchments;
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package net.geedge.asw.module.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@TableName(value = "application_href", autoResultMap = true)
|
||||
public class ApplicationHrefEntity implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String applicationId;
|
||||
private String name;
|
||||
private String url;
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.NEVER)
|
||||
private Long createTimestamp;
|
||||
|
||||
@TableField(updateStrategy = FieldStrategy.NEVER)
|
||||
private String createUserId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
}
|
||||
@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@TableName(value = "application_log", autoResultMap = true)
|
||||
@TableName("application_log")
|
||||
public class ApplicationLogEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
@@ -26,8 +26,7 @@ public class ApplicationLogEntity {
|
||||
|
||||
private String provider;
|
||||
|
||||
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||
private String properties;
|
||||
private String status;
|
||||
|
||||
private String description;
|
||||
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
package net.geedge.asw.module.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
@Data
|
||||
@TableName(value = "application_merge", autoResultMap = true)
|
||||
public class ApplicationMergeEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String sourceBranch;
|
||||
private String targetBranch;
|
||||
private String startCommitId;
|
||||
private String endCommitId;
|
||||
private String title;
|
||||
private Integer removeSourceBranch = 0;
|
||||
private String description;
|
||||
private String status;
|
||||
private String message;
|
||||
|
||||
private Long createTimestamp;
|
||||
private String createUserId;
|
||||
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private Object commit;
|
||||
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package net.geedge.asw.module.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
@Data
|
||||
@TableName(value = "application_release", autoResultMap = true)
|
||||
public class ApplicationReleaseEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String name;
|
||||
private String tagName;
|
||||
|
||||
private String path;
|
||||
private String description;
|
||||
|
||||
private String createUserId;
|
||||
private Long createTimestamp;
|
||||
|
||||
private String updateUserId;
|
||||
private Long updateTimestamp;
|
||||
|
||||
private String workspaceId;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private Object commit;
|
||||
|
||||
}
|
||||
@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
@Data
|
||||
@TableName("package")
|
||||
@@ -15,16 +13,12 @@ public class PackageEntity {
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String name;
|
||||
private String icon;
|
||||
private String logo;
|
||||
private String description;
|
||||
private String platform;
|
||||
private String version;
|
||||
private String identifier;
|
||||
|
||||
@JsonIgnore
|
||||
private String path;
|
||||
private Long size;
|
||||
|
||||
private Long createTimestamp;
|
||||
private Long updateTimestamp;
|
||||
private String createUserId;
|
||||
@@ -33,9 +27,6 @@ public class PackageEntity {
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
private String workbookId;
|
||||
|
||||
}
|
||||
@@ -1,17 +1,12 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.module.app.entity.ApplicationAttachmentEntity;
|
||||
import org.springframework.core.io.Resource;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public interface IApplicationAttachmentService extends IService<ApplicationAttachmentEntity>{
|
||||
public interface ApplicationAttachmentService extends IService<ApplicationAttachmentEntity>{
|
||||
|
||||
ApplicationAttachmentEntity saveAttachment(Resource fileResource, String applicationId);
|
||||
|
||||
void removedAttachment(String applicationId, String ids);
|
||||
|
||||
void download(HttpServletResponse response, String applicationId, String attachmentId) throws IOException;
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package net.geedge.asw.module.app.service;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.ApplicationNoteEntity;
|
||||
|
||||
public interface IApplicationNoteService extends IService<ApplicationNoteEntity>{
|
||||
public interface ApplicationNoteService extends IService<ApplicationNoteEntity>{
|
||||
|
||||
void saveNote(ApplicationNoteEntity note, String applicationId);
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import net.geedge.asw.module.app.entity.ApplicationSignatureEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IApplicationSignatureService extends IService<ApplicationSignatureEntity>{
|
||||
public interface ApplicationSignatureService extends IService<ApplicationSignatureEntity>{
|
||||
|
||||
void saveSignature(ApplicationSignatureEntity signature, String applicationId);
|
||||
|
||||
@@ -14,7 +14,4 @@ public interface IApplicationSignatureService extends IService<ApplicationSignat
|
||||
List<ApplicationSignatureEntity> compare(String applicationId, String oldVersion, String newVersion);
|
||||
|
||||
void restore(String id, String version);
|
||||
|
||||
ApplicationSignatureEntity queryLastVersionSignatureByAppId(String applicationId);
|
||||
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.ApplicationHrefEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IApplicationHrefService extends IService<ApplicationHrefEntity> {
|
||||
|
||||
List<ApplicationHrefEntity> queryList(String applicationId);
|
||||
|
||||
List<ApplicationHrefEntity> updateBatchHref(List<ApplicationHrefEntity> hrefList);
|
||||
|
||||
List<ApplicationHrefEntity> updateBatchHref(String applicationId, List<ApplicationHrefEntity> hrefList);
|
||||
|
||||
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IApplicationMergeService extends IService<ApplicationMergeEntity> {
|
||||
|
||||
ApplicationMergeEntity queryInfo(String mrId);
|
||||
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
ApplicationMergeEntity newMr(ApplicationMergeEntity entity) throws IOException;
|
||||
|
||||
List<Map<Object, Object>> listMrCommit(String mrId) throws IOException;
|
||||
|
||||
Map<Object, Object> mrCommitDiff(String mrId);
|
||||
|
||||
Map<Object, Object> getMrConflictList(String mrId) throws IOException;
|
||||
|
||||
void resolveMrConflicts(String mrId, Map<String, Object> body) throws IOException;
|
||||
|
||||
ApplicationMergeEntity mergeMr(String mrId, String action);
|
||||
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.ApplicationReleaseEntity;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface IApplicationReleaseService extends IService<ApplicationReleaseEntity> {
|
||||
|
||||
ApplicationReleaseEntity queryInfo(String id);
|
||||
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
ApplicationReleaseEntity saveRelease(String workspaceId, String name, String tagName, String description);
|
||||
|
||||
ApplicationReleaseEntity updateRelease(String id, String name, String description);
|
||||
|
||||
void removeRelease(String id);
|
||||
|
||||
void removeRelease(String workspaceId, String tagName);
|
||||
|
||||
}
|
||||
@@ -1,31 +1,25 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IApplicationService {
|
||||
public interface IApplicationService extends IService<ApplicationEntity>{
|
||||
|
||||
Map<Object, Object> infoApplication(String workspaceId, String branch, String name);
|
||||
ApplicationEntity detail(String id, String workspaceId);
|
||||
|
||||
List<ApplicationEntity> listApplication(String workspaceId, String branch, String... names);
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
List<Map<Object, Object>> listApplication(String workspaceId, String branch, String q);
|
||||
ApplicationEntity saveApplication(ApplicationEntity entity);
|
||||
|
||||
void newApplication(String workspaceId, String branch, String name);
|
||||
ApplicationEntity updateApplication(ApplicationEntity entity);
|
||||
|
||||
void deleteApplication(String workspaceId, String branch, String name);
|
||||
ApplicationEntity updateBasic(ApplicationEntity entity);
|
||||
|
||||
void updateApplication(String workspaceId, String branch, String lastCommitId, String message, List<Map<String, String>> updateContent);
|
||||
|
||||
List<Map<Object, Object>> listApplicationCommit(String workspaceId, String branch, String name, String file);
|
||||
|
||||
Map<Object, Object> infoApplicationFileContent(String workspaceId, String branch, String name, String commitId, String file);
|
||||
|
||||
byte[] exportAppByFormat(List<ApplicationEntity> appList, String format);
|
||||
|
||||
List<ApplicationEntity> importAppByFormat(String workspaceId, String branch, String format, List<JSONObject> dataList);
|
||||
void removeApplication(List<String> ids);
|
||||
|
||||
String generateKibanaDiscoverUrl(String workspaceId, String pcapIds);
|
||||
}
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IBranchService {
|
||||
|
||||
List<Map<Object, Object>> listBranch(String workspaceId, String search);
|
||||
|
||||
Map<Object, Object> infoBranch(String workspaceId, String branch);
|
||||
|
||||
Map<Object, Object> newBranch(String workspaceId, String name, String ref);
|
||||
|
||||
void deleteBranch(String workspaceId, String branch);
|
||||
|
||||
List<Map<Object, Object>> listBranchCommit(String workspaceId, String branch, String path);
|
||||
|
||||
}
|
||||
@@ -3,20 +3,17 @@ package net.geedge.asw.module.app.service;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import org.springframework.core.io.Resource;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IPackageService extends IService<PackageEntity>{
|
||||
|
||||
PackageEntity queryInfo(String id);
|
||||
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
PackageEntity savePackage(String workspaceId, String description, Resource fileResource);
|
||||
PackageEntity savePackage(PackageEntity entity);
|
||||
|
||||
PackageEntity updatePackage(PackageEntity entity);
|
||||
|
||||
void removePackage(List<String> ids);
|
||||
|
||||
PackageEntity updatePackage(String workspaceId, String packageId, String name, String description);
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface ITSGApplicationService {
|
||||
|
||||
Map<Object, Object> aswToTsg2402(List<ApplicationEntity> appList);
|
||||
|
||||
List<ApplicationEntity> tsg2402ToAsw(String workspaceId, List<JSONObject> dataList);
|
||||
|
||||
Map<Object, Object> aswToTsg2410(List<ApplicationEntity> appList);
|
||||
|
||||
List<ApplicationEntity> tsg2410ToAsw(String workspaceId, List<JSONObject> dataList);
|
||||
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package net.geedge.asw.module.app.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface ITagService {
|
||||
|
||||
Map<Object, Object> infoTag(String workspaceId, String name);
|
||||
|
||||
List<Map<Object, Object>> listTag(String workspaceId, String search);
|
||||
|
||||
Map<Object, Object> newTag(String workspaceId, String name, String branch, String message);
|
||||
|
||||
void deleteTag(String workspaceId, String name);
|
||||
|
||||
}
|
||||
@@ -5,19 +5,17 @@ import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.ApplicationAttachmentDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationAttachmentEntity;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationAttachmentService;
|
||||
import net.geedge.asw.module.app.service.ApplicationAttachmentService;
|
||||
import net.geedge.asw.module.app.service.IApplicationService;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.http.MediaTypeFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
@@ -26,46 +24,45 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class ApplicationAttachmentServiceImpl extends ServiceImpl<ApplicationAttachmentDao, ApplicationAttachmentEntity> implements IApplicationAttachmentService {
|
||||
public class ApplicationAttachmentServiceImpl extends ServiceImpl<ApplicationAttachmentDao, ApplicationAttachmentEntity> implements ApplicationAttachmentService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
// @Autowired
|
||||
// private IApplicationService applicationService;
|
||||
@Autowired
|
||||
private IApplicationService applicationService;
|
||||
|
||||
@Override
|
||||
public ApplicationAttachmentEntity saveAttachment(Resource fileResource, String applicationId) {
|
||||
|
||||
// ApplicationEntity app = applicationService.getById(applicationId);
|
||||
// ApplicationAttachmentEntity entity = new ApplicationAttachmentEntity();
|
||||
// try {
|
||||
// entity.setName(fileResource.getFilename());
|
||||
// entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
// entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
// entity.setApplicationId(applicationId);
|
||||
//
|
||||
// // path
|
||||
// File destination = T.FileUtil.file(T.WebPathUtil.getRootPath(), app.getId(), fileResource.getFilename());
|
||||
// FileUtils.copyInputStreamToFile(fileResource.getInputStream(), destination);
|
||||
// entity.setPath(destination.getPath());
|
||||
//
|
||||
// // 根据文件 applicationId path 判断是否已上存在，存在则响应当前实体
|
||||
// ApplicationAttachmentEntity attachment = this.getOne(new LambdaQueryWrapper<ApplicationAttachmentEntity>()
|
||||
// .eq(ApplicationAttachmentEntity::getApplicationId, applicationId)
|
||||
// .eq(ApplicationAttachmentEntity::getPath, destination.getPath()));
|
||||
// if (T.ObjectUtil.isNotNull(attachment)) {
|
||||
// return attachment;
|
||||
// }
|
||||
//
|
||||
// // save
|
||||
// this.save(entity);
|
||||
//
|
||||
// } catch (IOException e) {
|
||||
// log.error(e, "[saveAttachment] [error] [applicationId: {}]", applicationId);
|
||||
// throw new ASWException(RCode.ERROR);
|
||||
// }
|
||||
// return entity;
|
||||
return null;
|
||||
ApplicationEntity app = applicationService.getById(applicationId);
|
||||
ApplicationAttachmentEntity entity = new ApplicationAttachmentEntity();
|
||||
try {
|
||||
entity.setName(fileResource.getFilename());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setApplicationId(applicationId);
|
||||
|
||||
// path
|
||||
File destination = T.FileUtil.file(T.WebPathUtil.getRootPath(), app.getId(), fileResource.getFilename());
|
||||
FileUtils.copyInputStreamToFile(fileResource.getInputStream(), destination);
|
||||
entity.setPath(destination.getPath());
|
||||
|
||||
// 根据文件 applicationId path 判断是否已上存在，存在则响应当前实体
|
||||
ApplicationAttachmentEntity attachment = this.getOne(new LambdaQueryWrapper<ApplicationAttachmentEntity>()
|
||||
.eq(ApplicationAttachmentEntity::getApplicationId, applicationId)
|
||||
.eq(ApplicationAttachmentEntity::getPath, destination.getPath()));
|
||||
if (T.ObjectUtil.isNotNull(attachment)) {
|
||||
return attachment;
|
||||
}
|
||||
|
||||
// save
|
||||
this.save(entity);
|
||||
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[saveAttachment] [error] [applicationId: {}]", applicationId);
|
||||
throw new ASWException(RCode.ERROR);
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -82,21 +79,4 @@ public class ApplicationAttachmentServiceImpl extends ServiceImpl<ApplicationAtt
|
||||
this.removeById(id);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void download(HttpServletResponse response, String applicationId, String attachmentId) throws IOException {
|
||||
ApplicationAttachmentEntity attachment = this.getOne(new LambdaQueryWrapper<ApplicationAttachmentEntity>()
|
||||
.eq(ApplicationAttachmentEntity::getApplicationId, applicationId)
|
||||
.eq(ApplicationAttachmentEntity::getId, attachmentId));
|
||||
if (T.ObjectUtil.isNull(attachment)) {
|
||||
throw new ASWException(RCode.APP_ATTACHMENT_NOT_EXIST);
|
||||
}
|
||||
File file = FileUtil.file(attachment.getPath());
|
||||
response.setStatus(200);
|
||||
response.setContentType( MediaTypeFactory.getMediaType(file.getName()).toString());
|
||||
response.setContentLength(Integer.parseInt(String.valueOf(file.length())));
|
||||
response.setHeader("Content-disposition", "attachment; filename=" + file.getName());
|
||||
response.getOutputStream().write(T.FileUtil.readBytes(file));
|
||||
response.flushBuffer();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.ApplicationHrefDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationHrefEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationHrefService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class ApplicationHrefServiceImpl extends ServiceImpl<ApplicationHrefDao, ApplicationHrefEntity> implements IApplicationHrefService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Override
|
||||
public List<ApplicationHrefEntity> queryList(String applicationId) {
|
||||
return this.getBaseMapper().queryList(applicationId);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public List<ApplicationHrefEntity> updateBatchHref(List<ApplicationHrefEntity> hrefList) {
|
||||
for (ApplicationHrefEntity entity : hrefList) {
|
||||
|
||||
// validate
|
||||
ApplicationHrefEntity one = this.getOne(new LambdaQueryWrapper<ApplicationHrefEntity>()
|
||||
.eq(ApplicationHrefEntity::getApplicationId, entity.getApplicationId())
|
||||
.eq(ApplicationHrefEntity::getName, entity.getName())
|
||||
.ne(T.ObjectUtil.isNotEmpty(entity.getId()), ApplicationHrefEntity::getId, entity.getId()));
|
||||
if (T.ObjectUtil.isNotNull(one)) {
|
||||
throw ASWException.builder().rcode(RCode.SYS_DUPLICATE_RECORD).build();
|
||||
}
|
||||
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
|
||||
// save or update
|
||||
this.saveOrUpdate(entity);
|
||||
}
|
||||
return hrefList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ApplicationHrefEntity> updateBatchHref(String applicationId, List<ApplicationHrefEntity> hrefList) {
|
||||
for (ApplicationHrefEntity entity : hrefList) {
|
||||
entity.setApplicationId(applicationId);
|
||||
}
|
||||
return this.updateBatchHref(hrefList);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,414 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.common.config.Query;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.ApplicationMergeDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationMergeService;
|
||||
import net.geedge.asw.module.app.service.IBranchService;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.lib.ObjectId;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao, ApplicationMergeEntity> implements IApplicationMergeService {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@Autowired
|
||||
private IBranchService branchService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Override
|
||||
public ApplicationMergeEntity queryInfo(String mrId) {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
SysUserEntity user = userService.getById(entity.getCreateUserId());
|
||||
entity.setCreateUser(user);
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(ApplicationMergeEntity.class).getPage(params);
|
||||
List<ApplicationMergeEntity> list = this.getBaseMapper().queryList(page, params);
|
||||
page.setRecords(list);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApplicationMergeEntity newMr(ApplicationMergeEntity entity) throws IOException {
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
|
||||
// 默认状态
|
||||
entity.setStatus(MergeRequestStatus.OPEN.toString());
|
||||
|
||||
// start_commit_id
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
ObjectId branchAId = repository.resolve(entity.getSourceBranch());
|
||||
ObjectId branchBId = repository.resolve(entity.getTargetBranch());
|
||||
|
||||
RevCommit mergeBaseCommit = JGitUtils.getMergeBaseCommit(repository, branchAId, branchBId);
|
||||
entity.setStartCommitId(mergeBaseCommit.getName());
|
||||
}
|
||||
|
||||
// save
|
||||
this.save(entity);
|
||||
|
||||
SysUserEntity user = userService.getById(entity.getCreateUserId());
|
||||
entity.setCreateUser(user);
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listMrCommit(String mrId) throws IOException {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
String oldCommitId = entity.getStartCommitId();
|
||||
String newCommitId = null;
|
||||
MergeRequestStatus mergeRequestStatus = MergeRequestStatus.getInstance(entity.getStatus());
|
||||
switch (mergeRequestStatus) {
|
||||
case OPEN: {
|
||||
newCommitId = JGitUtils.getBranchLatestCommit(repository, entity.getSourceBranch()).getName();
|
||||
break;
|
||||
}
|
||||
case CLOSED:
|
||||
case MERGED: {
|
||||
newCommitId = entity.getEndCommitId();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// newCommitId-oldCommitId 期间的提交信息
|
||||
List<RevCommit> revCommits = JGitUtils.listCommitRange(repository, newCommitId, oldCommitId);
|
||||
|
||||
List<Map<Object, Object>> list = T.ListUtil.list(true);
|
||||
revCommits.forEach(revCommit -> list.add(JGitUtils.buildAswCommitInfo(revCommit)));
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> mrCommitDiff(String mrId) {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
String sourceBranch = entity.getSourceBranch();
|
||||
String targetBranch = entity.getTargetBranch();
|
||||
|
||||
// 获取 sourceBranch,targetBranch 合并冲突文件
|
||||
List<String> conflictFileList = T.ListUtil.list(true);
|
||||
|
||||
// src branch changed files
|
||||
String oldCommitId = entity.getStartCommitId();
|
||||
String newCommitId = null;
|
||||
MergeRequestStatus mergeRequestStatus = MergeRequestStatus.getInstance(entity.getStatus());
|
||||
switch (mergeRequestStatus) {
|
||||
case OPEN: {
|
||||
RevCommit branchLatestCommit = JGitUtils.getBranchLatestCommit(repository, sourceBranch);
|
||||
newCommitId = branchLatestCommit.getName();
|
||||
if (JGitUtils.isBranchExists(repository, targetBranch)) {
|
||||
// open 状态下,获取 sourceBranch,targetBranch 冲突文件
|
||||
conflictFileList = JGitUtils.getConflictFilePathInBranches(repository, sourceBranch, targetBranch);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CLOSED:
|
||||
case MERGED: {
|
||||
newCommitId = entity.getEndCommitId();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
List<Map<Object, Object>> diffFileListInCommits = JGitUtils.getDiffFileListInCommits(repository, newCommitId, oldCommitId);
|
||||
List<String> finalConflictFileList = conflictFileList;
|
||||
diffFileListInCommits.parallelStream()
|
||||
.forEach(m -> {
|
||||
T.MapUtil.renameKey(m, "oldContent", "sourceContent");
|
||||
T.MapUtil.renameKey(m, "newContent", "targetContent");
|
||||
|
||||
T.MapUtil.renameKey(m, "oldPath", "sourcePath");
|
||||
T.MapUtil.renameKey(m, "newPath", "targetPath");
|
||||
|
||||
String sourcePath = T.MapUtil.getStr(m, "sourcePath");
|
||||
String targetPath = T.MapUtil.getStr(m, "targetPath");
|
||||
m.put("conflict", false);
|
||||
if (finalConflictFileList.contains(sourcePath) || finalConflictFileList.contains(targetPath)) {
|
||||
m.put("conflict", true);
|
||||
}
|
||||
});
|
||||
|
||||
RevCommit sourceCommit = JGitUtils.infoCommit(repository, oldCommitId);
|
||||
RevCommit targetCommit = JGitUtils.infoCommit(repository, newCommitId);
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("sourceBranch", sourceBranch)
|
||||
.put("targetBranch", targetBranch)
|
||||
.put("sourceCommitId", oldCommitId)
|
||||
.put("targetCommitId", newCommitId)
|
||||
.put("sourceCommit", JGitUtils.buildAswCommitInfo(sourceCommit))
|
||||
.put("targetCommit", JGitUtils.buildAswCommitInfo(targetCommit))
|
||||
.put("files", diffFileListInCommits)
|
||||
.build();
|
||||
return m;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[mrCommitDiff] [error] [id: {}]", mrId);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> getMrConflictList(String mrId) throws IOException {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
String sourceBranch = entity.getSourceBranch();
|
||||
String targetBranch = entity.getTargetBranch();
|
||||
|
||||
List<Map<Object, Object>> conflictFileInfoInBranches = JGitUtils.getConflictFileInfoInBranches(repository, sourceBranch, targetBranch);
|
||||
if (T.CollUtil.isNotEmpty(conflictFileInfoInBranches)) {
|
||||
// srcBranch->tgtBranch 有冲突，先从 tgtBranch merge 到 srcBranch，在 srcBranch 处理后再合并，参考 gitlab
|
||||
StringBuilder commitMessage = new StringBuilder();
|
||||
commitMessage.append("Merge branch '").append(targetBranch).append("' into '").append(sourceBranch).append("'\n\n");
|
||||
commitMessage.append("# Conflicts:\n");
|
||||
for (Map<Object, Object> map : conflictFileInfoInBranches) {
|
||||
String path = T.MapUtil.getStr(map, "path");
|
||||
commitMessage.append("# ").append(path).append("\n");
|
||||
}
|
||||
|
||||
String parentId = JGitUtils.getBranchLatestCommit(repository, sourceBranch).getName();
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("sourceBranch", sourceBranch)
|
||||
.put("targetBranch", targetBranch)
|
||||
.put("commitId", parentId)
|
||||
.put("commitMessage", commitMessage.toString())
|
||||
.put("files", conflictFileInfoInBranches)
|
||||
.build();
|
||||
return m;
|
||||
}
|
||||
|
||||
return T.MapUtil.builder()
|
||||
.put("sourceBranch", sourceBranch)
|
||||
.put("targetBranch", targetBranch)
|
||||
.put("commitId", null)
|
||||
.put("commitMessage", null)
|
||||
.put("files", conflictFileInfoInBranches)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* resolve mr conflicts
|
||||
*
|
||||
* @param mrId
|
||||
* @param body
|
||||
*/
|
||||
@Override
|
||||
public void resolveMrConflicts(String mrId, Map<String, Object> body) throws IOException {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
String author = loginUserEntity.getName();
|
||||
|
||||
String sourceBranch = entity.getSourceBranch();
|
||||
String targetBranch = entity.getTargetBranch();
|
||||
String commitMessage = T.MapUtil.getStr(body, "commitMessage");
|
||||
List<Map<String, String>> files = T.MapUtil.get(body, "files", List.class, new ArrayList());
|
||||
|
||||
// 反过来合并
|
||||
JGitUtils.mergeBranch(repository, targetBranch, sourceBranch, author, commitMessage, files);
|
||||
} catch (GitAPIException e) {
|
||||
log.error(e, "[resolveMrConflicts] [error] [id: {}]", mrId);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* merge operation
|
||||
*
|
||||
* @param mrId
|
||||
* @param action merge|close
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public ApplicationMergeEntity mergeMr(String mrId, String action) {
|
||||
ApplicationMergeEntity entity = this.getById(mrId);
|
||||
T.VerifyUtil.is(entity).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
String workspaceId = entity.getWorkspaceId();
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
switch (action) {
|
||||
case "merge": {
|
||||
MergeRequestStatus mergeRequestStatus = MergeRequestStatus.getInstance(entity.getStatus());
|
||||
if (!mergeRequestStatus.canMerge()) {
|
||||
throw new ASWException(RCode.GIT_MERGE_NOT_SUPPORTED.setParam(mergeRequestStatus.toString()));
|
||||
}
|
||||
|
||||
String srcBranch = entity.getSourceBranch();
|
||||
String tgtBranch = entity.getTargetBranch();
|
||||
|
||||
StringBuilder commitMessage = new StringBuilder();
|
||||
commitMessage.append("Merge branch '").append(srcBranch).append("' into '").append(tgtBranch).append("'\n\n");
|
||||
commitMessage.append(entity.getTitle());
|
||||
commitMessage.append("\n");
|
||||
|
||||
|
||||
// 检查 tgtBranch 是否存在
|
||||
if (T.BooleanUtil.negate(JGitUtils.isBranchExists(repository, tgtBranch))) {
|
||||
throw new ASWException(RCode.GIT_MERGE_TARGET_BRANCH_NOT_EXIST.setParam(tgtBranch));
|
||||
}
|
||||
|
||||
// merge
|
||||
try {
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
JGitUtils.mergeBranch(repository, srcBranch, tgtBranch, loginUserEntity.getName(), commitMessage.toString(), null);
|
||||
|
||||
String latestCommitId = JGitUtils.getBranchLatestCommit(repository, srcBranch).getName();
|
||||
entity.setEndCommitId(latestCommitId);
|
||||
entity.setStatus(MergeRequestStatus.MERGED.toString());
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[mergeMr] [merge error] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}] [msg: {}]", workspaceId, srcBranch, tgtBranch, e.getMessage());
|
||||
throw new ASWException(RCode.GIT_MERGE_FAILED.setParam(e.getMessage()));
|
||||
}
|
||||
|
||||
// remove source branch
|
||||
if (1 == entity.getRemoveSourceBranch()) {
|
||||
try {
|
||||
log.info("[mergeMr] [remove source branch] [workspaceId: {}] [branch: {}]", workspaceId, srcBranch);
|
||||
branchService.deleteBranch(workspaceId, srcBranch);
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[mergeMr] [remove source branch error] [workspaceId: {}] [branch: {}] [msg: {}]", workspaceId, srcBranch, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// update
|
||||
this.update(new LambdaUpdateWrapper<ApplicationMergeEntity>()
|
||||
.eq(ApplicationMergeEntity::getId, mrId)
|
||||
.set(ApplicationMergeEntity::getEndCommitId, entity.getEndCommitId())
|
||||
.set(ApplicationMergeEntity::getStatus, entity.getStatus())
|
||||
.set(ApplicationMergeEntity::getMessage, entity.getMessage())
|
||||
);
|
||||
return entity;
|
||||
}
|
||||
case "close": {
|
||||
String updateStatus = StrUtil.equals(MergeRequestStatus.OPEN.toString(), entity.getStatus()) ? MergeRequestStatus.CLOSED.toString() : entity.getStatus();
|
||||
entity.setStatus(updateStatus);
|
||||
|
||||
// 关闭请求，保留当前 src branch last commit = end_commit_id
|
||||
String latestCommitId = JGitUtils.getBranchLatestCommit(repository, entity.getSourceBranch()).getName();
|
||||
this.update(new LambdaUpdateWrapper<ApplicationMergeEntity>()
|
||||
.eq(ApplicationMergeEntity::getId, mrId)
|
||||
.set(ApplicationMergeEntity::getStatus, updateStatus)
|
||||
.set(ApplicationMergeEntity::getEndCommitId, latestCommitId)
|
||||
);
|
||||
return entity;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return entity;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[mergeMr] [error] [id: {}] [action: {}]", mrId, action);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static enum MergeRequestStatus {
|
||||
OPEN {
|
||||
// 默认状态
|
||||
public String toString() {
|
||||
return "open";
|
||||
}
|
||||
|
||||
public boolean canMerge() {
|
||||
return true;
|
||||
}
|
||||
},
|
||||
MERGED {
|
||||
// 合并成功
|
||||
public String toString() {
|
||||
return "merged";
|
||||
}
|
||||
|
||||
public boolean canMerge() {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
CLOSED {
|
||||
// 合并关闭
|
||||
public String toString() {
|
||||
return "closed";
|
||||
}
|
||||
|
||||
public boolean canMerge() {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
private MergeRequestStatus() {
|
||||
}
|
||||
|
||||
public static MergeRequestStatus getInstance(String name) {
|
||||
for (MergeRequestStatus v : values()) {
|
||||
if (StrUtil.equalsIgnoreCase(v.name(), name)) {
|
||||
return v;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public abstract boolean canMerge();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.ApplicationNoteDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationNoteEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationNoteService;
|
||||
import net.geedge.asw.module.app.service.ApplicationNoteService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
public class ApplicationNoteServiceImpl extends ServiceImpl<ApplicationNoteDao, ApplicationNoteEntity> implements IApplicationNoteService {
|
||||
public class ApplicationNoteServiceImpl extends ServiceImpl<ApplicationNoteDao, ApplicationNoteEntity> implements ApplicationNoteService {
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
|
||||
@@ -1,184 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.common.config.Query;
|
||||
import net.geedge.asw.common.util.*;
|
||||
import net.geedge.asw.module.app.dao.ApplicationReleaseDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationReleaseEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationReleaseService;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.lib.Ref;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class ApplicationReleaseServiceImpl extends ServiceImpl<ApplicationReleaseDao, ApplicationReleaseEntity> implements IApplicationReleaseService {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
|
||||
@Value("${asw.resources.path:resources}")
|
||||
private String aswResourcesPath;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Override
|
||||
public ApplicationReleaseEntity queryInfo(String id) {
|
||||
ApplicationReleaseEntity entity = this.getById(id);
|
||||
T.VerifyUtil.is(entity).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
SysUserEntity createUser = userService.getById(entity.getCreateUserId());
|
||||
SysUserEntity updateUser = userService.getById(entity.getUpdateUserId());
|
||||
createUser.setPwd(null);
|
||||
updateUser.setPwd(null);
|
||||
entity.setCreateUser(createUser);
|
||||
entity.setUpdateUser(updateUser);
|
||||
|
||||
File gitDir = workspaceService.getGitDir(entity.getWorkspaceId());
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);) {
|
||||
Ref tagRef = repository.findRef(JGitUtils.getFullTagName(entity.getTagName()));
|
||||
String tgtCommitId = tagRef.getTarget().getObjectId().getName();
|
||||
RevCommit revCommit = JGitUtils.infoCommit(repository, tgtCommitId);
|
||||
entity.setCommit(JGitUtils.buildAswCommitInfo(revCommit));
|
||||
return entity;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[queryInfo] [id: {}]", id);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(ApplicationReleaseEntity.class).getPage(params);
|
||||
List<ApplicationReleaseEntity> entityList = this.getBaseMapper().queryList(page, params);
|
||||
page.setRecords(entityList);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApplicationReleaseEntity saveRelease(String workspaceId, String name, String tagName, String description) {
|
||||
ApplicationReleaseEntity checkTagInUse = this.getOne(new LambdaQueryWrapper<ApplicationReleaseEntity>()
|
||||
.eq(ApplicationReleaseEntity::getWorkspaceId, workspaceId)
|
||||
.eq(ApplicationReleaseEntity::getTagName, tagName)
|
||||
);
|
||||
if (null != checkTagInUse) {
|
||||
throw new ASWException(RCode.GIT_TAG_ALREADY_IN_USE);
|
||||
}
|
||||
|
||||
String uuid = T.StrUtil.uuid();
|
||||
// release file
|
||||
File releaseFile = FileResourceUtil.createFile(this.aswResourcesPath, workspaceId, Constants.FileTypeEnum.RELEASE.getType(), uuid, uuid + ".zip");
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);) {
|
||||
Ref tagRef = repository.findRef(JGitUtils.getFullTagName(tagName));
|
||||
T.VerifyUtil.is(tagRef).notNull(RCode.GIT_TAG_NOT_FOUND.setParam(tagName));
|
||||
|
||||
// archive
|
||||
WorkspaceEntity workspace = workspaceService.getById(workspaceId);
|
||||
String prefix = T.StrUtil.concat(true, workspace.getName(), "-", tagName, "/");
|
||||
JGitUtils.archive(repository, tagName, releaseFile, prefix, "zip");
|
||||
|
||||
ApplicationReleaseEntity entity = new ApplicationReleaseEntity();
|
||||
entity.setId(uuid);
|
||||
entity.setName(name);
|
||||
entity.setTagName(tagName);
|
||||
entity.setPath(releaseFile.getAbsolutePath());
|
||||
|
||||
entity.setDescription(description);
|
||||
entity.setWorkspaceId(workspaceId);
|
||||
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
this.save(entity);
|
||||
|
||||
// build record info
|
||||
SysUserEntity createUser = userService.getById(entity.getCreateUserId());
|
||||
SysUserEntity updateUser = userService.getById(entity.getUpdateUserId());
|
||||
createUser.setPwd(null);
|
||||
updateUser.setPwd(null);
|
||||
entity.setCreateUser(createUser);
|
||||
entity.setUpdateUser(updateUser);
|
||||
|
||||
String tgtCommitId = tagRef.getTarget().getObjectId().getName();
|
||||
RevCommit revCommit = JGitUtils.infoCommit(repository, tgtCommitId);
|
||||
entity.setCommit(JGitUtils.buildAswCommitInfo(revCommit));
|
||||
return entity;
|
||||
} catch (IOException | GitAPIException e) {
|
||||
T.FileUtil.del(releaseFile);
|
||||
log.error(e, "[saveRelease] [error] [workspaceId: {}] [name: {}] [tagName: {}]", workspaceId, name, tagName);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApplicationReleaseEntity updateRelease(String id, String name, String description) {
|
||||
ApplicationReleaseEntity entity = this.getById(id);
|
||||
T.VerifyUtil.is(entity).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
LambdaUpdateWrapper<ApplicationReleaseEntity> wrapper = new LambdaUpdateWrapper<ApplicationReleaseEntity>()
|
||||
.eq(ApplicationReleaseEntity::getId, id)
|
||||
.set(ApplicationReleaseEntity::getName, name)
|
||||
.set(ApplicationReleaseEntity::getDescription, description)
|
||||
.set(ApplicationReleaseEntity::getUpdateUserId, StpUtil.getLoginIdAsString())
|
||||
.set(ApplicationReleaseEntity::getUpdateTimestamp, System.currentTimeMillis());
|
||||
|
||||
// update
|
||||
this.update(wrapper);
|
||||
|
||||
// return record info
|
||||
return this.queryInfo(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removeRelease(String id) {
|
||||
ApplicationReleaseEntity entity = this.getById(id);
|
||||
if (null != entity) {
|
||||
// del file
|
||||
T.FileUtil.del(entity.getPath());
|
||||
// del record
|
||||
this.removeById(id);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removeRelease(String workspaceId, String tagName) {
|
||||
ApplicationReleaseEntity entity = this.getOne(new LambdaQueryWrapper<ApplicationReleaseEntity>()
|
||||
.eq(ApplicationReleaseEntity::getWorkspaceId, workspaceId)
|
||||
.eq(ApplicationReleaseEntity::getTagName, tagName)
|
||||
);
|
||||
if (null != entity) {
|
||||
// del file
|
||||
T.FileUtil.del(entity.getPath());
|
||||
// del record
|
||||
this.removeById(entity.getId());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,741 +1,328 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.SaTokenInfo;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.json.JSON;
|
||||
import cn.hutool.json.JSONConfig;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.core.net.url.UrlBuilder;
|
||||
import cn.hutool.log.Log;
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
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 net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationService;
|
||||
import net.geedge.asw.module.app.service.ITSGApplicationService;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.app.dao.ApplicationDao;
|
||||
import net.geedge.asw.module.app.entity.*;
|
||||
import net.geedge.asw.module.app.service.*;
|
||||
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.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.api.Git;
|
||||
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.diff.DiffEntry;
|
||||
import org.eclipse.jgit.diff.DiffFormatter;
|
||||
import org.eclipse.jgit.dircache.DirCache;
|
||||
import org.eclipse.jgit.dircache.DirCacheBuilder;
|
||||
import org.eclipse.jgit.dircache.DirCacheEntry;
|
||||
import org.eclipse.jgit.lib.*;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.eclipse.jgit.revwalk.RevTree;
|
||||
import org.eclipse.jgit.revwalk.RevWalk;
|
||||
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
|
||||
import org.eclipse.jgit.treewalk.TreeWalk;
|
||||
import org.eclipse.jgit.treewalk.filter.PathFilter;
|
||||
import org.eclipse.jgit.util.io.DisabledOutputStream;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class ApplicationServiceImpl implements IApplicationService {
|
||||
public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, ApplicationEntity> implements IApplicationService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Value("${asw.application.template.meta.json}")
|
||||
private String metaJsonTemplate;
|
||||
|
||||
@Value("${asw.application.template.signature.json}")
|
||||
private String signatureJsonTemplate;
|
||||
@Value("${kibana.url:127.0.0.1:5601}")
|
||||
private String kibanaUrl;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
private IApplicationLogService applicationLogService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("tsg2402ApplicationService")
|
||||
private ITSGApplicationService tsg2402ApplicationService;
|
||||
private IPcapService pcapService;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@Autowired
|
||||
private ApplicationSignatureService signatureService;
|
||||
|
||||
@Autowired
|
||||
private ApplicationNoteService noteService;
|
||||
|
||||
@Autowired
|
||||
private ApplicationAttachmentService attachmentService;
|
||||
|
||||
@Resource
|
||||
private KibanaClient kibanaClient;
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> infoApplication(String workspaceId, String branch, String name) {
|
||||
Map<Object, Object> result = T.MapUtil.builder()
|
||||
.put("branch", branch)
|
||||
.build();
|
||||
public ApplicationEntity detail(String id, String workspaceId) {
|
||||
ApplicationEntity app = this.getOne(new LambdaQueryWrapper<ApplicationEntity>()
|
||||
.eq(ApplicationEntity::getId, id)
|
||||
.eq(ApplicationEntity::getWorkspaceId, workspaceId));
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
result.put("commitId", branchRef.getName());
|
||||
ApplicationSignatureEntity signature = signatureService.getOne(new LambdaQueryWrapper<ApplicationSignatureEntity>()
|
||||
.eq(ApplicationSignatureEntity::getApplicationId, app.getId())
|
||||
.orderByDesc(ApplicationSignatureEntity::getOpVersion)
|
||||
.last("limit 1"));
|
||||
app.setSignature(signature);
|
||||
|
||||
List<Map<Object, Object>> files = T.ListUtil.list(true);
|
||||
try (TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository)) {
|
||||
ApplicationNoteEntity note = noteService.getOne(new LambdaQueryWrapper<ApplicationNoteEntity>()
|
||||
.eq(ApplicationNoteEntity::getApplicationId, app.getId())
|
||||
.orderByDesc(ApplicationNoteEntity::getOpVersion)
|
||||
.last("limit 1"));
|
||||
app.setNote(note);
|
||||
|
||||
treeWalk.addTree(revWalk.parseTree(branchRef));
|
||||
treeWalk.setFilter(PathFilter.create("applications/" + name + "/"));
|
||||
treeWalk.setRecursive(true);
|
||||
List<ApplicationAttachmentEntity> attachmentEntityList = attachmentService.list(new LambdaQueryWrapper<ApplicationAttachmentEntity>()
|
||||
.eq(ApplicationAttachmentEntity::getApplicationId, app.getId()));
|
||||
app.setAttatchments(attachmentEntityList);
|
||||
|
||||
Map<String, String> appFilePathMapping = T.MapUtil.newHashMap(true);
|
||||
while (treeWalk.next()) {
|
||||
String pathString = treeWalk.getPathString();
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("path", pathString)
|
||||
.build();
|
||||
SysUserEntity createUser = userService.getById(app.getCreateUserId());
|
||||
SysUserEntity updateUser = userService.getById(app.getUpdateUserId());
|
||||
app.setCreateUser(createUser);
|
||||
app.setUpdateUser(updateUser);
|
||||
|
||||
Map<Object, Object> fileContent = JGitUtils.getFileContent(repository, pathString, treeWalk.getObjectId(0));
|
||||
m.putAll(fileContent);
|
||||
files.add(m);
|
||||
|
||||
appFilePathMapping.put(pathString, pathString);
|
||||
}
|
||||
|
||||
Map<String, RevCommit> lastCommitMapping = this.getLastCommitIdDataByPath(repository, branch, appFilePathMapping);
|
||||
for (Map<Object, Object> m : files) {
|
||||
String path = T.MapUtil.getStr(m, "path");
|
||||
RevCommit revCommit = lastCommitMapping.get(path);
|
||||
m.put("lastCommitId", revCommit != null ? revCommit.getName() : null);
|
||||
}
|
||||
}
|
||||
result.put("files", files);
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[infoApplication] [error] [workspaceId: {}] [branch: {}] [name: {}]", workspaceId, branch, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return result;
|
||||
return app;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listApplication(String workspaceId, String branch, String q) {
|
||||
List<Map<Object, Object>> resultList = T.ListUtil.list(true);
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = T.PageUtil.getPage(params);
|
||||
List<ApplicationEntity> packageList = this.getBaseMapper().queryList(page, params);
|
||||
page.setRecords(packageList);
|
||||
return page;
|
||||
}
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository);) {
|
||||
private void validateParam(ApplicationEntity entity, boolean isUpdate) {
|
||||
ApplicationEntity one = this.getOne(new LambdaQueryWrapper<ApplicationEntity>()
|
||||
.eq(ApplicationEntity::getWorkspaceId, entity.getWorkspaceId())
|
||||
.eq(ApplicationEntity::getName, entity.getName()));
|
||||
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
treeWalk.addTree(revWalk.parseTree(branchRef));
|
||||
treeWalk.setFilter(PathFilter.create("applications/"));
|
||||
treeWalk.setRecursive(true);
|
||||
|
||||
Map<String, String> appDirPathMapping = T.MapUtil.newHashMap(true);
|
||||
while (treeWalk.next()) {
|
||||
String filePath = treeWalk.getPathString();
|
||||
String fileName = treeWalk.getNameString();
|
||||
if (T.StrUtil.equals("meta.json", fileName)) {
|
||||
// application_name 从目录中获取
|
||||
String applicationName = T.PathUtil.getPathEle(Path.of(filePath), 1).toString();
|
||||
// filter by name
|
||||
if (T.StrUtil.isNotEmpty(q) && !T.StrUtil.containsIgnoreCase(applicationName, q)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ObjectLoader loader = repository.open(treeWalk.getObjectId(0));
|
||||
String metaJsonStr = T.StrUtil.utf8Str(loader.getBytes());
|
||||
metaJsonStr = T.StrUtil.emptyToDefault(metaJsonStr, T.StrUtil.EMPTY_JSON);
|
||||
Map metaJsonMap = T.MapUtil.empty();
|
||||
try {
|
||||
metaJsonMap = T.JSONUtil.toBean(metaJsonStr, Map.class);
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[listApplication] [meat.json format error] [application: {}]", applicationName);
|
||||
}
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.newHashMap(true);
|
||||
m.putAll(metaJsonMap);
|
||||
m.put("name", applicationName);
|
||||
|
||||
String appDirPath = treeWalk.getPathString().replaceAll(fileName, "");
|
||||
appDirPathMapping.put(applicationName, appDirPath);
|
||||
|
||||
resultList.add(m);
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, RevCommit> lastCommitMapping = this.getLastCommitIdDataByPath(repository, branch, appDirPathMapping);
|
||||
|
||||
for (Map<Object, Object> map : resultList) {
|
||||
String applicationName = T.MapUtil.getStr(map, "name");
|
||||
RevCommit lastCommit = T.MapUtil.get(lastCommitMapping, applicationName, RevCommit.class);
|
||||
map.put("commit", JGitUtils.buildAswCommitInfo(lastCommit));
|
||||
}
|
||||
|
||||
// 按照提交日期倒叙
|
||||
resultList = resultList.stream().sorted(Comparator.comparing(map -> {
|
||||
Map commit = T.MapUtil.get((Map) map, "commit", Map.class, new HashMap(2));
|
||||
return (Long) T.MapUtil.getLong(commit, "createdAt", 0l);
|
||||
}).reversed()).collect(Collectors.toList());
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[listApplication] [error] [workspaceId: {}] [branch: {}]", workspaceId, branch);
|
||||
throw new RuntimeException(e);
|
||||
if (T.ObjectUtil.isNotNull(one) && !isUpdate || T.ObjectUtil.isNotNull(one) && isUpdate && !T.StrUtil.equals(entity.getId(), one.getId())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_DUPLICATE_RECORD).build();
|
||||
}
|
||||
return resultList;
|
||||
|
||||
// package name format
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getPackageName()) && !T.JSONUtil.isTypeJSON(entity.getPackageName())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_PACKAGE_NAME_FORMAT_ERROR).build();
|
||||
} else if (T.ObjectUtil.isEmpty(entity.getPackageName())) {
|
||||
entity.setPackageName("{}");
|
||||
}
|
||||
|
||||
// tags name format
|
||||
if (T.StrUtil.isNotEmpty(entity.getTags()) && !T.JSONUtil.isTypeJSON(entity.getTags())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_TAGS_FORMAT_ERROR).build();
|
||||
}
|
||||
|
||||
// signature
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getSignature())) {
|
||||
if (!T.StrUtil.isNotEmpty(entity.getSignature().getContent())){
|
||||
throw ASWException.builder().rcode(RCode.APP_SIGNATURE_CONTENT_CANNOT_EMPTY).build();
|
||||
}
|
||||
|
||||
if (!T.JSONUtil.isTypeJSON(entity.getSignature().getContent())){
|
||||
throw ASWException.builder().rcode(RCode.APP_SIGNATURE_CONTENT_CANNOT_EMPTY).build();
|
||||
}
|
||||
}
|
||||
|
||||
// note
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getNote()) && !T.StrUtil.isNotEmpty(entity.getNote().getContent())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_NOTE_CONTENT_CANNOT_EMPTY).build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ApplicationEntity> listApplication(String workspaceId, String branch, String... names) {
|
||||
List<ApplicationEntity> resultList = T.ListUtil.list(true);
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ApplicationEntity saveApplication(ApplicationEntity entity) {
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository)) {
|
||||
this.validateParam(entity, false);
|
||||
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
treeWalk.addTree(revWalk.parseTree(branchRef));
|
||||
treeWalk.setFilter(PathFilter.create("applications/"));
|
||||
treeWalk.setRecursive(true);
|
||||
// save
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
this.save(entity);
|
||||
|
||||
Map<String, String> signatureMapping = T.MapUtil.newHashMap();
|
||||
|
||||
while (treeWalk.next()) {
|
||||
String filePath = treeWalk.getPathString();
|
||||
String applicationName = T.PathUtil.getPathEle(Path.of(filePath), 1).toString();
|
||||
if (T.BooleanUtil.and(
|
||||
T.ObjectUtil.isNotEmpty(names),
|
||||
!Arrays.asList(names).contains(applicationName))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (treeWalk.getNameString()) {
|
||||
case "meta.json": {
|
||||
ObjectLoader loader = repository.open(treeWalk.getObjectId(0));
|
||||
String metaJsonStr = T.StrUtil.utf8Str(loader.getBytes());
|
||||
metaJsonStr = T.StrUtil.emptyToDefault(metaJsonStr, T.StrUtil.EMPTY_JSON);
|
||||
|
||||
ApplicationEntity application = T.JSONUtil.toBean(metaJsonStr, ApplicationEntity.class);
|
||||
application.setName(applicationName);
|
||||
resultList.add(application);
|
||||
break;
|
||||
}
|
||||
case "signature.json": {
|
||||
ObjectLoader loader = repository.open(treeWalk.getObjectId(0));
|
||||
signatureMapping.put(applicationName, T.StrUtil.utf8Str(loader.getBytes()));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (ApplicationEntity entity : resultList) {
|
||||
String name = entity.getName();
|
||||
String signature = signatureMapping.getOrDefault(name, "");
|
||||
if (T.StrUtil.isNotEmpty(signature)) {
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(signature);
|
||||
entity.setSignature(jsonObject);
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[listApplication] [error] [workspaceId: {}] [branch: {}]", workspaceId, branch);
|
||||
throw new RuntimeException(e);
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getSignature())){
|
||||
// save signature
|
||||
signatureService.saveSignature(entity.getSignature(), entity.getId());
|
||||
}
|
||||
return resultList;
|
||||
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getNote())){
|
||||
//save note
|
||||
noteService.saveNote(entity.getNote(), entity.getId());
|
||||
}
|
||||
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void newApplication(String workspaceId, String branch, String name) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
Map<String, ObjectId> filePathAndBlobIdMap = T.MapUtil.newHashMap(true);
|
||||
for (String str : T.ListUtil.of("README.md", "meta.json", "signature.json")) {
|
||||
String savePath = T.StrUtil.concat(true, "applications/", name, "/", str);
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ApplicationEntity updateApplication(ApplicationEntity entity) {
|
||||
|
||||
String fileContent = T.StrUtil.EMPTY;
|
||||
if ("meta.json".equals(str)) {
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(this.metaJsonTemplate);
|
||||
jsonObject.set("id", T.StrUtil.uuid());
|
||||
jsonObject.set("name", name);
|
||||
jsonObject.set("longName", name);
|
||||
fileContent = T.JSONUtil.parse(jsonObject).toJSONString(2);
|
||||
}
|
||||
if ("signature.json".equals(str)) {
|
||||
fileContent = this.signatureJsonTemplate;
|
||||
}
|
||||
this.validateParam(entity, true);
|
||||
|
||||
ObjectId objectId = JGitUtils.insertBlobFileToDatabase(repository, fileContent.getBytes());
|
||||
filePathAndBlobIdMap.put(savePath, objectId);
|
||||
}
|
||||
ApplicationEntity one = this.getById(entity.getId());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setOpVersion(one.getOpVersion() + 1);
|
||||
|
||||
try (ObjectInserter inserter = repository.getObjectDatabase().newInserter();
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository)) {
|
||||
// update
|
||||
this.updateById(entity);
|
||||
|
||||
// branch tree
|
||||
ObjectId resolveId = repository.resolve(branch);
|
||||
if (null != resolveId) {
|
||||
treeWalk.addTree(revWalk.parseTree(resolveId));
|
||||
} else {
|
||||
treeWalk.addTree(new CanonicalTreeParser());
|
||||
}
|
||||
treeWalk.setRecursive(true);
|
||||
// save log
|
||||
this.saveApplicationToLog(one);
|
||||
|
||||
DirCache newTree = DirCache.newInCore();
|
||||
DirCacheBuilder newTreeBuilder = newTree.builder();
|
||||
while (treeWalk.next()) {
|
||||
DirCacheEntry entry = JGitUtils.buildDirCacheEntry(treeWalk.getPathString(), treeWalk.getFileMode(0), treeWalk.getObjectId(0));
|
||||
newTreeBuilder.add(entry);
|
||||
}
|
||||
|
||||
// update new tree
|
||||
for (Map.Entry<String, ObjectId> entry : filePathAndBlobIdMap.entrySet()) {
|
||||
String filePath = entry.getKey();
|
||||
ObjectId blobId = entry.getValue();
|
||||
|
||||
// add file ref
|
||||
DirCacheEntry dirCacheEntry = JGitUtils.buildDirCacheEntry(filePath, FileMode.REGULAR_FILE, blobId);
|
||||
newTreeBuilder.add(dirCacheEntry);
|
||||
}
|
||||
|
||||
newTreeBuilder.finish();
|
||||
ObjectId newTreeId = newTree.writeTree(inserter);
|
||||
|
||||
String message = String.format("feat: add %s application", name);
|
||||
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
PersonIdent personIdent = JGitUtils.buildPersonIdent(loginUserEntity.getName());
|
||||
|
||||
// commit
|
||||
JGitUtils.createCommit(repository, branch, newTreeId, message, personIdent);
|
||||
}
|
||||
} catch (IOException | ConcurrentRefUpdateException e) {
|
||||
log.error(e, "[newApplication] [error] [workspaceId: {}] [branch: {}] [name: {}]", workspaceId, branch, name);
|
||||
throw new RuntimeException(e);
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getSignature())){
|
||||
// save signature
|
||||
signatureService.saveSignature(entity.getSignature(), entity.getId());
|
||||
}
|
||||
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getNote())){
|
||||
//save note
|
||||
noteService.saveNote(entity.getNote(), entity.getId());
|
||||
}
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
private void saveApplicationToLog(ApplicationEntity one) {
|
||||
ApplicationLogEntity applicationLogEntity = T.BeanUtil.toBean(one, ApplicationLogEntity.class);
|
||||
applicationLogEntity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
applicationLogEntity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
applicationLogEntity.setCreateTimestamp(System.currentTimeMillis());
|
||||
applicationLogEntity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
applicationLogService.save(applicationLogEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteApplication(String workspaceId, String branch, String name) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
ObjectInserter inserter = repository.getObjectDatabase().newInserter();
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository);) {
|
||||
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
treeWalk.addTree(revWalk.parseTree(branchRef));
|
||||
treeWalk.setRecursive(true);
|
||||
|
||||
DirCache newTree = DirCache.newInCore();
|
||||
DirCacheBuilder newTreeBuilder = newTree.builder();
|
||||
|
||||
String appFilePrefixStr = T.StrUtil.concat(true, "applications/", name, "/");
|
||||
while (treeWalk.next()) {
|
||||
String pathString = treeWalk.getPathString();
|
||||
if (!pathString.startsWith(appFilePrefixStr)) {
|
||||
DirCacheEntry entry = JGitUtils.buildDirCacheEntry(pathString, treeWalk.getFileMode(0), treeWalk.getObjectId(0));
|
||||
newTreeBuilder.add(entry);
|
||||
}
|
||||
}
|
||||
|
||||
newTreeBuilder.finish();
|
||||
ObjectId newTreeId = newTree.writeTree(inserter);
|
||||
|
||||
String message = String.format("refactor: remove %s application", name);
|
||||
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
PersonIdent personIdent = JGitUtils.buildPersonIdent(loginUserEntity.getName());
|
||||
|
||||
// commit
|
||||
JGitUtils.createCommit(repository, branch, newTreeId, message, personIdent);
|
||||
} catch (IOException | ConcurrentRefUpdateException e) {
|
||||
log.error(e, "[deleteApplication] [error] [workspaceId: {}] [branch: {}] [name: {}]", workspaceId, branch, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateApplication(String workspaceId, String branch, String lastCommitId, String message, List<Map<String, String>> updateContent) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory());) {
|
||||
// 分支最新 commitId
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
// 如果不相等，检查 param.lastCommitId --- branch.HEAD 期间是否更新了本次修改文件
|
||||
if (!T.StrUtil.equals(lastCommitId, branchRef.getName())) {
|
||||
List<String> updateFilePath = updateContent.stream()
|
||||
.filter(map -> {
|
||||
String action = T.MapUtil.getStr(map, "action");
|
||||
return T.StrUtil.equalsAny(action, "create", "update");
|
||||
})
|
||||
.map(map -> T.MapUtil.getStr(map, "path"))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
ObjectId currentCommitId = repository.resolve(lastCommitId);
|
||||
try (RevWalk walk = new RevWalk(repository)) {
|
||||
CanonicalTreeParser c1 = new CanonicalTreeParser();
|
||||
c1.reset(repository.newObjectReader(), walk.parseCommit(currentCommitId).getTree());
|
||||
|
||||
CanonicalTreeParser c2 = new CanonicalTreeParser();
|
||||
c2.reset(repository.newObjectReader(), walk.parseCommit(branchRef).getTree());
|
||||
|
||||
List<DiffEntry> diffs = git.diff()
|
||||
.setOldTree(c1)
|
||||
.setNewTree(c2)
|
||||
.call();
|
||||
List<String> affectFilePathList = diffs.stream()
|
||||
.filter(entry -> T.StrUtil.equalsAnyIgnoreCase(entry.getChangeType().name(), DiffEntry.ChangeType.MODIFY.name(), DiffEntry.ChangeType.ADD.name()))
|
||||
.map(DiffEntry::getNewPath)
|
||||
.collect(Collectors.toList());
|
||||
List<String> intersection = T.CollUtil.intersection(updateFilePath, affectFilePathList).stream().toList();
|
||||
if (T.CollUtil.isEmpty(intersection)) {
|
||||
// 在 param.lastCommitId 不是当前分支最新提交时，本次提交文件没有冲突，更新 commit=branch.HEAD
|
||||
lastCommitId = branchRef.getName();
|
||||
} else {
|
||||
throw new ASWException(RCode.GIT_COMMIT_CONFLICT_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
try (ObjectInserter inserter = repository.getObjectDatabase().newInserter();
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository)) {
|
||||
|
||||
// branch tree
|
||||
treeWalk.addTree(revWalk.parseTree(branchRef));
|
||||
treeWalk.setRecursive(true);
|
||||
|
||||
DirCache newTree = DirCache.newInCore();
|
||||
DirCacheBuilder newTreeBuilder = newTree.builder();
|
||||
|
||||
List<String> updateFilePath = updateContent.stream().map(map -> T.MapUtil.getStr(map, "path")).collect(Collectors.toList());
|
||||
while (treeWalk.next()) {
|
||||
String pathString = treeWalk.getPathString();
|
||||
// 先删
|
||||
if (!updateFilePath.contains(pathString)) {
|
||||
DirCacheEntry entry = JGitUtils.buildDirCacheEntry(pathString, treeWalk.getFileMode(0), treeWalk.getObjectId(0));
|
||||
newTreeBuilder.add(entry);
|
||||
}
|
||||
}
|
||||
// 后增
|
||||
for (Map<String, String> map : updateContent) {
|
||||
String action = T.MapUtil.getStr(map, "action");
|
||||
if (T.StrUtil.equalsAnyIgnoreCase(action, "create", "update")) {
|
||||
String path = T.MapUtil.getStr(map, "path");
|
||||
DirCacheEntry dirCacheEntry = new DirCacheEntry(path);
|
||||
dirCacheEntry.setFileMode(FileMode.REGULAR_FILE);
|
||||
|
||||
String content = T.MapUtil.getStr(map, "content");
|
||||
String encoding = T.MapUtil.getStr(map, "encoding");
|
||||
if ("base64".equals(encoding)) {
|
||||
// binary
|
||||
byte[] data = Base64.getDecoder().decode(content);
|
||||
ObjectId objectId = JGitUtils.insertBlobFileToDatabase(repository, data);
|
||||
dirCacheEntry.setObjectId(objectId);
|
||||
} else {
|
||||
// text
|
||||
ObjectId objectId = JGitUtils.insertBlobFileToDatabase(repository, content.getBytes());
|
||||
dirCacheEntry.setObjectId(objectId);
|
||||
}
|
||||
newTreeBuilder.add(dirCacheEntry);
|
||||
}
|
||||
}
|
||||
|
||||
newTreeBuilder.finish();
|
||||
ObjectId newTreeId = newTree.writeTree(inserter);
|
||||
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
PersonIdent personIdent = JGitUtils.buildPersonIdent(loginUserEntity.getName());
|
||||
|
||||
// commit
|
||||
JGitUtils.createCommit(repository, branch, newTreeId, message, personIdent);
|
||||
}
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[updateApplication] [error] [workspaceId: {}] [branch: {}] [lastCommitId: {}]", workspaceId, branch, lastCommitId);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listApplicationCommit(String workspaceId, String branch, String name, String file) {
|
||||
List<Map<Object, Object>> resultList = T.ListUtil.list(true);
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory());) {
|
||||
|
||||
String filterPath = T.StrUtil.concat(true, "applications/", name);
|
||||
if (T.StrUtil.isNotEmpty(file)) {
|
||||
filterPath = T.StrUtil.concat(true, filterPath, "/", file);
|
||||
}
|
||||
|
||||
ObjectId branchRef = git.getRepository().resolve(branch);
|
||||
Iterable<RevCommit> iterable = git.log()
|
||||
.add(branchRef)
|
||||
.addPath(filterPath)
|
||||
.call();
|
||||
|
||||
for (RevCommit commit : iterable) {
|
||||
resultList.add(JGitUtils.buildAswCommitInfo(commit));
|
||||
}
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[listApplicationCommit] [error] [workspaceId: {}] [branch: {}] [name: {}]", workspaceId, branch, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> infoApplicationFileContent(String workspaceId, String branch, String name, String commitId, String file) {
|
||||
// applications/qq/meta.json
|
||||
String path = T.StrUtil.concat(true, "applications/", name, "/", file);
|
||||
|
||||
Map<Object, Object> result = T.MapUtil.builder()
|
||||
.put("path", path)
|
||||
.build();
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
TreeWalk treeWalk = new TreeWalk(repository);
|
||||
RevWalk revWalk = new RevWalk(repository);
|
||||
) {
|
||||
RevCommit revCommit = revWalk.parseCommit(ObjectId.fromString(commitId));
|
||||
ObjectId treeId = revCommit.getTree().getId();
|
||||
|
||||
treeWalk.addTree(treeId);
|
||||
treeWalk.setRecursive(true);
|
||||
|
||||
while (treeWalk.next()) {
|
||||
if (T.StrUtil.equals(path, treeWalk.getPathString())) {
|
||||
Map<Object, Object> fileContent = JGitUtils.getFileContent(repository, treeWalk.getPathString(), treeWalk.getObjectId(0));
|
||||
result.putAll(fileContent);
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[infoApplicationFileContent] [error] [workspaceId: {}] [branch: {}] [name: {}]", workspaceId, branch, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return result;
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removeApplication(List<String> ids) {
|
||||
// remove
|
||||
this.removeBatchByIds(ids);
|
||||
applicationLogService.removeBatchByIds(ids);
|
||||
signatureService.remove(new LambdaQueryWrapper<ApplicationSignatureEntity>().in(ApplicationSignatureEntity::getApplicationId, ids));
|
||||
noteService.remove(new LambdaQueryWrapper<ApplicationNoteEntity>().in(ApplicationNoteEntity::getApplicationId, ids));
|
||||
attachmentService.remove(new LambdaQueryWrapper<ApplicationAttachmentEntity>().in(ApplicationAttachmentEntity::getApplicationId, ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过 path 获取 lastCommit
|
||||
* 1. 根据 workspace_name 查询 index-pattern 是否存在
|
||||
* 2. 不存在则创建索引
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @param pathMapping
|
||||
* @return
|
||||
* 维护格式示例：
|
||||
* {
|
||||
* "type": "index-pattern",
|
||||
* "id": "workspace_id",
|
||||
* "attributes": {
|
||||
* "title": "workspace-{workspace_name}-*"
|
||||
* }
|
||||
* }
|
||||
* @param workspaceId
|
||||
* @param pcapIds
|
||||
* @return kibana discover url
|
||||
*/
|
||||
public Map<String, RevCommit> getLastCommitIdDataByPath(Repository repository, String branch, Map<String, String> pathMapping) {
|
||||
Map<String, RevCommit> result = new HashMap<>();
|
||||
try (Git git = new Git(repository);
|
||||
DiffFormatter diffFormatter = new DiffFormatter(DisabledOutputStream.INSTANCE);
|
||||
) {
|
||||
diffFormatter.setRepository(repository);
|
||||
@Override
|
||||
public String generateKibanaDiscoverUrl(String workspaceId, String pcapIds) {
|
||||
// verify
|
||||
WorkspaceEntity workspace = workspaceService.getById(workspaceId);
|
||||
T.VerifyUtil.is(workspace).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
// 指定分支获取 log
|
||||
Iterable<RevCommit> commits = git.log()
|
||||
.add(git.getRepository().resolve(branch))
|
||||
.call();
|
||||
for (RevCommit commit : commits) {
|
||||
// 获取上次提交，用以对比差异
|
||||
RevCommit parent = commit.getParentCount() > 0 ? commit.getParent(0) : null;
|
||||
if (parent == null) {
|
||||
continue;
|
||||
}
|
||||
List<String> pcapIdList = T.StrUtil.split(pcapIds, ",").stream().filter(s -> T.StrUtil.isNotEmpty(s)).collect(Collectors.toList());
|
||||
List<PcapEntity> pcapList = pcapService.list(new LambdaQueryWrapper<PcapEntity>().in(PcapEntity::getId, pcapIdList));
|
||||
T.VerifyUtil.is(pcapList).notEmpty(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
// 计算当前提交与上次提交之间的差异
|
||||
List<DiffEntry> diffs = diffFormatter.scan(parent.getTree(), commit.getTree());
|
||||
for (DiffEntry diff : diffs) {
|
||||
String newPath = diff.getNewPath();
|
||||
String oldPath = diff.getOldPath();
|
||||
// index name
|
||||
String indexName = String.format("workspace-%s-*", workspace.getName());
|
||||
|
||||
// 检查是否匹配目标路径
|
||||
for (Map.Entry<String, String> entry : pathMapping.entrySet()) {
|
||||
String key = entry.getKey();
|
||||
String path = entry.getValue();
|
||||
if (T.BooleanUtil.and(
|
||||
(newPath.startsWith(path) || oldPath.startsWith(path)),
|
||||
!result.containsKey(key)
|
||||
)) {
|
||||
result.put(key, commit);
|
||||
}
|
||||
}
|
||||
}
|
||||
SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
|
||||
String token = tokenInfo.getTokenValue();
|
||||
|
||||
// 如果所有路径都找到对应的最后提交，提前结束循环
|
||||
if (result.size() == pathMapping.size()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[getLastCommitIdDataByPath] [workspace: {}] [branch: {}]", repository.getDirectory().getPath(), branch);
|
||||
JSONObject index = kibanaClient.findIndexPattern(token, indexName);
|
||||
JSONArray savedObjects = index.getJSONArray("saved_objects");
|
||||
|
||||
// check if index exists
|
||||
boolean indexExists = savedObjects.stream()
|
||||
.filter(obj -> {
|
||||
JSONObject attributes = ((JSONObject) obj).getJSONObject("attributes");
|
||||
if (T.ObjectUtil.isEmpty(attributes)) return false;
|
||||
String title = attributes.getString("title");
|
||||
return T.StrUtil.equals(indexName, title);
|
||||
})
|
||||
.findFirst()
|
||||
.isPresent();
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[generateKibanaDiscoverUrl] [idnex-pattern: {}] [exists: {}]", indexName, indexExists);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public void saveOrUpdateBatch(String workspaceId, String branch, String commitMessage, List<ApplicationEntity> list) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
RevWalk revWalk = new RevWalk(repository)) {
|
||||
// create index
|
||||
if (T.BooleanUtil.negate(indexExists)) {
|
||||
JSONObject attributes = new JSONObject();
|
||||
attributes.put("title", indexName);
|
||||
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
RevTree revTree = revWalk.parseTree(branchRef);
|
||||
|
||||
// 先查询，区分 新增APP、修改APP
|
||||
List<ApplicationEntity> addAppList = T.ListUtil.list(true);
|
||||
List<ApplicationEntity> updateAppList = T.ListUtil.list(true);
|
||||
HashMap<String, JSONObject> appMetaContentInDb = T.MapUtil.newHashMap();
|
||||
try (TreeWalk treeWalk = new TreeWalk(repository)) {
|
||||
treeWalk.addTree(revTree);
|
||||
treeWalk.setRecursive(true);
|
||||
treeWalk.setFilter(PathFilter.create("applications/"));
|
||||
HashSet<String> appNameListInDb = new HashSet<>();
|
||||
while (treeWalk.next()) {
|
||||
String appName = T.PathUtil.getPathEle(Path.of(treeWalk.getPathString()), 1).toString();
|
||||
appNameListInDb.add(appName);
|
||||
if (T.StrUtil.equals("meta.json", treeWalk.getNameString())) {
|
||||
ObjectLoader loader = repository.open(treeWalk.getObjectId(0));
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(T.StrUtil.utf8Str(loader.getBytes()));
|
||||
appMetaContentInDb.put(appName, jsonObject);
|
||||
}
|
||||
}
|
||||
list.parallelStream().forEach(entity -> {
|
||||
if (appNameListInDb.contains(entity.getName())) {
|
||||
updateAppList.add(entity);
|
||||
} else {
|
||||
addAppList.add(entity);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 修改文件路径信息
|
||||
List<String> updateFilePath = T.ListUtil.list(true);
|
||||
updateAppList.parallelStream().forEach(entity -> {
|
||||
updateFilePath.add(T.StrUtil.concat(true, "applications/", entity.getName(), "/meta.json"));
|
||||
updateFilePath.add(T.StrUtil.concat(true, "applications/", entity.getName(), "/signature.json"));
|
||||
});
|
||||
|
||||
// build tree
|
||||
DirCache newTree = DirCache.newInCore();
|
||||
DirCacheBuilder newTreeBuilder = newTree.builder();
|
||||
try (TreeWalk treeWalk = new TreeWalk(repository)) {
|
||||
treeWalk.addTree(revTree);
|
||||
treeWalk.setRecursive(true);
|
||||
|
||||
while (treeWalk.next()) {
|
||||
// 先删
|
||||
String filePath = treeWalk.getPathString();
|
||||
if (!updateFilePath.contains(filePath)) {
|
||||
DirCacheEntry entry = new DirCacheEntry(filePath);
|
||||
entry.setFileMode(treeWalk.getFileMode(0));
|
||||
entry.setObjectId(treeWalk.getObjectId(0));
|
||||
newTreeBuilder.add(entry);
|
||||
}
|
||||
}
|
||||
// 新增APP
|
||||
for (ApplicationEntity entity : addAppList) {
|
||||
for (String fileName : T.ListUtil.of("README.md", "meta.json", "signature.json")) {
|
||||
String fileContent = T.StrUtil.EMPTY;
|
||||
if ("meta.json".equals(fileName)) {
|
||||
JSONObject tempJSONObject = T.JSONUtil.parseObj(entity);
|
||||
tempJSONObject.remove("signature");
|
||||
fileContent = T.JSONUtil.parse(tempJSONObject).toJSONString(2);
|
||||
}
|
||||
if ("signature.json".equals(fileName)) {
|
||||
String jsonStr = T.JSONUtil.toJsonStr(entity.getSignature());
|
||||
JSONObject tempJSONObject = T.JSONUtil.parseObj(jsonStr);
|
||||
fileContent = T.JSONUtil.parse(tempJSONObject).toJSONString(2);
|
||||
}
|
||||
// save
|
||||
String filePath = T.StrUtil.concat(true, "applications/", entity.getName(), "/", fileName);
|
||||
DirCacheEntry dirCacheEntry = new DirCacheEntry(filePath);
|
||||
dirCacheEntry.setFileMode(FileMode.REGULAR_FILE);
|
||||
|
||||
ObjectId blobId = JGitUtils.insertBlobFileToDatabase(repository, fileContent.getBytes());
|
||||
dirCacheEntry.setObjectId(blobId);
|
||||
newTreeBuilder.add(dirCacheEntry);
|
||||
}
|
||||
}
|
||||
// 修改APP
|
||||
for (ApplicationEntity entity : updateAppList) {
|
||||
// meta.json
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(entity);
|
||||
jsonObject.remove("signature");
|
||||
|
||||
JSONObject metaInDb = appMetaContentInDb.get(entity.getName());
|
||||
if (null != metaInDb) {
|
||||
// 还原 asw 部分属性值，此部分 tsg app 不记录
|
||||
jsonObject.set("id", metaInDb.getStr("id"));
|
||||
jsonObject.set("developer", metaInDb.getStr("developer", ""));
|
||||
jsonObject.set("website", metaInDb.getStr("website", ""));
|
||||
jsonObject.set("packageName", metaInDb.getObj("packageName"));
|
||||
}
|
||||
|
||||
String fileContent = T.JSONUtil.parse(jsonObject).toJSONString(2);
|
||||
ObjectId objectId = JGitUtils.insertBlobFileToDatabase(repository, fileContent.getBytes());
|
||||
DirCacheEntry dirCacheEntry = JGitUtils.buildDirCacheEntry(T.StrUtil.concat(true, "applications/", entity.getName(), "/meta.json"), FileMode.REGULAR_FILE, objectId);
|
||||
newTreeBuilder.add(dirCacheEntry);
|
||||
|
||||
// signature.json
|
||||
String jsonStr = T.JSONUtil.toJsonStr(entity.getSignature());
|
||||
JSONObject jsonObject2 = T.JSONUtil.parseObj(jsonStr);
|
||||
|
||||
String fileContent2 = T.JSONUtil.parse(jsonObject2).toJSONString(2);
|
||||
ObjectId objectId2 = JGitUtils.insertBlobFileToDatabase(repository, fileContent2.getBytes());
|
||||
DirCacheEntry dirCacheEntry2 = JGitUtils.buildDirCacheEntry(T.StrUtil.concat(true, "applications/", entity.getName(), "/signature.json"), FileMode.REGULAR_FILE, objectId2);
|
||||
newTreeBuilder.add(dirCacheEntry2);
|
||||
}
|
||||
newTreeBuilder.finish();
|
||||
|
||||
RevCommit commitId = revWalk.parseCommit(branchRef);
|
||||
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
PersonIdent personIdent = JGitUtils.buildPersonIdent(loginUserEntity.getName());
|
||||
|
||||
boolean success = JGitUtils.commitIndex(repository, branch, newTree, commitId, null, commitMessage, personIdent);
|
||||
log.info("[saveOrUpdateBatch] [workspaceId: {}] [branch: {}] [commitId: {}] [success: {}]", workspaceId, branch, commitId, success);
|
||||
}
|
||||
} catch (IOException | ConcurrentRefUpdateException e) {
|
||||
log.error(e, "[saveOrUpdateBatch] [error] [workspaceId: {}] [branch: {}]", workspaceId, branch);
|
||||
throw new RuntimeException(e);
|
||||
JSONObject body = new JSONObject();
|
||||
body.put("attributes", attributes);
|
||||
kibanaClient.saveIndexPattern(token, workspaceId, body);
|
||||
}
|
||||
|
||||
// build url
|
||||
String baseUrl = UrlBuilder.ofHttp(kibanaUrl)
|
||||
.addPath("/app/data-explorer/discover")
|
||||
.addQuery("jwt", token)
|
||||
.toString();
|
||||
|
||||
// build query param
|
||||
String param1 = String.format("_a=(discover:(columns:!(_source),isDirty:!f,sort:!()),metadata:(indexPattern:'%s',view:discover))", workspaceId);
|
||||
String param2 = "_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))";
|
||||
|
||||
String filter = pcapList.stream()
|
||||
.map(PcapEntity::getId)
|
||||
.map(pcapId -> "\"" + pcapId + "\"")
|
||||
.collect(Collectors.joining("|", "pcap.id: (", ")"));
|
||||
String param3 = String.format("_q=(filters:!(),query:(language:lucene,query:'%s'))", filter);
|
||||
|
||||
String query = String.format("?%s&%s&%s", param1, param2, param3);
|
||||
String kibanaDiscoverUrl = baseUrl + "#" + query;
|
||||
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[generateKibanaDiscoverUrl] [url: {}]", kibanaDiscoverUrl);
|
||||
}
|
||||
return kibanaDiscoverUrl;
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] exportAppByFormat(List<ApplicationEntity> appList, String format) {
|
||||
try {
|
||||
switch (format) {
|
||||
case "tsg2402": {
|
||||
Map<Object, Object> m = tsg2402ApplicationService.aswToTsg2402(appList);
|
||||
JSON json = new JSONObject(m, JSONConfig.create().setIgnoreNullValue(false).setKeyComparator(String::compareToIgnoreCase));
|
||||
return T.StrUtil.bytes(json.toJSONString(0));
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return new byte[]{};
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[exportAppByFormat] [error] [format: {}] [application: {}]", format, T.JSONUtil.toJsonStr(appList));
|
||||
throw new ASWException(RCode.ERROR);
|
||||
public ApplicationEntity updateBasic(ApplicationEntity entity) {
|
||||
|
||||
ApplicationEntity one = this.getById(entity.getId());
|
||||
if (T.ObjectUtil.isNotNull(one) && !T.StrUtil.equals(entity.getId(), one.getId())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_DUPLICATE_RECORD).build();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ApplicationEntity> importAppByFormat(String workspaceId, String branch, String format, List<JSONObject> dataList) {
|
||||
try {
|
||||
switch (format) {
|
||||
case "tsg2402": {
|
||||
List<ApplicationEntity> records = tsg2402ApplicationService.tsg2402ToAsw(workspaceId, dataList);
|
||||
|
||||
// commit
|
||||
String commitMessage = "feat: import application data from TSG system (version 2402)";
|
||||
this.saveOrUpdateBatch(workspaceId, branch, commitMessage, records);
|
||||
return records;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return new ArrayList<>();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[importAppByFormat] [error] [workspaceId: {}] [format: {}]", workspaceId, format);
|
||||
throw new ASWException(RCode.ERROR);
|
||||
// package name format
|
||||
if (T.ObjectUtil.isNotEmpty(entity.getPackageName()) && !T.JSONUtil.isTypeJSON(entity.getPackageName())) {
|
||||
throw ASWException.builder().rcode(RCode.APP_PACKAGE_NAME_FORMAT_ERROR).build();
|
||||
} else if (T.ObjectUtil.isEmpty(entity.getPackageName())) {
|
||||
entity.setPackageName("{}");
|
||||
}
|
||||
}
|
||||
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setOpVersion(one.getOpVersion() + 1);
|
||||
|
||||
this.saveApplicationToLog(one);
|
||||
this.updateById(entity);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.ApplicationSignatureDao;
|
||||
import net.geedge.asw.module.app.entity.ApplicationSignatureEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationSignatureService;
|
||||
import net.geedge.asw.module.app.service.ApplicationSignatureService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -17,14 +17,17 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class ApplicationSignatureServiceImpl extends ServiceImpl<ApplicationSignatureDao, ApplicationSignatureEntity> implements IApplicationSignatureService {
|
||||
public class ApplicationSignatureServiceImpl extends ServiceImpl<ApplicationSignatureDao, ApplicationSignatureEntity> implements ApplicationSignatureService {
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void saveSignature(ApplicationSignatureEntity signature, String applicationId) {
|
||||
// query last note
|
||||
ApplicationSignatureEntity signatureLast = this.queryLastVersionSignatureByAppId(applicationId);
|
||||
ApplicationSignatureEntity signatureLast = this.getOne(new LambdaQueryWrapper<ApplicationSignatureEntity>()
|
||||
.eq(ApplicationSignatureEntity::getApplicationId, applicationId)
|
||||
.orderByDesc(ApplicationSignatureEntity::getOpVersion)
|
||||
.last("limit 1"));
|
||||
|
||||
if (T.ObjectUtil.isNotEmpty(signatureLast)){
|
||||
signature.setOpVersion(signatureLast.getOpVersion() + 1);
|
||||
@@ -62,7 +65,10 @@ public class ApplicationSignatureServiceImpl extends ServiceImpl<ApplicationSign
|
||||
ApplicationSignatureEntity signature = this.getOne(new LambdaQueryWrapper<ApplicationSignatureEntity>()
|
||||
.eq(ApplicationSignatureEntity::getApplicationId, applicationId)
|
||||
.eq(ApplicationSignatureEntity::getOpVersion, version));
|
||||
ApplicationSignatureEntity lastSignature = this.queryLastVersionSignatureByAppId(applicationId);
|
||||
ApplicationSignatureEntity lastSignature = this.getOne(new LambdaQueryWrapper<ApplicationSignatureEntity>()
|
||||
.eq(ApplicationSignatureEntity::getApplicationId, applicationId)
|
||||
.orderByDesc(ApplicationSignatureEntity::getOpVersion)
|
||||
.last("limit 1"));
|
||||
if (T.ObjectUtil.isEmpty(signature)) {
|
||||
throw ASWException.builder().rcode(RCode.APP_SIGNATURE_NOT_EXIST).build();
|
||||
}
|
||||
@@ -72,14 +78,4 @@ public class ApplicationSignatureServiceImpl extends ServiceImpl<ApplicationSign
|
||||
signature.setOpVersion(lastSignature.getOpVersion() + 1);
|
||||
this.save(signature);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApplicationSignatureEntity queryLastVersionSignatureByAppId(String applicationId) {
|
||||
ApplicationSignatureEntity entity = this.getOne(new LambdaQueryWrapper<ApplicationSignatureEntity>()
|
||||
.eq(ApplicationSignatureEntity::getApplicationId, applicationId)
|
||||
.orderByDesc(ApplicationSignatureEntity::getOpVersion)
|
||||
.last("limit 1"));
|
||||
return entity;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,156 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationMergeEntity;
|
||||
import net.geedge.asw.module.app.service.IBranchService;
|
||||
import net.geedge.asw.module.app.service.IApplicationMergeService;
|
||||
import net.geedge.asw.module.app.service.impl.ApplicationMergeServiceImpl.MergeRequestStatus;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.api.Git;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.lib.Ref;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.eclipse.jgit.revwalk.RevWalk;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class BranchServiceImpl implements IBranchService {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
private IApplicationMergeService applicationMergeService;
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listBranch(String workspaceId, String search) {
|
||||
List<Map<Object, Object>> resultList = T.ListUtil.list(true);
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
String fullBranch = repository.getFullBranch();
|
||||
|
||||
String defaultBranch = "main";
|
||||
if (fullBranch != null && fullBranch.startsWith(JGitUtils.R_HEADS)) {
|
||||
defaultBranch = fullBranch.substring(JGitUtils.R_HEADS.length());
|
||||
}
|
||||
|
||||
// 默认行为，进查询本地分支
|
||||
List<Ref> call = git.branchList().call();
|
||||
RevWalk revCommits = new RevWalk(repository);
|
||||
|
||||
for (Ref ref : call) {
|
||||
String branchName = ref.getName();
|
||||
// 返回时去掉前缀
|
||||
branchName = branchName.replaceAll(JGitUtils.R_HEADS, "");
|
||||
if (T.StrUtil.isNotEmpty(search)) {
|
||||
if (!T.StrUtil.contains(branchName, search)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("name", branchName)
|
||||
.put("default", T.StrUtil.equals(defaultBranch, branchName))
|
||||
.build();
|
||||
|
||||
RevCommit commit = revCommits.parseCommit(ref.getObjectId());
|
||||
m.put("commit", JGitUtils.buildAswCommitInfo(commit));
|
||||
|
||||
resultList.add(m);
|
||||
}
|
||||
revCommits.close();
|
||||
revCommits.dispose();
|
||||
} catch (GitAPIException | IOException e) {
|
||||
log.error(e, "[listBranch] [error] [workspaceId: {}]", workspaceId);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> infoBranch(String workspaceId, String branchName) {
|
||||
List<Map<Object, Object>> listBranch = this.listBranch(workspaceId, branchName);
|
||||
// 分支不存在
|
||||
if (T.CollUtil.isEmpty(listBranch)) {
|
||||
throw new ASWException(RCode.SYS_RECORD_NOT_FOUND);
|
||||
}
|
||||
return T.CollUtil.getFirst(listBranch);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> newBranch(String workspaceId, String name, String ref) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
|
||||
git.branchCreate()
|
||||
.setName(name)
|
||||
.setStartPoint(ref)
|
||||
.call();
|
||||
|
||||
return this.infoBranch(workspaceId, name);
|
||||
} catch (GitAPIException | IOException e) {
|
||||
log.error(e, "[newBranch] [error] [workspaceId: {}] [branch: {}] [ref: {}]", workspaceId, name, ref);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteBranch(String workspaceId, String branchName) {
|
||||
log.info("[deleteBranch] [begin] [workspaceId: {}] [branch: {}]", workspaceId, branchName);
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
|
||||
git.branchDelete()
|
||||
.setBranchNames(branchName)
|
||||
.setForce(true)
|
||||
.call();
|
||||
|
||||
// OPEN 状态，mr 源分支被删除，mr 记录直接删掉
|
||||
applicationMergeService.remove(new LambdaQueryWrapper<ApplicationMergeEntity>()
|
||||
.eq(ApplicationMergeEntity::getWorkspaceId, workspaceId)
|
||||
.eq(ApplicationMergeEntity::getSourceBranch, branchName)
|
||||
.eq(ApplicationMergeEntity::getStatus, MergeRequestStatus.OPEN.toString())
|
||||
);
|
||||
} catch (GitAPIException | IOException e) {
|
||||
log.error(e, "[deleteBranch] [error] [workspaceId: {}] [branchName: {}]", workspaceId, branchName);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listBranchCommit(String workspaceId, String branch, String path) {
|
||||
List<Map<Object, Object>> resultList = T.ListUtil.list(true);
|
||||
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir)) {
|
||||
|
||||
List<RevCommit> branchCommitList = JGitUtils.getBranchCommitList(repository, branch, path);
|
||||
branchCommitList.forEach(revCommit -> resultList.add(JGitUtils.buildAswCommitInfo(revCommit)));
|
||||
|
||||
} catch (GitAPIException | IOException e) {
|
||||
log.error(e, "[listBranchCommit] [error] [workspaceId: {}] [branch: {}] [path: {}]", workspaceId, branch, path);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,74 +1,33 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.log.Log;
|
||||
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 net.geedge.asw.common.config.Query;
|
||||
import net.geedge.asw.common.util.*;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.dao.PackageDao;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.app.service.IPackageService;
|
||||
import net.geedge.asw.module.app.util.ApkInfo;
|
||||
import net.geedge.asw.module.app.util.ApkUtil;
|
||||
import net.geedge.asw.module.app.util.PkgConstant;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workbook.service.IWorkbookResourceService;
|
||||
import net.geedge.asw.module.workbook.util.WorkbookConstant;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class PackageServiceImpl extends ServiceImpl<PackageDao, PackageEntity> implements IPackageService {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Autowired
|
||||
private IWorkbookResourceService workbookResourceService;
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Value("${asw.resources.path:resources}")
|
||||
private String resources;
|
||||
|
||||
@Override
|
||||
public PackageEntity queryInfo(String id) {
|
||||
PackageEntity entity = this.getById(id);
|
||||
T.VerifyUtil.is(entity).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
// user
|
||||
SysUserEntity createUser = sysUserService.getById(entity.getCreateUserId());
|
||||
SysUserEntity updateUser = sysUserService.getById(entity.getUpdateUserId());
|
||||
|
||||
createUser.setPwd(null);
|
||||
updateUser.setPwd(null);
|
||||
|
||||
entity.setCreateUser(createUser);
|
||||
entity.setUpdateUser(updateUser);
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(PackageEntity.class).getPage(params);
|
||||
Page page = T.PageUtil.getPage(params);
|
||||
List<PackageEntity> packageList = this.getBaseMapper().queryList(page, params);
|
||||
page.setRecords(packageList);
|
||||
return page;
|
||||
@@ -76,93 +35,56 @@ public class PackageServiceImpl extends ServiceImpl<PackageDao, PackageEntity> i
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public PackageEntity savePackage(String workspaceId, String description, Resource fileResource) {
|
||||
public PackageEntity savePackage(PackageEntity entity) {
|
||||
PackageEntity one = this.getOne(new LambdaQueryWrapper<PackageEntity>()
|
||||
.eq(PackageEntity::getWorkspaceId, entity.getWorkspaceId())
|
||||
.eq(PackageEntity::getName, entity.getName()));
|
||||
if (T.ObjectUtil.isNotNull(one)) {
|
||||
throw ASWException.builder().rcode(RCode.SYS_DUPLICATE_RECORD).build();
|
||||
}
|
||||
|
||||
String pkgId = T.StrUtil.uuid();
|
||||
String filename = fileResource.getFilename();
|
||||
String suffix = T.FileUtil.extName(filename);
|
||||
suffix = T.StrUtil.emptyToDefault(suffix, "apk");
|
||||
if (!Constants.ANDROID_PACKAGE_TYPE_LIST.contains(suffix)) {
|
||||
throw new ASWException(RCode.PACKAGE_FILE_TYPE_ERROR);
|
||||
}
|
||||
String saveFileName = pkgId + "." + suffix;
|
||||
File destination = FileResourceUtil.createFile(resources, workspaceId, Constants.FileTypeEnum.PACKAGE.getType(), pkgId, saveFileName);
|
||||
PackageEntity entity = new PackageEntity();
|
||||
ApkUtil apkUtil = new ApkUtil();
|
||||
apkUtil.setAaptToolPath(Path.of(T.WebPathUtil.getRootPath(), "lib", "aapt").toString());
|
||||
try {
|
||||
FileUtils.copyInputStreamToFile(fileResource.getInputStream(), destination);
|
||||
if (suffix.equals("apk")) {
|
||||
// parse
|
||||
ApkInfo apkInfo = apkUtil.parseApk(destination.getPath());
|
||||
if (T.ObjectUtil.isNull(apkInfo)) {
|
||||
throw new ASWException(RCode.PACKAGE_FILE_TYPE_ERROR);
|
||||
}
|
||||
entity.setName(apkInfo.getLabel());
|
||||
entity.setVersion(apkInfo.getVersionName());
|
||||
entity.setIdentifier(apkInfo.getPackageName());
|
||||
} else {
|
||||
ApkInfo apkInfo = apkUtil.parseXapk(destination.getPath());
|
||||
if (T.ObjectUtil.isNull(apkInfo)) {
|
||||
throw new ASWException(RCode.PACKAGE_FILE_TYPE_ERROR);
|
||||
}
|
||||
entity.setName(apkInfo.getLabel());
|
||||
entity.setVersion(apkInfo.getVersionName());
|
||||
entity.setIdentifier(apkInfo.getPackageName());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[savePackage] [save package error] [file: {}]", fileResource.getFilename());
|
||||
FileUtil.del(destination);
|
||||
throw new ASWException(RCode.PACKAGE_FILE_TYPE_ERROR);
|
||||
}
|
||||
entity.setId(pkgId);
|
||||
entity.setDescription(T.StrUtil.emptyToDefault(description, ""));
|
||||
entity.setPlatform(PkgConstant.Platform.ANDROID.getValue());
|
||||
entity.setWorkspaceId(workspaceId);
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setSize(destination.length());
|
||||
entity.setPath(destination.getPath());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
|
||||
// save
|
||||
this.save(entity);
|
||||
|
||||
// workbook resource
|
||||
workbookResourceService.saveResource(entity.getWorkbookId(), entity.getId(), WorkbookConstant.ResourceType.PACKAGE.getValue());
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public PackageEntity updatePackage(PackageEntity entity) {
|
||||
PackageEntity one = this.getOne(new LambdaQueryWrapper<PackageEntity>()
|
||||
.eq(PackageEntity::getWorkspaceId, entity.getWorkspaceId())
|
||||
.eq(PackageEntity::getName, entity.getName())
|
||||
.ne(PackageEntity::getId, entity.getId()));
|
||||
if (T.ObjectUtil.isNotNull(one)) {
|
||||
throw ASWException.builder().rcode(RCode.SYS_DUPLICATE_RECORD).build();
|
||||
}
|
||||
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
|
||||
// update
|
||||
this.updateById(entity);
|
||||
|
||||
// workbook resource
|
||||
workbookResourceService.saveResource(entity.getWorkbookId(), entity.getId(), WorkbookConstant.ResourceType.PACKAGE.getValue());
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removePackage(List<String> ids) {
|
||||
|
||||
List<JobEntity> jobList = jobService.list(new LambdaQueryWrapper<JobEntity>().in(JobEntity::getPackageId, ids));
|
||||
if (T.CollUtil.isNotEmpty(jobList)) {
|
||||
throw new ASWException(RCode.PACKAGE_CANNOT_DELETE);
|
||||
}
|
||||
|
||||
for (String id : ids) {
|
||||
PackageEntity entity = this.getById(id);
|
||||
// remove file
|
||||
T.FileUtil.del(entity.getPath());
|
||||
|
||||
// remove
|
||||
this.removeById(id);
|
||||
}
|
||||
|
||||
// remove
|
||||
this.removeBatchByIds(ids);
|
||||
// workbook resource
|
||||
workbookResourceService.removeResource(ids, WorkbookConstant.ResourceType.PACKAGE.getValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
public PackageEntity updatePackage(String workspaceId, String packageId, String name, String description) {
|
||||
PackageEntity entity = this.getById(packageId);
|
||||
if (T.StrUtil.isNotEmpty(name)){
|
||||
entity.setName(name);
|
||||
}
|
||||
if (T.StrUtil.isNotEmpty(description)){
|
||||
entity.setDescription(description);
|
||||
}
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
this.updateById(entity);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,813 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.hutool.core.lang.Validator;
|
||||
import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.service.ITSGApplicationService;
|
||||
import net.geedge.asw.module.attribute.entity.AttributeEntity;
|
||||
import net.geedge.asw.module.attribute.service.IAttributeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service("tsg2402ApplicationService")
|
||||
public class TSG2402ApplicationServiceImpl implements ITSGApplicationService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IAttributeService attributeService;
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> aswToTsg2402(List<ApplicationEntity> appList) {
|
||||
|
||||
List<Object> applications = this.buildTSG2402Applications(appList);
|
||||
|
||||
Map<Object, Object> signatures = this.buildTSG2402Signatures(appList);
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("applications", applications)
|
||||
.putAll(signatures)
|
||||
.build();
|
||||
return m;
|
||||
}
|
||||
|
||||
private List<Object> buildTSG2402Applications(List<ApplicationEntity> appList) {
|
||||
List<Object> applications = T.ListUtil.list(true);
|
||||
for (ApplicationEntity app : appList) {
|
||||
// application
|
||||
Map<Object, Object> application = T.MapUtil.builder()
|
||||
.put("app_name", app.getName())
|
||||
.put("app_longname", app.getName())
|
||||
.put("description", app.getDescription())
|
||||
.build();
|
||||
|
||||
// app_properties
|
||||
Map properties = (Map) app.getProperties();
|
||||
Map<Object, Object> app_properties = T.MapUtil.builder()
|
||||
.put("parent_app_id", 0)
|
||||
.put("parent_app_name", T.MapUtil.getStr(properties, "parentApp", ""))
|
||||
.put("category", T.MapUtil.getStr(properties, "category", ""))
|
||||
.put("subcategory", T.MapUtil.getStr(properties, "subcategory", ""))
|
||||
.put("content", T.MapUtil.getStr(properties, "content", ""))
|
||||
.put("risk", T.MapUtil.getStr(properties, "risk", "1"))
|
||||
.put("deny_action", T.MapUtil.builder()
|
||||
.put("method", "drop")
|
||||
.put("after_n_packets", 0)
|
||||
.put("send_icmp_unreachable", 0)
|
||||
.put("send_tcp_reset", 0)
|
||||
.build()
|
||||
)
|
||||
.put("continue_scanning", 0)
|
||||
.put("tcp_timeout", 0)
|
||||
.put("udp_timeout", 0)
|
||||
.put("tcp_half_close", 0)
|
||||
.put("tcp_time_wait", 0)
|
||||
.build();
|
||||
application.put("app_properties", app_properties);
|
||||
|
||||
// app_surrogates
|
||||
JSONObject jsonObject = (JSONObject) app.getSignature();
|
||||
JSONArray surrogates = jsonObject.getJSONArray("surrogates");
|
||||
if (!surrogates.isEmpty()) {
|
||||
List<Map> app_surrogates = T.ListUtil.list(true);
|
||||
surrogates.forEach(obj -> {
|
||||
List<Object> signature_sequence = T.ListUtil.list(true);
|
||||
|
||||
JSONArray signatureArr = ((JSONObject) obj).getJSONArray("signatures");
|
||||
signatureArr.stream().map(o -> ((JSONObject) o).getStr("name")).forEach(tname -> {
|
||||
signature_sequence.add(T.MapUtil.builder()
|
||||
.put("signature", tname)
|
||||
.put("exclude", 0)
|
||||
.build()
|
||||
);
|
||||
});
|
||||
|
||||
app_surrogates.add(
|
||||
T.MapUtil.builder()
|
||||
.put("group_by", "session")
|
||||
.put("time_window", 0)
|
||||
.put("ordered_match", "no")
|
||||
.put("signature_sequence", signature_sequence)
|
||||
.build()
|
||||
);
|
||||
});
|
||||
application.put("app_surrogates", app_surrogates);
|
||||
}
|
||||
applications.add(application);
|
||||
}
|
||||
return applications;
|
||||
}
|
||||
|
||||
private Map<Object, Object> buildTSG2402Signatures(List<ApplicationEntity> appList) {
|
||||
List<Object> signatures = T.ListUtil.list(true);
|
||||
List<Object> sig_objects = T.ListUtil.list(true);
|
||||
|
||||
int sig_object_id = 10, signature_id = 0;
|
||||
for (ApplicationEntity app : appList) {
|
||||
JSONObject jsonObject = (JSONObject) app.getSignature();
|
||||
JSONArray surrogates = jsonObject.getJSONArray("surrogates");
|
||||
List<Object> signaturesForApp = surrogates.stream()
|
||||
.map(obj -> ((JSONObject) obj).getJSONArray("signatures"))
|
||||
.flatMap(Collection::stream)
|
||||
.collect(Collectors.toList());
|
||||
for (Object object : signaturesForApp) {
|
||||
JSONObject surrogate = (JSONObject) object;
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("signature_id", signature_id++)
|
||||
.put("signature_name", T.MapUtil.getStr(surrogate, "name"))
|
||||
.put("signature_desc", T.MapUtil.getStr(surrogate, "description", ""))
|
||||
.put("icon_color", "")
|
||||
.build();
|
||||
|
||||
List<Object> and_conditions = T.ListUtil.list(true);
|
||||
JSONArray conditions = surrogate.getJSONArray("conditions");
|
||||
for (Object condition : conditions) {
|
||||
JSONObject conditionJSONObj = (JSONObject) condition;
|
||||
|
||||
String attributeName = T.MapUtil.getStr(conditionJSONObj, "attributeName");
|
||||
AttributeEntity attributeEntity = attributeService.queryAttribute(attributeName);
|
||||
if (null == attributeEntity || T.StrUtil.isEmpty(attributeEntity.getObjectType())) continue;
|
||||
|
||||
Map<Object, Object> or_condition_obj = T.MapUtil.builder()
|
||||
.put("lua_profile_id", 0)
|
||||
.put("attribute_type", attributeEntity.getType())
|
||||
.put("attribute_name", attributeName)
|
||||
.put("protocol", attributeEntity.getProtocol())
|
||||
.build();
|
||||
|
||||
List<Integer> source_object_ids = T.ListUtil.list(true);
|
||||
|
||||
// objects
|
||||
JSONArray objects = conditionJSONObj.getJSONArray("objects");
|
||||
for (Object tempObject : objects) {
|
||||
JSONObject tempJsonObject = (JSONObject) tempObject;
|
||||
|
||||
// sig_objects
|
||||
JSONArray items = tempJsonObject.getJSONArray("items");
|
||||
String objectName = tempJsonObject.getStr("name");
|
||||
String objectType = tempJsonObject.getStr("type");
|
||||
String objectDescription = tempJsonObject.getStr("description");
|
||||
|
||||
if ("application".equalsIgnoreCase(objectType)) {
|
||||
continue;
|
||||
} else if ("boolean".equals(objectType)) {
|
||||
items.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
String itemValue = T.MapUtil.getStr((JSONObject) item, "item");
|
||||
if ("True".equalsIgnoreCase(itemValue)) {
|
||||
source_object_ids.add(2);
|
||||
} else if ("False".equalsIgnoreCase(itemValue)) {
|
||||
source_object_ids.add(3);
|
||||
}
|
||||
});
|
||||
} else if ("ip_protocol".equals(objectType)) {
|
||||
items.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
String itemValue = T.MapUtil.getStr((JSONObject) item, "item");
|
||||
if ("ICMP".equalsIgnoreCase(itemValue)) {
|
||||
source_object_ids.add(5);
|
||||
} else if ("TCP".equalsIgnoreCase(itemValue)) {
|
||||
source_object_ids.add(6);
|
||||
} else if ("UDP".equalsIgnoreCase(itemValue)) {
|
||||
source_object_ids.add(7);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Map<Object, Object> sig_object = T.MapUtil.builder()
|
||||
.put("id", sig_object_id)
|
||||
.put("source_id", sig_object_id)
|
||||
.put("name", objectName)
|
||||
.put("source_name", objectName)
|
||||
.put("type", objectType)
|
||||
.put("sub_type", attributeEntity.getType())
|
||||
.put("member_type", "item")
|
||||
.put("uuid", T.IdUtil.fastSimpleUUID())
|
||||
.put("statistics_option", "none")
|
||||
.put("description", objectDescription)
|
||||
.build();
|
||||
|
||||
Map<Object, Object> member = this.buildTSG2402SignaturesMember(objectType.toLowerCase(), items);
|
||||
sig_object.put("member", member);
|
||||
|
||||
sig_objects.add(sig_object);
|
||||
source_object_ids.add(sig_object_id);
|
||||
sig_object_id++;
|
||||
}
|
||||
}
|
||||
|
||||
or_condition_obj.put("source_object_ids", source_object_ids);
|
||||
Map<Object, Object> and_condition_item = T.MapUtil.builder()
|
||||
.put("not_flag", T.MapUtil.getBool(conditionJSONObj, "negateOption", false) ? 1 : 0)
|
||||
.put("or_conditions", T.ListUtil.of(or_condition_obj))
|
||||
.build();
|
||||
and_conditions.add(and_condition_item);
|
||||
}
|
||||
|
||||
if (T.CollUtil.isNotEmpty(and_conditions)) {
|
||||
m.put("and_conditions", and_conditions);
|
||||
signatures.add(m);
|
||||
}
|
||||
}
|
||||
}
|
||||
sig_objects.add(T.JSONUtil.parseObj("""
|
||||
{
|
||||
"id": 2,
|
||||
"type": "boolean",
|
||||
"name": "True",
|
||||
"vsys_id": 0,
|
||||
"description": "True",
|
||||
"source_id": 2,
|
||||
"source_name": "True",
|
||||
"member_type": "item",
|
||||
"uuid": "c4ca4238a0b923820dcc509a6f75849b",
|
||||
"statistics_option": "elaborate"
|
||||
}
|
||||
"""));
|
||||
sig_objects.add(T.JSONUtil.parseObj("""
|
||||
{
|
||||
"id": 3,
|
||||
"type": "boolean",
|
||||
"name": "False",
|
||||
"vsys_id": 0,
|
||||
"description": "False",
|
||||
"source_id": 3,
|
||||
"source_name": "False",
|
||||
"member_type": "item",
|
||||
"uuid": "cfcd208495d565ef66e7dff9f98764da",
|
||||
"statistics_option": "elaborate"
|
||||
}
|
||||
"""));
|
||||
sig_objects.add(T.JSONUtil.parseObj("""
|
||||
{
|
||||
"id": 5,
|
||||
"type": "ip_protocol",
|
||||
"name": "ICMP",
|
||||
"vsys_id": 0,
|
||||
"description": "ICMP",
|
||||
"source_id": 5,
|
||||
"source_name": "ICMP",
|
||||
"member_type": "item",
|
||||
"uuid": "c4ca4238a0b923820dcc509a6f75849b",
|
||||
"statistics_option": "elaborate"
|
||||
}
|
||||
"""));
|
||||
sig_objects.add(T.JSONUtil.parseObj("""
|
||||
{
|
||||
"id": 6,
|
||||
"type": "ip_protocol",
|
||||
"name": "TCP",
|
||||
"vsys_id": 0,
|
||||
"description": "TCP",
|
||||
"source_id": 6,
|
||||
"source_name": "TCP",
|
||||
"member_type": "item",
|
||||
"uuid": "1679091c5a880faf6fb5e6087eb1b2dc",
|
||||
"statistics_option": "elaborate"
|
||||
}
|
||||
"""));
|
||||
sig_objects.add(T.JSONUtil.parseObj("""
|
||||
{
|
||||
"id": 7,
|
||||
"type": "ip_protocol",
|
||||
"name": "UDP",
|
||||
"vsys_id": 0,
|
||||
"description": "UDP",
|
||||
"source_id": 7,
|
||||
"source_name": "UDP",
|
||||
"member_type": "item",
|
||||
"uuid": "70efdf2ec9b086079795c442636b55fb",
|
||||
"statistics_option": "elaborate"
|
||||
}
|
||||
"""));
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("signatures", signatures)
|
||||
.put("sig_objects", sig_objects)
|
||||
.build();
|
||||
return m;
|
||||
}
|
||||
|
||||
private Map<Object, Object> buildTSG2402SignaturesMember(String objectType, JSONArray itemArr) {
|
||||
List<Object> list = T.ListUtil.list(true);
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
switch (objectType) {
|
||||
case "keywords":
|
||||
case "http_signature": {
|
||||
String str = item.getStr("item");
|
||||
List<String> patternExprList = T.ListUtil.list(true);
|
||||
patternExprList.add(str);
|
||||
|
||||
// 0 -> 无表达式，1 -> 与表达式，2 -> 正则表达式，3、带偏移量的子串匹配
|
||||
int expr_type = 0;
|
||||
String exprType = item.getStr("exprType", "and");
|
||||
if ("and".equalsIgnoreCase(exprType)) {
|
||||
patternExprList = T.StrUtil.split(str, "&");
|
||||
if (patternExprList.size() > 1) {
|
||||
expr_type = 1;
|
||||
}
|
||||
} else if ("regex".equalsIgnoreCase(exprType)) {
|
||||
expr_type = 2;
|
||||
}
|
||||
|
||||
JSONArray patternArr = new JSONArray();
|
||||
for (String expr : patternExprList) {
|
||||
JSONObject pattern = new JSONObject();
|
||||
pattern.put("keywords", expr);
|
||||
|
||||
Map<String, String> rangeVarMap = this.getRangeVarFromExpr(expr);
|
||||
if (T.MapUtil.isNotEmpty(rangeVarMap)) {
|
||||
expr_type = 3;
|
||||
pattern.put("keywords", expr.replaceAll("^\\(.*?\\)", ""));
|
||||
pattern.put("offset", T.MapUtil.getInt(rangeVarMap, "offset"));
|
||||
pattern.put("depth", T.MapUtil.getInt(rangeVarMap, "depth"));
|
||||
}
|
||||
patternArr.add(pattern);
|
||||
}
|
||||
|
||||
if ("keywords".equals(objectType)) {
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("string", T.MapUtil.builder()
|
||||
.put("item_type", "keywords")
|
||||
.put("expr_type", expr_type)
|
||||
.put("is_hexbin", 0)
|
||||
.put("patterns", patternArr)
|
||||
.build()
|
||||
).build();
|
||||
list.add(m);
|
||||
}
|
||||
if ("http_signature".equals(objectType)) {
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("contextual_string", T.MapUtil.builder()
|
||||
.put("expr_type", expr_type)
|
||||
.put("is_hexbin", 0)
|
||||
.put("context_name", item.getStr("district", "Set-Cookie"))
|
||||
.put("patterns", patternArr)
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
list.add(m);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "url":
|
||||
case "fqdn": {
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("string", T.MapUtil.builder()
|
||||
.put("item_type", objectType)
|
||||
.put("expr_type", 0)
|
||||
.put("is_hexbin", 0)
|
||||
.put("patterns", T.ListUtil.of(
|
||||
new JSONObject().put("keywords", item.getStr("item"))
|
||||
))
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
list.add(m);
|
||||
break;
|
||||
}
|
||||
case "ip": {
|
||||
String str = item.getStr("item");
|
||||
String ip = str;
|
||||
String port = "0-65535";
|
||||
if (str.contains("#")) {
|
||||
ip = str.split("#")[0];
|
||||
port = str.split("#")[1];
|
||||
}
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("ip", T.MapUtil.builder()
|
||||
.put("addr_type", Validator.isIpv4(str) ? 4 : 6)
|
||||
.put("port", port)
|
||||
.put("ip_address", ip)
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
list.add(m);
|
||||
break;
|
||||
}
|
||||
case "port": {
|
||||
String port = item.getStr("item");
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("port", new JSONObject().put("port", port))
|
||||
.build();
|
||||
if (port.contains("-")) {
|
||||
m.put("port", new JSONObject().put("port_range", port));
|
||||
}
|
||||
list.add(m);
|
||||
break;
|
||||
}
|
||||
case "interval": {
|
||||
String str = item.getStr("item");
|
||||
String low_boundary = str, up_boundary = str;
|
||||
if (str.contains("-")) {
|
||||
low_boundary = item.getStr("item").split("-")[0];
|
||||
up_boundary = item.getStr("item").split("-")[1];
|
||||
}
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("interval", T.MapUtil.builder()
|
||||
.put("low_boundary", low_boundary)
|
||||
.put("up_boundary", up_boundary)
|
||||
.build()
|
||||
)
|
||||
.build();
|
||||
list.add(m);
|
||||
break;
|
||||
}
|
||||
case "boolean":
|
||||
case "ip_protocol":
|
||||
case "application": {
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
Map<Object, Object> member = T.MapUtil.builder()
|
||||
.put("items", list)
|
||||
.build();
|
||||
return member;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取表达式中的 range 变量，示例 (nocase=off,offset=6,depth=13)expr_xxxxxxxxx
|
||||
*/
|
||||
private Map<String, String> getRangeVarFromExpr(String expr) {
|
||||
try {
|
||||
String regex = "^\\(([^)]+)\\)";
|
||||
String str = T.ReUtil.get(regex, expr, 1);
|
||||
if (T.StrUtil.isNotEmpty(str)) {
|
||||
String[] pairs = str.split(",");
|
||||
|
||||
Map<String, String> map = new HashMap<>();
|
||||
for (String pair : pairs) {
|
||||
String[] keyValue = pair.split("=");
|
||||
if (keyValue.length == 2) {
|
||||
map.put(keyValue[0].trim(), keyValue[1].trim());
|
||||
}
|
||||
}
|
||||
// 不包含 offset，depth 算没有配置
|
||||
if (!map.containsKey("offset") || !map.containsKey("depth")) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
return map;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[getRangeVarFromExpr] [expr: {}]", expr);
|
||||
}
|
||||
return new HashMap<>();
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public List<ApplicationEntity> tsg2402ToAsw(String workspaceId, List<JSONObject> dataList) {
|
||||
List<ApplicationEntity> records = T.ListUtil.list(true);
|
||||
for (JSONObject tsgAppSourceData : dataList) {
|
||||
|
||||
JSONArray all_application = tsgAppSourceData.getJSONArray("applications");
|
||||
JSONArray all_signature = tsgAppSourceData.getJSONArray("signatures");
|
||||
JSONArray all_sig_object = tsgAppSourceData.getJSONArray("sig_objects");
|
||||
|
||||
all_application.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(application -> {
|
||||
// application
|
||||
String app_name = application.getStr("app_name");
|
||||
String app_longname = application.getStr("app_longname");
|
||||
String description = application.getStr("description");
|
||||
|
||||
JSONObject appProperties = application.getJSONObject("app_properties");
|
||||
String category = T.MapUtil.getStr(appProperties, "category", "");
|
||||
String subcategory = T.MapUtil.getStr(appProperties, "subcategory", "");
|
||||
String content = T.MapUtil.getStr(appProperties, "content", "");
|
||||
String parent_app_name = T.MapUtil.getStr(appProperties, "parent_app_name", "");
|
||||
int risk = T.MapUtil.getInt(appProperties, "risk", 1);
|
||||
|
||||
Map<Object, Object> properties = T.MapUtil.builder()
|
||||
.put("category", category)
|
||||
.put("subcategory", subcategory)
|
||||
.put("content", content)
|
||||
.put("parentApp", parent_app_name)
|
||||
.put("risk", risk)
|
||||
.build();
|
||||
|
||||
// meta.json
|
||||
ApplicationEntity entity = new ApplicationEntity();
|
||||
entity.setName(app_name);
|
||||
entity.setLongName(app_longname);
|
||||
entity.setDescription(description);
|
||||
entity.setProperties(properties);
|
||||
// default value
|
||||
entity.setId(T.StrUtil.uuid());
|
||||
entity.setDeveloper("");
|
||||
entity.setWebsite("");
|
||||
entity.setPackageName(
|
||||
T.MapUtil.builder()
|
||||
.put("android", "")
|
||||
.put("ios", "")
|
||||
.build()
|
||||
);
|
||||
|
||||
// surrogate - signature
|
||||
Map<String, List<String>> surrAndSignListMap = T.MapUtil.newHashMap();
|
||||
JSONArray app_surrogates = application.getJSONArray("app_surrogates");
|
||||
if (T.ObjectUtil.isNotEmpty(app_surrogates)) {
|
||||
for (int i = 0; i < app_surrogates.size(); i++) {
|
||||
JSONObject surrogate = (JSONObject) app_surrogates.get(i);
|
||||
List<String> signatureNameList = (List<String>) T.JSONUtil.getByPath(surrogate, "signature_sequence.signature");
|
||||
surrAndSignListMap.put("surrogate_" + (i + 1), signatureNameList);
|
||||
}
|
||||
}
|
||||
|
||||
List<Object> insertSurrogateList = T.ListUtil.list(true);
|
||||
for (Map.Entry<String, List<String>> entry : surrAndSignListMap.entrySet()) {
|
||||
String surrogateName = entry.getKey();
|
||||
|
||||
List<String> signatureNameList = entry.getValue();
|
||||
List<JSONObject> signatureListInApp = all_signature.stream()
|
||||
.filter(obj -> {
|
||||
String str = T.MapUtil.getStr((JSONObject) obj, "signature_name", "");
|
||||
return signatureNameList.contains(str);
|
||||
})
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.collect(Collectors.toList());
|
||||
if (T.CollUtil.isEmpty(signatureListInApp)) continue;
|
||||
|
||||
List<JSONObject> sigObjectList = all_sig_object.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.collect(Collectors.toList());
|
||||
Map<Object, Object> aswSrrogate = this.buildAswSurrogateFromTSG2402(surrogateName, signatureListInApp, sigObjectList);
|
||||
insertSurrogateList.add(aswSrrogate);
|
||||
}
|
||||
|
||||
Map<Object, Object> sm = T.MapUtil.builder()
|
||||
.put("surrogates", insertSurrogateList)
|
||||
.build();
|
||||
|
||||
// signature.json
|
||||
entity.setSignature(T.JSONUtil.parseObj(sm));
|
||||
|
||||
// add records
|
||||
records.add(entity);
|
||||
});
|
||||
}
|
||||
return records;
|
||||
}
|
||||
|
||||
private Map<Object, Object> buildAswSurrogateFromTSG2402(String surrogateName, List<JSONObject> signatureList, List<JSONObject> sigObjectList) {
|
||||
// surrogate
|
||||
Map<Object, Object> surrogate = T.MapUtil.builder()
|
||||
.put("name", surrogateName)
|
||||
.put("description", "")
|
||||
.build();
|
||||
|
||||
// signatures
|
||||
List<Object> signatures = T.ListUtil.list(true);
|
||||
for (JSONObject jsonObject : signatureList) {
|
||||
String signature_name = jsonObject.getStr("signature_name");
|
||||
String signature_description = jsonObject.getStr("signature_desc");
|
||||
|
||||
Map<Object, Object> signMap = T.MapUtil.builder()
|
||||
.put("name", signature_name)
|
||||
.put("description", signature_description)
|
||||
.build();
|
||||
|
||||
// conditions
|
||||
List<Map<Object, Object>> conditionMapList = T.ListUtil.list(true);
|
||||
|
||||
JSONArray and_conditions = jsonObject.getJSONArray("and_conditions");
|
||||
for (Object obj : and_conditions) {
|
||||
JSONObject conditions = (JSONObject) obj;
|
||||
// base field
|
||||
Integer not_flag = conditions.getInt("not_flag", 0);
|
||||
|
||||
JSONObject or_condition = (JSONObject) T.JSONUtil.getByPath(conditions, "or_conditions[0]");
|
||||
String attribute_name = or_condition.getStr("attribute_name", "");
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("attributeName", attribute_name)
|
||||
.put("negateOption", not_flag == 1 ? true : false)
|
||||
.put("description", "")
|
||||
.build();
|
||||
|
||||
// items
|
||||
List<Integer> source_object_ids = (List<Integer>) T.JSONUtil.getByPath(or_condition, "source_object_ids");
|
||||
if (T.CollUtil.isEmpty(source_object_ids)) continue;
|
||||
|
||||
List<JSONObject> sourceObjectList = sigObjectList.stream()
|
||||
.filter(entries -> {
|
||||
Integer anInt = entries.getInt("id");
|
||||
return source_object_ids.contains(anInt);
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
||||
List<Map<Object, Object>> objects = this.buildAswConditionObjectsFromTSG2402(sourceObjectList);
|
||||
if (T.CollUtil.isEmpty(objects)) continue;
|
||||
|
||||
m.put("objects", objects);
|
||||
conditionMapList.add(m);
|
||||
}
|
||||
|
||||
signMap.put("conditions", conditionMapList);
|
||||
signatures.add(signMap);
|
||||
}
|
||||
|
||||
surrogate.put("signatures", signatures);
|
||||
return surrogate;
|
||||
}
|
||||
|
||||
private List<Map<Object, Object>> buildAswConditionObjectsFromTSG2402(List<JSONObject> sourceObjectList) {
|
||||
List<Map<Object, Object>> objectList = T.ListUtil.list(true);
|
||||
for (JSONObject jsonObject : sourceObjectList) {
|
||||
String name = jsonObject.getStr("name");
|
||||
String type = jsonObject.getStr("type");
|
||||
String description = jsonObject.getStr("description");
|
||||
|
||||
JSONArray itemArr = (JSONArray) T.JSONUtil.getByPath(jsonObject, "member.items");
|
||||
itemArr = T.CollUtil.defaultIfEmpty(itemArr, new JSONArray());
|
||||
|
||||
List<Map<Object, Object>> items = T.ListUtil.list(true);
|
||||
switch (type) {
|
||||
case "http_signature":
|
||||
case "keywords": {
|
||||
String exprTypeJsonPath = "keywords" .equals(type) ? "string.expr_type" : "contextual_string.expr_type";
|
||||
String firstExprJsonPath = "keywords" .equals(type) ? "string.patterns[0].keywords" : "contextual_string.patterns[0].keywords";
|
||||
String patternsJsonPath = "keywords" .equals(type) ? "string.patterns" : "contextual_string.patterns";
|
||||
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
// 0 -> 无表达式，1 -> 与表达式，2 -> 正则表达式，3、带偏移量的子串匹配
|
||||
Integer expr_type = (Integer) T.JSONUtil.getByPath(item, exprTypeJsonPath);
|
||||
|
||||
String tempType = "and";
|
||||
String expr = (String) T.JSONUtil.getByPath(item, firstExprJsonPath);
|
||||
switch (expr_type) {
|
||||
case 0:
|
||||
break;
|
||||
case 1: {
|
||||
JSONArray patterns = (JSONArray) T.JSONUtil.getByPath(item, patternsJsonPath);
|
||||
expr = patterns.stream()
|
||||
.map(obj -> ((JSONObject) obj).getStr("keywords"))
|
||||
.collect(Collectors.joining("&"));
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
tempType = "regex";
|
||||
break;
|
||||
case 3: {
|
||||
JSONArray patterns = (JSONArray) T.JSONUtil.getByPath(item, patternsJsonPath);
|
||||
expr = patterns.stream()
|
||||
.map(obj -> {
|
||||
String keywords = ((JSONObject) obj).getStr("keywords");
|
||||
String offset = ((JSONObject) obj).getStr("offset");
|
||||
String depth = ((JSONObject) obj).getStr("depth");
|
||||
return T.StrUtil.concat(true, "(offset=", offset, ",depth=", depth, ")", keywords);
|
||||
})
|
||||
.collect(Collectors.joining("&"));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("item", expr)
|
||||
.put("exprType", tempType)
|
||||
.put("description", "")
|
||||
.build();
|
||||
String context_name = (String) T.JSONUtil.getByPath(item, "contextual_string.context_name");
|
||||
if (T.StrUtil.isNotEmpty(context_name)) {
|
||||
m.put("district", context_name);
|
||||
}
|
||||
items.add(m);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "url":
|
||||
case "fqdn": {
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
String str = (String) T.JSONUtil.getByPath(item, "string.patterns[0].keywords");
|
||||
items.add(
|
||||
T.MapUtil.builder()
|
||||
.put("item", str)
|
||||
.put("description", "")
|
||||
.build()
|
||||
);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "ip": {
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
String port = (String) T.JSONUtil.getByPath(item, "ip.port");
|
||||
String ipAddress = (String) T.JSONUtil.getByPath(item, "ip.ip_address");
|
||||
if (T.StrUtil.isEmpty(ipAddress)) {
|
||||
ipAddress = (String) T.JSONUtil.getByPath(item, "ip.ip_cidr");
|
||||
}
|
||||
if (T.StrUtil.isEmpty(ipAddress)) {
|
||||
ipAddress = (String) T.JSONUtil.getByPath(item, "ip.ip_range");
|
||||
}
|
||||
if (!"0-65535" .equalsIgnoreCase(port)) {
|
||||
ipAddress = T.StrUtil.concat(true, ipAddress, "#", port);
|
||||
}
|
||||
items.add(
|
||||
T.MapUtil.builder()
|
||||
.put("item", ipAddress)
|
||||
.put("description", "")
|
||||
.build()
|
||||
);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "port": {
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
String port = (String) T.JSONUtil.getByPath(item, "port.port");
|
||||
if (T.StrUtil.isEmpty(port)) {
|
||||
port = (String) T.JSONUtil.getByPath(item, "port.port_range");
|
||||
}
|
||||
items.add(
|
||||
T.MapUtil.builder()
|
||||
.put("item", port)
|
||||
.put("description", "")
|
||||
.build()
|
||||
);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "interval": {
|
||||
itemArr.stream()
|
||||
.map(obj -> (JSONObject) obj)
|
||||
.forEach(item -> {
|
||||
Object low_boundary = T.JSONUtil.getByPath(item, "interval.low_boundary");
|
||||
Object up_boundary = T.JSONUtil.getByPath(item, "interval.up_boundary");
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("item", low_boundary + "-" + up_boundary)
|
||||
.put("description", "")
|
||||
.build();
|
||||
items.add(m);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "boolean":
|
||||
case "ip_protocol": {
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("item", jsonObject.getStr("name"))
|
||||
.put("description", "")
|
||||
.build();
|
||||
items.add(m);
|
||||
break;
|
||||
}
|
||||
case "application": {
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("name", name)
|
||||
.put("type", type)
|
||||
.put("description", description)
|
||||
.put("items", items)
|
||||
.build();
|
||||
objectList.add(m);
|
||||
}
|
||||
return objectList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> aswToTsg2410(List<ApplicationEntity> appList) {
|
||||
// 不在这个类处理，在 TSG2410ApplicationServiceImpl 实现
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ApplicationEntity> tsg2410ToAsw(String workspaceId, List<JSONObject> dataList) {
|
||||
// 不在这个类处理，在 TSG2410ApplicationServiceImpl 实现
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,194 +0,0 @@
|
||||
package net.geedge.asw.module.app.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.ApplicationReleaseEntity;
|
||||
import net.geedge.asw.module.app.service.IApplicationReleaseService;
|
||||
import net.geedge.asw.module.app.service.ITagService;
|
||||
import net.geedge.asw.module.app.util.JGitUtils;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.eclipse.jgit.api.Git;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.lib.PersonIdent;
|
||||
import org.eclipse.jgit.lib.Ref;
|
||||
import org.eclipse.jgit.lib.Repository;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.eclipse.jgit.revwalk.RevTag;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class TagServiceImpl implements ITagService {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
private IApplicationReleaseService releaseService;
|
||||
|
||||
private String getShortTagName(String name) {
|
||||
return name.startsWith(JGitUtils.R_TAGS) ? name.replaceAll(JGitUtils.R_TAGS, "") : name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> infoTag(String workspaceId, String name) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);) {
|
||||
|
||||
Map<Object, Object> infoTag = this.infoTag(repository, name);
|
||||
return infoTag;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[infoTag] [error] [workspaceId: {}] [name: {}]", workspaceId, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* tag 详情
|
||||
*
|
||||
* @param repository
|
||||
* @param name
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
private Map<Object, Object> infoTag(Repository repository, String name) throws IOException {
|
||||
Ref ref = repository.findRef(JGitUtils.getFullTagName(name));
|
||||
T.VerifyUtil.is(ref).notNull(RCode.GIT_TAG_NOT_FOUND.setParam(name));
|
||||
|
||||
// tag
|
||||
RevTag revTag = JGitUtils.infoTag(repository, ref.getObjectId());
|
||||
String message = revTag.getFullMessage();
|
||||
|
||||
// commit
|
||||
RevCommit revCommit = JGitUtils.infoCommit(repository, ref.getObjectId().getName());
|
||||
Map<Object, Object> aswCommitInfo = JGitUtils.buildAswCommitInfo(revCommit);
|
||||
|
||||
// release
|
||||
ApplicationReleaseEntity releaseEntity = releaseService.getOne(new LambdaQueryWrapper<ApplicationReleaseEntity>()
|
||||
.eq(ApplicationReleaseEntity::getWorkspaceId, repository.getDirectory().getName())
|
||||
.eq(ApplicationReleaseEntity::getTagName, this.getShortTagName(name))
|
||||
);
|
||||
|
||||
Map<Object, Object> m = T.MapUtil.builder()
|
||||
.put("name", this.getShortTagName(name))
|
||||
.put("message", message)
|
||||
.put("createdAt", revTag.getTaggerIdent().getWhen().getTime())
|
||||
.put("commit", aswCommitInfo)
|
||||
.put("release", releaseEntity)
|
||||
.build();
|
||||
return m;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<Object, Object>> listTag(String workspaceId, String search) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
|
||||
List<Ref> refList = git.tagList().call();
|
||||
if (T.StrUtil.isNotEmpty(search)) {
|
||||
refList = refList.stream()
|
||||
.filter(ref -> {
|
||||
String name = ref.getName();
|
||||
return T.StrUtil.containsIgnoreCase(this.getShortTagName(name), search);
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
List<Map<Object, Object>> list = T.ListUtil.list(true);
|
||||
for (Ref ref : refList) {
|
||||
list.add(this.infoTag(repository, ref.getName()));
|
||||
}
|
||||
|
||||
// 默认根据 createdAt 字段排序
|
||||
list = list.stream()
|
||||
.sorted(Comparator.comparing(map -> T.MapUtil.getLong((Map) map, "createdAt")).reversed())
|
||||
.collect(Collectors.toList());
|
||||
return list;
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[listTag] [error] [workspaceId: {}] [search: {}]", workspaceId, search);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Object, Object> newTag(String workspaceId, String name, String branch, String message) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
|
||||
// check tag exists
|
||||
List<Ref> tagListInDb = git.tagList().call();
|
||||
Ref checkRefExists = tagListInDb.parallelStream()
|
||||
.filter(ref -> T.StrUtil.equals(name, this.getShortTagName(ref.getName())))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (null != checkRefExists) {
|
||||
throw new ASWException(RCode.GIT_TAG_ALREADY_EXISTS.setParam(name));
|
||||
}
|
||||
|
||||
// check branch exists
|
||||
if (T.BooleanUtil.negate(
|
||||
JGitUtils.isBranchExists(repository, branch)
|
||||
)) {
|
||||
throw new ASWException(RCode.GIT_MERGE_TARGET_BRANCH_NOT_EXIST.setParam(branch));
|
||||
}
|
||||
|
||||
SysUserEntity loginUser = userService.getById(StpUtil.getLoginIdAsString());
|
||||
PersonIdent personIdent = JGitUtils.buildPersonIdent(loginUser.getName());
|
||||
RevCommit branchLatestCommit = JGitUtils.getBranchLatestCommit(repository, branch);
|
||||
|
||||
// add tag
|
||||
git.tag()
|
||||
.setName(name)
|
||||
.setMessage(message)
|
||||
.setTagger(personIdent)
|
||||
.setObjectId(branchLatestCommit)
|
||||
.setAnnotated(true)
|
||||
.setForceUpdate(false)
|
||||
.call();
|
||||
|
||||
// return info
|
||||
return this.infoTag(repository, name);
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[newTag] [error] [workspaceId: {}] [name: {}] [branch: {}]", workspaceId, name, branch);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteTag(String workspaceId, String name) {
|
||||
File gitDir = workspaceService.getGitDir(workspaceId);
|
||||
try (Repository repository = JGitUtils.openRepository(gitDir);
|
||||
Git git = Git.open(repository.getDirectory())) {
|
||||
// del tag
|
||||
git.tagDelete()
|
||||
.setTags(name)
|
||||
.call();
|
||||
// del release
|
||||
releaseService.removeRelease(workspaceId, name);
|
||||
} catch (IOException | GitAPIException e) {
|
||||
log.error(e, "[deleteTag] [error] [workspaceId: {}] [name: {}]", workspaceId, name);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,180 +0,0 @@
|
||||
package net.geedge.asw.module.app.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ApkInfo {
|
||||
|
||||
public static final String APPLICATION_ICON_120 = "application-icon-120";
|
||||
public static final String APPLICATION_ICON_160 = "application-icon-160";
|
||||
public static final String APPLICATION_ICON_240 = "application-icon-240";
|
||||
public static final String APPLICATION_ICON_320 = "application-icon-320";
|
||||
|
||||
// 所需设备属性
|
||||
private List<String> features;
|
||||
// 图标
|
||||
private String icon;
|
||||
// 各分辨率下图标路径
|
||||
private Map<String, String> icons;
|
||||
// 应用程序名
|
||||
private String label;
|
||||
// 入口Activity
|
||||
private String launchableActivity;
|
||||
// 支持的Android平台最低版本号
|
||||
private String minSdkVersion;
|
||||
// 主包名
|
||||
private String packageName;
|
||||
// 支持的SDK版本
|
||||
private String sdkVersion;
|
||||
// Apk文件大小（字节）
|
||||
private long size;
|
||||
// 目标SDK版本
|
||||
private String targetSdkVersion;
|
||||
// 所需权限
|
||||
private List<String> usesPermissions;
|
||||
// 内部版本号
|
||||
private String versionCode;
|
||||
// 外部版本号
|
||||
private String versionName;
|
||||
// xapk 包含的 apk
|
||||
private List<String> splitApks;
|
||||
|
||||
public ApkInfo() {
|
||||
this.features = new ArrayList<>();
|
||||
this.icons = new HashMap<>();
|
||||
this.usesPermissions = new ArrayList<>();
|
||||
this.splitApks = new ArrayList<>();
|
||||
}
|
||||
|
||||
public List<String> getFeatures() {
|
||||
return features;
|
||||
}
|
||||
|
||||
public void setFeatures(List<String> features) {
|
||||
this.features = features;
|
||||
}
|
||||
|
||||
public void addToFeatures(String feature) {
|
||||
this.features.add(feature);
|
||||
}
|
||||
|
||||
public String getIcon() {
|
||||
return icon;
|
||||
}
|
||||
|
||||
public void setIcon(String icon) {
|
||||
this.icon = icon;
|
||||
}
|
||||
|
||||
public Map<String, String> getIcons() {
|
||||
return icons;
|
||||
}
|
||||
|
||||
public void setIcons(Map<String, String> icons) {
|
||||
this.icons = icons;
|
||||
}
|
||||
|
||||
public void addToIcons(String key, String value) {
|
||||
this.icons.put(key, value);
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public String getLaunchableActivity() {
|
||||
return launchableActivity;
|
||||
}
|
||||
|
||||
public void setLaunchableActivity(String launchableActivity) {
|
||||
this.launchableActivity = launchableActivity;
|
||||
}
|
||||
|
||||
public String getMinSdkVersion() {
|
||||
return minSdkVersion;
|
||||
}
|
||||
|
||||
public void setMinSdkVersion(String minSdkVersion) {
|
||||
this.minSdkVersion = minSdkVersion;
|
||||
}
|
||||
|
||||
public String getPackageName() {
|
||||
return packageName;
|
||||
}
|
||||
|
||||
public void setPackageName(String packageName) {
|
||||
this.packageName = packageName;
|
||||
}
|
||||
|
||||
public String getSdkVersion() {
|
||||
return sdkVersion;
|
||||
}
|
||||
|
||||
public void setSdkVersion(String sdkVersion) {
|
||||
this.sdkVersion = sdkVersion;
|
||||
}
|
||||
|
||||
public long getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
public void setSize(long size) {
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
public String getTargetSdkVersion() {
|
||||
return targetSdkVersion;
|
||||
}
|
||||
|
||||
public void setTargetSdkVersion(String targetSdkVersion) {
|
||||
this.targetSdkVersion = targetSdkVersion;
|
||||
}
|
||||
|
||||
public List<String> getUsesPermissions() {
|
||||
return usesPermissions;
|
||||
}
|
||||
|
||||
public void setUsesPermissions(List<String> usesPermissions) {
|
||||
this.usesPermissions = usesPermissions;
|
||||
}
|
||||
|
||||
public void addToUsesPermissions(String usesPermission) {
|
||||
this.usesPermissions.add(usesPermission);
|
||||
}
|
||||
|
||||
public String getVersionCode() {
|
||||
return versionCode;
|
||||
}
|
||||
|
||||
public void setVersionCode(String versionCode) {
|
||||
this.versionCode = versionCode;
|
||||
}
|
||||
|
||||
public String getVersionName() {
|
||||
return versionName;
|
||||
}
|
||||
|
||||
public void setVersionName(String versionName) {
|
||||
this.versionName = versionName;
|
||||
}
|
||||
|
||||
public List<String> getSplitApks() {
|
||||
return splitApks;
|
||||
}
|
||||
|
||||
public void setSplitApks(List<String> splitApks) {
|
||||
this.splitApks = splitApks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ApkInfo [features=" + features + ", icon=" + icon + ", icons=" + icons + ", label=" + label + ", launchableActivity=" + launchableActivity + ", minSdkVersion=" + minSdkVersion + ", packageName=" + packageName + ", sdkVersion=" + sdkVersion + ", size=" + size + ", targetSdkVersion=" + targetSdkVersion + ", usesPermissions=" + usesPermissions + ", versionCode=" + versionCode + ", versionName=" + versionName + "]";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,175 +0,0 @@
|
||||
package net.geedge.asw.module.app.util;
|
||||
|
||||
import cn.hutool.log.Log;
|
||||
import net.geedge.asw.common.util.T;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
public class ApkUtil {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
public static final String APPLICATION = "application:";
|
||||
public static final String APPLICATION_ICON = "application-icon";
|
||||
public static final String APPLICATION_LABEL = "application-label";
|
||||
public static final String APPLICATION_LABEL_N = "application: label";
|
||||
public static final String DENSITIES = "densities";
|
||||
public static final String LAUNCHABLE_ACTIVITY = "launchable";
|
||||
public static final String PACKAGE = "package";
|
||||
public static final String SDK_VERSION = "sdkVersion";
|
||||
public static final String SUPPORTS_ANY_DENSITY = "support-any-density";
|
||||
public static final String SUPPORTS_SCREENS = "support-screens";
|
||||
public static final String TARGET_SDK_VERSION = "targetSdkVersion";
|
||||
public static final String VERSION_CODE = "versionCode";
|
||||
public static final String VERSION_NAME = "versionName";
|
||||
public static final String USES_FEATURE = "uses-feature";
|
||||
public static final String USES_IMPLIED_FEATURE = "uses-implied-feature";
|
||||
public static final String USES_PERMISSION = "uses-permission";
|
||||
|
||||
private static final String SPLIT_REGEX = "(: )|(=')|(' )|'";
|
||||
|
||||
private ProcessBuilder builder;
|
||||
// aapt 所在目录
|
||||
private String aaptToolPath = "aapt";
|
||||
|
||||
public ApkUtil() {
|
||||
builder = new ProcessBuilder();
|
||||
builder.redirectErrorStream(true);
|
||||
}
|
||||
|
||||
public String getAaptToolPath() {
|
||||
return aaptToolPath;
|
||||
}
|
||||
|
||||
public void setAaptToolPath(String aaptToolPath) {
|
||||
this.aaptToolPath = aaptToolPath;
|
||||
}
|
||||
|
||||
public ApkInfo parseApk(String apkPath) {
|
||||
String aaptTool = aaptToolPath;
|
||||
Process process = null;
|
||||
InputStream inputStream = null;
|
||||
BufferedReader bufferedReader = null;
|
||||
try {
|
||||
process = builder.command(aaptTool, "d", "badging", apkPath).start();
|
||||
inputStream = process.getInputStream();
|
||||
bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "utf-8"));
|
||||
ApkInfo apkInfo = new ApkInfo();
|
||||
apkInfo.setSize(new File(apkPath).length());
|
||||
String temp = null;
|
||||
while ((temp = bufferedReader.readLine()) != null) {
|
||||
setApkInfoProperty(apkInfo, temp);
|
||||
}
|
||||
if (T.StrUtil.isBlank(apkInfo.getPackageName()) || T.StrUtil.isBlank(apkInfo.getVersionName())) {
|
||||
return null;
|
||||
}
|
||||
return apkInfo;
|
||||
} catch (IOException e) {
|
||||
log.error(e, "[parseApk] [error] [path: {}]", apkPath);
|
||||
return null;
|
||||
} finally {
|
||||
if (process != null) {
|
||||
process.destroy();
|
||||
}
|
||||
T.IoUtil.close(inputStream);
|
||||
T.IoUtil.close(bufferedReader);
|
||||
}
|
||||
}
|
||||
|
||||
public ApkInfo parseXapk(String xapkPath) {
|
||||
InputStream inputStream = null;
|
||||
BufferedReader reader = null;
|
||||
ZipFile zipFile = null;
|
||||
try {
|
||||
zipFile = new ZipFile(T.FileUtil.file(xapkPath));
|
||||
ZipEntry entry = zipFile.getEntry("manifest.json");
|
||||
if (entry == null){
|
||||
return null;
|
||||
}
|
||||
inputStream = zipFile.getInputStream(entry);
|
||||
StringBuilder manifestJson = new StringBuilder();
|
||||
reader = new BufferedReader(new InputStreamReader(inputStream));
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
manifestJson.append(line).append("\n");
|
||||
}
|
||||
|
||||
Map manifest = T.JSONUtil.toBean(manifestJson.toString(), Map.class);
|
||||
ApkInfo apkInfo = new ApkInfo();
|
||||
this.setXapkInfoProperty(manifest, apkInfo);
|
||||
|
||||
String packageName = apkInfo.getPackageName();
|
||||
List<String> splitApks = apkInfo.getSplitApks();
|
||||
if (T.CollUtil.isNotEmpty(splitApks)){
|
||||
Enumeration<? extends ZipEntry> apkEntries = zipFile.entries();
|
||||
|
||||
while (apkEntries.hasMoreElements()) {
|
||||
ZipEntry apk = apkEntries.nextElement();
|
||||
if (!apk.getName().endsWith(".apk")){
|
||||
continue;
|
||||
}
|
||||
if (!T.StrUtil.equalsIgnoreCase(packageName + ".apk", apk.getName()) && !splitApks.contains(apk.getName())) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
return apkInfo;
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[parseXapk] [error] [path: {}]", xapkPath);
|
||||
return null;
|
||||
} finally {
|
||||
T.IoUtil.close(inputStream);
|
||||
T.IoUtil.close(reader);
|
||||
T.IoUtil.close(zipFile);
|
||||
}
|
||||
}
|
||||
|
||||
private void setXapkInfoProperty(Map manifest, ApkInfo apkInfo) {
|
||||
apkInfo.setLabel(T.MapUtil.getStr(manifest, "name"));
|
||||
apkInfo.setVersionName(T.MapUtil.getStr(manifest, "version_name"));
|
||||
apkInfo.setPackageName(T.MapUtil.getStr(manifest, "package_name"));
|
||||
List<Map> splitApkMapList = T.MapUtil.get(manifest, "split_apks", List.class);
|
||||
List<String> splitApkNames = splitApkMapList.stream().map(x -> T.MapUtil.getStr(x, "file")).toList();
|
||||
apkInfo.setSplitApks(splitApkNames);
|
||||
}
|
||||
|
||||
private void setApkInfoProperty(ApkInfo apkInfo, String source) {
|
||||
if (source.startsWith(APPLICATION)) {
|
||||
String[] rs = source.split("( icon=')|'");
|
||||
apkInfo.setIcon(rs[rs.length - 1]);
|
||||
} else if (source.startsWith(APPLICATION_ICON)) {
|
||||
apkInfo.addToIcons(getKeyBeforeColon(source), getPropertyInQuote(source));
|
||||
} else if (source.startsWith(APPLICATION_LABEL)) {
|
||||
apkInfo.setLabel(getPropertyInQuote(source));
|
||||
} else if (source.startsWith(LAUNCHABLE_ACTIVITY)) {
|
||||
apkInfo.setLaunchableActivity(getPropertyInQuote(source));
|
||||
} else if (source.startsWith(PACKAGE)) {
|
||||
String[] packageInfo = source.split(SPLIT_REGEX);
|
||||
apkInfo.setPackageName(packageInfo[2]);
|
||||
apkInfo.setVersionCode(packageInfo[4]);
|
||||
apkInfo.setVersionName(packageInfo[6]);
|
||||
} else if (source.startsWith(SDK_VERSION)) {
|
||||
apkInfo.setSdkVersion(getPropertyInQuote(source));
|
||||
} else if (source.startsWith(TARGET_SDK_VERSION)) {
|
||||
apkInfo.setTargetSdkVersion(getPropertyInQuote(source));
|
||||
} else if (source.startsWith(USES_PERMISSION)) {
|
||||
apkInfo.addToUsesPermissions(getPropertyInQuote(source));
|
||||
} else if (source.startsWith(USES_FEATURE)) {
|
||||
apkInfo.addToFeatures(getPropertyInQuote(source));
|
||||
}
|
||||
}
|
||||
|
||||
private String getKeyBeforeColon(String source) {
|
||||
return source.substring(0, source.indexOf(':'));
|
||||
}
|
||||
|
||||
private String getPropertyInQuote(String source) {
|
||||
int index = source.indexOf("'") + 1;
|
||||
return source.substring(index, source.indexOf('\'', index));
|
||||
}
|
||||
}
|
||||
@@ -1,868 +0,0 @@
|
||||
package net.geedge.asw.module.app.util;
|
||||
|
||||
import cn.hutool.log.Log;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.eclipse.jgit.api.*;
|
||||
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.api.errors.JGitInternalException;
|
||||
import org.eclipse.jgit.archive.ArchiveFormats;
|
||||
import org.eclipse.jgit.diff.*;
|
||||
import org.eclipse.jgit.dircache.DirCache;
|
||||
import org.eclipse.jgit.dircache.DirCacheBuilder;
|
||||
import org.eclipse.jgit.dircache.DirCacheEntry;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
import org.eclipse.jgit.lib.*;
|
||||
import org.eclipse.jgit.merge.MergeFormatter;
|
||||
import org.eclipse.jgit.merge.MergeStrategy;
|
||||
import org.eclipse.jgit.merge.RecursiveMerger;
|
||||
import org.eclipse.jgit.merge.ThreeWayMerger;
|
||||
import org.eclipse.jgit.revwalk.RevCommit;
|
||||
import org.eclipse.jgit.revwalk.RevTag;
|
||||
import org.eclipse.jgit.revwalk.RevWalk;
|
||||
import org.eclipse.jgit.revwalk.filter.RevFilter;
|
||||
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
|
||||
import org.eclipse.jgit.transport.PushResult;
|
||||
import org.eclipse.jgit.transport.RemoteRefUpdate;
|
||||
import org.eclipse.jgit.treewalk.CanonicalTreeParser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
public class JGitUtils {
|
||||
|
||||
private final static Log log = Log.get();
|
||||
/**
|
||||
* 本地分支引用前缀
|
||||
*/
|
||||
public static final String R_HEADS = "refs/heads/";
|
||||
|
||||
public static final String R_TAGS = "refs/tags/";
|
||||
|
||||
/**
|
||||
* 默认分支
|
||||
*/
|
||||
public static final String DEFAULT_BRANCH = "main";
|
||||
|
||||
private static String textExtensions;
|
||||
|
||||
@Autowired
|
||||
public JGitUtils(Environment environment) {
|
||||
textExtensions = environment.getProperty("file.extensions.text", "txt,csv,md,html,xml,json,log,bat,py,sh,ini,conf,yaml,yml,properties,toml,java,c,cpp,js,php,ts,go,rb,rtf,tex,rss,xhtml,sql");
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回 git repository
|
||||
*
|
||||
* @param gitDir
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static Repository openRepository(File gitDir) throws IOException {
|
||||
FileRepositoryBuilder builder = new FileRepositoryBuilder();
|
||||
Repository repository = builder.setGitDir(gitDir)
|
||||
.readEnvironment()
|
||||
.findGitDir()
|
||||
.build();
|
||||
return repository;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化仓库
|
||||
*
|
||||
* @param repoDir
|
||||
* @param author
|
||||
*/
|
||||
public static void initRepository(File repoDir, String author) {
|
||||
try (
|
||||
Git git = Git.init()
|
||||
.setBare(true)
|
||||
.setDirectory(repoDir)
|
||||
.setInitialBranch(DEFAULT_BRANCH)
|
||||
.call();
|
||||
Repository repository = git.getRepository();
|
||||
ObjectInserter inserter = repository.getObjectDatabase().newInserter();
|
||||
) {
|
||||
DirCache dirCache = DirCache.newInCore();
|
||||
DirCacheBuilder builder = dirCache.builder();
|
||||
|
||||
ObjectId objectId = JGitUtils.insertBlobFileToDatabase(repository, "".getBytes());
|
||||
DirCacheEntry entry = JGitUtils.buildDirCacheEntry("README.md", FileMode.REGULAR_FILE, objectId);
|
||||
builder.add(entry);
|
||||
builder.finish();
|
||||
|
||||
// commit
|
||||
String message = "Initial commit";
|
||||
PersonIdent personIdent = new PersonIdent(author, "asw@geedgenetworks.com");
|
||||
|
||||
JGitUtils.createCommit(repository, DEFAULT_BRANCH, dirCache.writeTree(inserter), message, personIdent);
|
||||
} catch (GitAPIException | IOException e) {
|
||||
log.error(e, "[initRepository] [git init error]");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回分支是否存在
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static boolean isBranchExists(Repository repository, String branch) throws IOException {
|
||||
Ref ref = repository.findRef(T.StrUtil.concat(true, R_HEADS, branch));
|
||||
return null != ref;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取提交对象
|
||||
*
|
||||
* @param repository
|
||||
* @param commitId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static RevCommit infoCommit(Repository repository, String commitId) throws IOException {
|
||||
try (RevWalk revCommits = new RevWalk(repository);) {
|
||||
RevCommit commit = revCommits.parseCommit(ObjectId.fromString(commitId));
|
||||
return commit;
|
||||
}
|
||||
}
|
||||
|
||||
public static String getFullTagName(String name) {
|
||||
return name.startsWith(R_TAGS) ? name : T.StrUtil.concat(true, R_TAGS, name);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取tag对象
|
||||
*
|
||||
* @param repository
|
||||
* @param objectId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static RevTag infoTag(Repository repository, ObjectId objectId) throws IOException {
|
||||
try (RevWalk revWalk = new RevWalk(repository)) {
|
||||
RevTag revTag = revWalk.parseTag(objectId);
|
||||
return revTag;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回分支最新提交
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @return
|
||||
*/
|
||||
public static RevCommit getBranchLatestCommit(Repository repository, String branch) throws IOException {
|
||||
RevWalk revWalk = new RevWalk(repository);
|
||||
RevCommit commit = revWalk.parseCommit(repository.resolve(branch));
|
||||
return commit;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取分支提交记录
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @param path
|
||||
* @return
|
||||
* @throws GitAPIException
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<RevCommit> getBranchCommitList(Repository repository, String branch, String path) throws GitAPIException, IOException {
|
||||
List<RevCommit> resultList = T.ListUtil.list(true);
|
||||
Git git = Git.open(repository.getDirectory());
|
||||
ObjectId branchRef = git.getRepository().resolve(branch);
|
||||
LogCommand command = git.log().add(branchRef);
|
||||
if (T.StrUtil.isNotEmpty(path)) {
|
||||
command.addPath(path);
|
||||
}
|
||||
|
||||
Iterable<RevCommit> iterable = command.call();
|
||||
for (RevCommit commit : iterable) {
|
||||
resultList.add(commit);
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取父提交
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @param commitId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static RevCommit getParentCommit(Repository repository, String branch, String commitId) throws IOException {
|
||||
try (RevWalk revWalk = new RevWalk(repository)) {
|
||||
Ref branchRef = repository.findRef(branch);
|
||||
revWalk.markStart(revWalk.parseCommit(branchRef.getObjectId()));
|
||||
|
||||
RevCommit parentCommit = null;
|
||||
Iterator<RevCommit> iterator = revWalk.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
RevCommit currentCommit = iterator.next();
|
||||
if (currentCommit.getId().getName().equals(commitId)) {
|
||||
if (currentCommit.getParentCount() > 0) {
|
||||
parentCommit = currentCommit.getParent(0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (null == parentCommit) {
|
||||
throw new ASWException(RCode.GIT_PARENT_COMMITID_NOT_FOUND);
|
||||
}
|
||||
return parentCommit;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the merge base of two commits or null if there is no common ancestry.
|
||||
* 返回两个提交的合并基础，如果没有共同祖先，则返回 null。
|
||||
*
|
||||
* @param repository
|
||||
* @param commitIdA
|
||||
* @param commitIdB
|
||||
* @return the commit id of the merge base or null if there is no common base
|
||||
*/
|
||||
public static RevCommit getMergeBaseCommit(Repository repository, ObjectId commitIdA, ObjectId commitIdB) {
|
||||
try (RevWalk rw = new RevWalk(repository)) {
|
||||
RevCommit a = rw.lookupCommit(commitIdA);
|
||||
RevCommit b = rw.lookupCommit(commitIdB);
|
||||
|
||||
rw.setRevFilter(RevFilter.MERGE_BASE);
|
||||
rw.markStart(a);
|
||||
rw.markStart(b);
|
||||
RevCommit mergeBase = rw.next();
|
||||
if (mergeBase == null) {
|
||||
return null;
|
||||
}
|
||||
return mergeBase;
|
||||
} catch (Exception e) {
|
||||
log.error(e, "Failed to determine merge base");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* commit range
|
||||
* 沿着 parent(0) 的主路径提交列表，忽略所有分支路径的提交
|
||||
*
|
||||
* @param repository
|
||||
* @param newCommitId
|
||||
* @param oldCommitId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<RevCommit> listCommitRange(Repository repository, String newCommitId, String oldCommitId) throws IOException {
|
||||
log.info("[listCommitRange] [begin] [repository: {}] [newCommitId: {}] [oldCommitId: {}]", repository, newCommitId, oldCommitId);
|
||||
List<RevCommit> commitList = T.ListUtil.list(true);
|
||||
|
||||
try (RevWalk revWalk = new RevWalk(repository)) {
|
||||
RevCommit revCommit = revWalk.parseCommit(repository.resolve(newCommitId));
|
||||
|
||||
Set<ObjectId> visitedCommits = new HashSet<>();
|
||||
while (revCommit != null && !visitedCommits.contains(revCommit.getId())) {
|
||||
if (oldCommitId != null && revCommit.getId().getName().equals(oldCommitId)) {
|
||||
break;
|
||||
}
|
||||
|
||||
commitList.add(revCommit);
|
||||
visitedCommits.add(revCommit.getId());
|
||||
|
||||
// 沿着 parent(0) 前进
|
||||
if (revCommit.getParentCount() > 0) {
|
||||
revCommit = revWalk.parseCommit(revCommit.getParent(0));
|
||||
} else {
|
||||
revCommit = null;
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
log.info("[listCommitRange] [finshed] [repository: {}] [commits size: {}]", repository, commitList.size());
|
||||
}
|
||||
return commitList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建 DirCacheEntry
|
||||
*
|
||||
* @param path
|
||||
* @param mode
|
||||
* @param objectId
|
||||
* @return
|
||||
*/
|
||||
public static DirCacheEntry buildDirCacheEntry(String path, FileMode mode, ObjectId objectId) {
|
||||
DirCacheEntry dirCacheEntry = new DirCacheEntry(path);
|
||||
dirCacheEntry.setFileMode(mode);
|
||||
dirCacheEntry.setObjectId(objectId);
|
||||
return dirCacheEntry;
|
||||
}
|
||||
|
||||
public static PersonIdent buildPersonIdent(String name) {
|
||||
return buildPersonIdent(name, "asw@geedgenetworks.com");
|
||||
}
|
||||
|
||||
public static PersonIdent buildPersonIdent(String name, String email) {
|
||||
return new PersonIdent(name, email);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 file object 添加到 objectDatabases 并返回 ObjectId
|
||||
*
|
||||
* @param repository
|
||||
* @param data
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static ObjectId insertBlobFileToDatabase(Repository repository, byte[] data) throws IOException {
|
||||
try (ObjectInserter inserter = repository.getObjectDatabase().newInserter()) {
|
||||
ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, data);
|
||||
inserter.flush();
|
||||
return blobId;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* commit
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @param treeId
|
||||
* @param message
|
||||
* @param personIdent
|
||||
* @throws IOException
|
||||
* @throws ConcurrentRefUpdateException
|
||||
*/
|
||||
public static void createCommit(Repository repository, String branch, ObjectId treeId, String message, PersonIdent personIdent) throws IOException, ConcurrentRefUpdateException {
|
||||
try (ObjectInserter inserter = repository.getObjectDatabase().newInserter();
|
||||
RevWalk revWalk = new RevWalk(repository);) {
|
||||
|
||||
CommitBuilder builder = new CommitBuilder();
|
||||
builder.setTreeId(treeId);
|
||||
builder.setMessage(message);
|
||||
|
||||
ObjectId branchRef = repository.resolve(branch);
|
||||
if (null != branchRef) {
|
||||
RevCommit parentId = revWalk.parseCommit(branchRef);
|
||||
builder.setParentId(parentId);
|
||||
}
|
||||
|
||||
builder.setAuthor(personIdent);
|
||||
builder.setCommitter(personIdent);
|
||||
|
||||
// 插入新的提交对象
|
||||
ObjectId commitId = inserter.insert(builder);
|
||||
inserter.flush();
|
||||
|
||||
// 更新 branch 指向新的提交
|
||||
RefUpdate ru = null;
|
||||
RefUpdate.Result rc = null;
|
||||
if (null != branchRef) {
|
||||
ru = repository.updateRef(T.StrUtil.concat(true, R_HEADS, branch));
|
||||
ru.setNewObjectId(commitId);
|
||||
rc = ru.update();
|
||||
} else {
|
||||
ru = repository.updateRef(Constants.HEAD);
|
||||
ru.setNewObjectId(commitId);
|
||||
rc = ru.update();
|
||||
}
|
||||
switch (rc) {
|
||||
case NEW:
|
||||
case FORCED:
|
||||
case FAST_FORWARD:
|
||||
break;
|
||||
case REJECTED:
|
||||
case LOCK_FAILURE:
|
||||
throw new ConcurrentRefUpdateException(JGitText.get().couldNotLockHEAD, ru.getRef(), rc);
|
||||
default:
|
||||
throw new JGitInternalException(MessageFormat.format(
|
||||
JGitText.get().updatingRefFailed, branch, commitId.toString(),
|
||||
rc));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* commit index
|
||||
*
|
||||
* @param repository
|
||||
* @param branch
|
||||
* @param index
|
||||
* @param parentId1
|
||||
* @param parentId2
|
||||
* @param message
|
||||
* @param personIdent
|
||||
* @return
|
||||
* @throws IOException
|
||||
* @throws ConcurrentRefUpdateException
|
||||
*/
|
||||
public static boolean commitIndex(Repository repository, String branch, DirCache index, ObjectId parentId1, ObjectId parentId2, String message, PersonIdent personIdent) throws IOException, ConcurrentRefUpdateException {
|
||||
boolean success = false;
|
||||
try (ObjectInserter odi = repository.newObjectInserter()) {
|
||||
|
||||
// new index
|
||||
ObjectId indexTreeId = index.writeTree(odi);
|
||||
|
||||
// PersonIdent
|
||||
CommitBuilder commit = new CommitBuilder();
|
||||
commit.setAuthor(personIdent);
|
||||
commit.setCommitter(personIdent);
|
||||
|
||||
if (null != parentId1 && null == parentId2) {
|
||||
commit.setParentId(parentId1);
|
||||
}
|
||||
if (null != parentId1 && null != parentId2) {
|
||||
commit.setParentIds(parentId1, parentId2);
|
||||
}
|
||||
|
||||
commit.setTreeId(indexTreeId);
|
||||
commit.setMessage(message);
|
||||
|
||||
|
||||
// insert the commit into the repository
|
||||
ObjectId commitId = odi.insert(commit);
|
||||
odi.flush();
|
||||
|
||||
RefUpdate ru = repository.updateRef(T.StrUtil.concat(true, R_HEADS, branch));
|
||||
ru.setNewObjectId(commitId);
|
||||
RefUpdate.Result rc = ru.update();
|
||||
switch (rc) {
|
||||
case NEW:
|
||||
case FORCED:
|
||||
case FAST_FORWARD:
|
||||
success = true;
|
||||
break;
|
||||
case REJECTED:
|
||||
case LOCK_FAILURE:
|
||||
throw new ConcurrentRefUpdateException(JGitText.get().couldNotLockHEAD, ru.getRef(), rc);
|
||||
default:
|
||||
throw new JGitInternalException(MessageFormat.format(
|
||||
JGitText.get().updatingRefFailed, branch, commitId.toString(),
|
||||
rc));
|
||||
}
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取 commitIdA -> commitIdB 文件差异
|
||||
*
|
||||
* @param repository
|
||||
* @param newCommitId
|
||||
* @param oldCommitId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<Map<Object, Object>> getDiffFileListInCommits(Repository repository, String newCommitId, String oldCommitId) throws IOException {
|
||||
log.info("[getDiffFileListInCommits] [begin] [repository: {}] [newCommitId: {}] [oldCommitId: {}]", repository, newCommitId, oldCommitId);
|
||||
try (RevWalk revWalk = new RevWalk(repository);
|
||||
DiffFormatter diffFormatter = new DiffFormatter(null);
|
||||
) {
|
||||
|
||||
RevCommit oldCommit = revWalk.parseCommit(repository.resolve(oldCommitId));
|
||||
RevCommit newCommit = revWalk.parseCommit(repository.resolve(newCommitId));
|
||||
|
||||
// oldTree
|
||||
CanonicalTreeParser oldTree = new CanonicalTreeParser();
|
||||
oldTree.reset(repository.newObjectReader(), oldCommit.getTree());
|
||||
// newTree
|
||||
CanonicalTreeParser newTree = new CanonicalTreeParser();
|
||||
newTree.reset(repository.newObjectReader(), newCommit.getTree());
|
||||
|
||||
// diff
|
||||
List<Map<Object, Object>> files = T.ListUtil.list(true);
|
||||
|
||||
diffFormatter.setRepository(repository);
|
||||
diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);
|
||||
diffFormatter.setDetectRenames(true);
|
||||
|
||||
List<DiffEntry> diffs = diffFormatter.scan(oldTree, newTree);
|
||||
for (DiffEntry diff : diffs) {
|
||||
int addedLines = 0;
|
||||
int deletedLines = 0;
|
||||
EditList edits = diffFormatter.toFileHeader(diff).toEditList();
|
||||
for (Edit edit : edits) {
|
||||
switch (edit.getType()) {
|
||||
case INSERT:
|
||||
addedLines += edit.getLengthB();
|
||||
break;
|
||||
case DELETE:
|
||||
deletedLines += edit.getLengthA();
|
||||
break;
|
||||
case REPLACE:
|
||||
addedLines += edit.getLengthB();
|
||||
deletedLines += edit.getLengthA();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
String oldPath = diff.getOldPath(), newPath = diff.getNewPath(), encoding = null, oldContent = null, newContent = null;
|
||||
switch (diff.getChangeType()) {
|
||||
case COPY:
|
||||
case ADD: {
|
||||
Map<Object, Object> fileContent = getFileContent(repository, newPath, diff.getNewId().toObjectId());
|
||||
encoding = T.MapUtil.getStr(fileContent, "encoding", "");
|
||||
newContent = T.MapUtil.getStr(fileContent, "content", "");
|
||||
break;
|
||||
}
|
||||
case DELETE: {
|
||||
Map<Object, Object> fileContent = getFileContent(repository, oldPath, diff.getOldId().toObjectId());
|
||||
encoding = T.MapUtil.getStr(fileContent, "encoding", "");
|
||||
oldContent = T.MapUtil.getStr(fileContent, "content", "");
|
||||
break;
|
||||
}
|
||||
case MODIFY: {
|
||||
Map<Object, Object> fileContent = getFileContent(repository, oldPath, diff.getOldId().toObjectId());
|
||||
oldContent = T.MapUtil.getStr(fileContent, "content", "");
|
||||
|
||||
Map<Object, Object> fileContent1 = getFileContent(repository, newPath, diff.getNewId().toObjectId());
|
||||
encoding = T.MapUtil.getStr(fileContent1, "encoding", "");
|
||||
newContent = T.MapUtil.getStr(fileContent1, "content", "");
|
||||
break;
|
||||
}
|
||||
case RENAME: {
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
files.add(
|
||||
T.MapUtil.builder()
|
||||
.put("oldPath", oldPath)
|
||||
.put("newPath", newPath)
|
||||
.put("addedLines", addedLines)
|
||||
.put("removedLines", deletedLines)
|
||||
.put("encoding", encoding)
|
||||
.put("oldContent", oldContent)
|
||||
.put("newContent", newContent)
|
||||
.put("action", diff.getChangeType().name().toLowerCase())
|
||||
.build()
|
||||
);
|
||||
}
|
||||
return files;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取 sourceBranch,targetBranch 冲突文件路径
|
||||
*
|
||||
* @param repository
|
||||
* @param srcBranch
|
||||
* @param tgtBranch
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<String> getConflictFilePathInBranches(Repository repository, String srcBranch, String tgtBranch) throws IOException {
|
||||
log.info("[getConflictFileListInBranches] [begin] [repository: {}] [srcBranch: {}] [tgtBranch: {}]", repository, srcBranch, tgtBranch);
|
||||
try (RevWalk revWalk = new RevWalk(repository)) {
|
||||
|
||||
RevCommit commitA = revWalk.parseCommit(repository.resolve(srcBranch));
|
||||
RevCommit commitB = revWalk.parseCommit(repository.resolve(tgtBranch));
|
||||
|
||||
// Find the merge base
|
||||
RevCommit mergeBaseCommit = JGitUtils.getMergeBaseCommit(repository, commitA, commitB);
|
||||
String mergeBaseId = mergeBaseCommit.getName();
|
||||
log.info("[getConflictFileListInBranches] [mergeBase: {}]", mergeBaseId);
|
||||
|
||||
RevCommit mergeBase = revWalk.parseCommit(repository.resolve(mergeBaseId));
|
||||
|
||||
ThreeWayMerger threeWayMerger = (ThreeWayMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
|
||||
threeWayMerger.setBase(mergeBase);
|
||||
|
||||
boolean isOk = threeWayMerger.merge(commitA, commitB);
|
||||
log.info("[getConflictFileListInBranches] [merge result] [isOk: {}]", isOk);
|
||||
if (!isOk) {
|
||||
List<String> unmergedPaths = ((RecursiveMerger) threeWayMerger).getUnmergedPaths();
|
||||
return unmergedPaths;
|
||||
}
|
||||
return T.ListUtil.empty();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 sourceBranch,targetBranch 冲突文件详情
|
||||
*
|
||||
* @param repository
|
||||
* @param srcBranch
|
||||
* @param tgtBranch
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static List<Map<Object, Object>> getConflictFileInfoInBranches(Repository repository, String srcBranch, String tgtBranch) throws IOException {
|
||||
log.info("[getConflictFileInfoInBranches] [begin] [repository: {}] [srcBranch: {}] [tgtBranch: {}]", repository, srcBranch, tgtBranch);
|
||||
try (RevWalk revWalk = new RevWalk(repository);) {
|
||||
|
||||
RevCommit commitA = revWalk.parseCommit(repository.resolve(srcBranch));
|
||||
RevCommit commitB = revWalk.parseCommit(repository.resolve(tgtBranch));
|
||||
|
||||
// Find the merge base
|
||||
String mergeBaseId = getMergeBaseCommit(repository, commitA, commitB).getName();
|
||||
log.info("[getConflictFileInfoInBranches] [mergeBase: {}]", mergeBaseId);
|
||||
|
||||
RevCommit mergeBase = revWalk.parseCommit(repository.resolve(mergeBaseId));
|
||||
|
||||
ThreeWayMerger threeWayMerger = (ThreeWayMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
|
||||
threeWayMerger.setBase(mergeBase);
|
||||
|
||||
boolean isOk = threeWayMerger.merge(commitA, commitB);
|
||||
log.info("[getConflictFileInfoInBranches] [merge result] [isOk: {}]", isOk);
|
||||
|
||||
if (!isOk) {
|
||||
List<Map<Object, Object>> files = T.ListUtil.list(true);
|
||||
|
||||
Map<String, org.eclipse.jgit.merge.MergeResult<? extends Sequence>> mergeResults = ((RecursiveMerger) threeWayMerger).getMergeResults();
|
||||
for (Map.Entry<String, org.eclipse.jgit.merge.MergeResult<? extends Sequence>> entry : mergeResults.entrySet()) {
|
||||
String unmergedPath = entry.getKey();
|
||||
// 暂不支持处理二进制文件冲突
|
||||
if (isBinary(T.FileNameUtil.getName(unmergedPath))) {
|
||||
throw new ASWException(RCode.GIT_BINARY_CONFLICT_ERROR);
|
||||
}
|
||||
|
||||
org.eclipse.jgit.merge.MergeResult<? extends Sequence> mergeResult = entry.getValue();
|
||||
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
|
||||
MergeFormatter formatter = new MergeFormatter();
|
||||
|
||||
String oursName = unmergedPath;
|
||||
String theirsName = unmergedPath;
|
||||
formatter.formatMerge(outputStream, mergeResult, mergeBaseId, oursName, theirsName, StandardCharsets.UTF_8);
|
||||
files.add(
|
||||
T.MapUtil.builder()
|
||||
.put("path", unmergedPath)
|
||||
.put("content", outputStream.toString(StandardCharsets.UTF_8.name()))
|
||||
.put("conflict", true)
|
||||
.build()
|
||||
);
|
||||
}
|
||||
}
|
||||
return files;
|
||||
}
|
||||
return T.ListUtil.empty();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 分支合并
|
||||
*
|
||||
* @param centralRepository
|
||||
* @param srcBranch
|
||||
* @param tgtBranch
|
||||
* @param author
|
||||
* @param message
|
||||
* @param resolveConflictFileContent
|
||||
* @throws RuntimeException
|
||||
* @throws GitAPIException
|
||||
* @throws IOException
|
||||
*/
|
||||
public static void mergeBranch(Repository centralRepository, String srcBranch, String tgtBranch, String author, String message, List<Map<String, String>> resolveConflictFileContent) throws RuntimeException, GitAPIException, IOException {
|
||||
log.info("[mergeBranch] [begin] [repository: {}] [srcBranch: {}] [tgtBranch: {}]", centralRepository, srcBranch, tgtBranch);
|
||||
// prepare a new folder for the cloned repository
|
||||
File localPath = T.FileUtil.file(net.geedge.asw.common.util.Constants.TEMP_PATH, T.StrUtil.uuid());
|
||||
T.FileUtil.del(localPath);
|
||||
T.FileUtil.mkdir(localPath);
|
||||
|
||||
// bare repository
|
||||
File repoDir = centralRepository.getDirectory();
|
||||
|
||||
// clone
|
||||
try (Git git = Git.cloneRepository()
|
||||
.setBare(false)
|
||||
.setURI(repoDir.getAbsolutePath())
|
||||
.setDirectory(localPath)
|
||||
.setCredentialsProvider(null)
|
||||
.call();
|
||||
Repository repository = git.getRepository();) {
|
||||
StoredConfig config = repository.getConfig();
|
||||
config.setString("user", null, "name", author);
|
||||
config.setString("user", null, "email", "asw@geedgenetworks.com");
|
||||
config.save();
|
||||
|
||||
// git fetch
|
||||
git.fetch().call();
|
||||
|
||||
// checout
|
||||
git.checkout()
|
||||
.setCreateBranch(T.StrUtil.equals(DEFAULT_BRANCH, tgtBranch) ? false : true)
|
||||
.setName(tgtBranch)
|
||||
.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.TRACK)
|
||||
.setStartPoint("origin/" + tgtBranch)
|
||||
.call();
|
||||
|
||||
// merge
|
||||
MergeResult mergeResult = git.merge()
|
||||
.setCommit(true)
|
||||
.setMessage(message)
|
||||
.setStrategy(MergeStrategy.RECURSIVE)
|
||||
.setFastForward(MergeCommand.FastForwardMode.NO_FF)
|
||||
.include(repository.findRef("origin/" + srcBranch))
|
||||
.call();
|
||||
|
||||
MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus();
|
||||
log.info("[mergeBranch] [merge status: {}]", mergeStatus);
|
||||
if (!mergeStatus.isSuccessful()) {
|
||||
// 解决冲突
|
||||
if (mergeStatus == MergeResult.MergeStatus.CONFLICTING && T.CollUtil.isNotEmpty(resolveConflictFileContent)) {
|
||||
Map<String, int[][]> conflicts = mergeResult.getConflicts();
|
||||
for (Map.Entry<String, int[][]> entry : conflicts.entrySet()) {
|
||||
String conflictFilePath = entry.getKey();
|
||||
Map<String, String> map = resolveConflictFileContent.stream()
|
||||
.filter(m -> T.StrUtil.equals(conflictFilePath, T.MapUtil.getStr(m, "path")))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (null != map) {
|
||||
Path filePath = Paths.get(localPath.getAbsolutePath(), conflictFilePath);
|
||||
Files.write(filePath, T.MapUtil.getStr(map, "content").getBytes(StandardCharsets.UTF_8));
|
||||
git.add().addFilepattern(conflictFilePath).call();
|
||||
}
|
||||
}
|
||||
git.commit().setMessage(message).call();
|
||||
} else {
|
||||
// 其他类型的合并错误，抛出异常
|
||||
String errorMessage = String.format("Merge failed: %s, Conflicts: %s", mergeStatus, mergeResult.getConflicts());
|
||||
throw new RuntimeException(errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
// push
|
||||
Iterable<PushResult> pushResultIterable = git.push()
|
||||
.setRemote("origin")
|
||||
.add(tgtBranch)
|
||||
.call();
|
||||
for (PushResult pushResult : pushResultIterable) {
|
||||
for (RemoteRefUpdate update : pushResult.getRemoteUpdates()) {
|
||||
if (update.getStatus() != RemoteRefUpdate.Status.OK && update.getStatus() != RemoteRefUpdate.Status.UP_TO_DATE) {
|
||||
log.error("[mergeBranch] [push error] [remote: {}] [status: {}]", update.getRemoteName(), update.getStatus());
|
||||
String errorMessage = "Push failed: " + update.getStatus();
|
||||
throw new RuntimeException(errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
T.FileUtil.del(localPath);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 归档
|
||||
*
|
||||
* @param repository
|
||||
* @param tagName
|
||||
* @param file
|
||||
* @param prefix
|
||||
* @param format
|
||||
* @throws IOException
|
||||
* @throws GitAPIException
|
||||
*/
|
||||
public static void archive(Repository repository, String tagName, File file, String prefix, String format) throws IOException, GitAPIException {
|
||||
ArchiveFormats.registerAll();
|
||||
T.FileUtil.mkdir(T.FileUtil.getParent(file, 1));
|
||||
try (OutputStream out = new FileOutputStream(file)) {
|
||||
try (Git git = new Git(repository)) {
|
||||
git.archive()
|
||||
.setTree(repository.resolve(tagName))
|
||||
.setFormat(format)
|
||||
.setPrefix(prefix)
|
||||
.setOutputStream(out)
|
||||
.call();
|
||||
}
|
||||
} finally {
|
||||
ArchiveFormats.unregisterAll();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* build asw commit info
|
||||
*
|
||||
* @param commit
|
||||
* @return
|
||||
*/
|
||||
public static Map<Object, Object> buildAswCommitInfo(RevCommit commit) {
|
||||
if (null == commit) {
|
||||
return T.MapUtil.newHashMap();
|
||||
}
|
||||
|
||||
Map<Object, Object> m = new LinkedHashMap<>();
|
||||
m.put("id", commit.getName());
|
||||
m.put("shortId", T.StrUtil.subPre(commit.getName(), 8));
|
||||
m.put("createdAt", TimeUnit.SECONDS.toMillis(commit.getCommitTime()));
|
||||
|
||||
m.put("title", commit.getShortMessage());
|
||||
m.put("message", commit.getFullMessage());
|
||||
|
||||
List<String> parentIds = Arrays.stream(commit.getParents()).map(RevCommit::getName).collect(Collectors.toList());
|
||||
m.put("parentIds", parentIds);
|
||||
|
||||
PersonIdent authorIdent = commit.getAuthorIdent();
|
||||
m.put("authorName", authorIdent.getName());
|
||||
m.put("authorEmail", authorIdent.getEmailAddress());
|
||||
m.put("authoredDate", authorIdent.getWhen().getTime());
|
||||
|
||||
PersonIdent committerIdent = commit.getCommitterIdent();
|
||||
m.put("committerName", committerIdent.getName());
|
||||
m.put("committerEmail", committerIdent.getEmailAddress());
|
||||
m.put("committedDate", committerIdent.getWhen().getTime());
|
||||
return m;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* is binary file
|
||||
*
|
||||
* @param filename
|
||||
* @return
|
||||
*/
|
||||
public static boolean isBinary(String filename) {
|
||||
String extension = FilenameUtils.getExtension(filename);
|
||||
List<String> split = T.StrUtil.split(textExtensions, ",");
|
||||
return !split.contains(extension.toLowerCase());
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据 path,objectId 读取文件内容
|
||||
* 响应 Map,key=encoding,content
|
||||
*
|
||||
* @param repository
|
||||
* @param path
|
||||
* @param objectId
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
public static Map<Object, Object> getFileContent(Repository repository, String path, ObjectId objectId) throws IOException {
|
||||
String encoding = null, content = null;
|
||||
|
||||
ObjectLoader loader = repository.open(objectId);
|
||||
if (isBinary(T.FileNameUtil.getName(path))) {
|
||||
encoding = "base64";
|
||||
content = Base64.getEncoder().encodeToString(loader.getBytes());
|
||||
} else {
|
||||
content = T.StrUtil.utf8Str(loader.getBytes());
|
||||
}
|
||||
return T.MapUtil.builder()
|
||||
.put("encoding", encoding)
|
||||
.put("content", content)
|
||||
.build();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package net.geedge.asw.module.app.util;
|
||||
|
||||
import net.geedge.asw.common.util.T;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class PkgConstant {
|
||||
|
||||
/**
|
||||
* android packages file dir
|
||||
*/
|
||||
public static File APK_FILES_DIR = T.FileUtil.file(T.WebPathUtil.getRootPath(), "apk_files");
|
||||
|
||||
/**
|
||||
* support platform
|
||||
*/
|
||||
public enum Platform {
|
||||
ANDROID("android"),
|
||||
|
||||
IOS("ios"),
|
||||
|
||||
WINDOWS("windows"),
|
||||
|
||||
LINUX("linux");
|
||||
|
||||
private String value;
|
||||
|
||||
Platform(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
package net.geedge.asw.module.attribute.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.module.attribute.service.IAttributeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/attribute")
|
||||
public class AttributeController {
|
||||
|
||||
@Autowired
|
||||
private IAttributeService attributeService;
|
||||
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
Page page = attributeService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package net.geedge.asw.module.attribute.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import net.geedge.asw.module.attribute.entity.AttributeEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface AttributeDao extends BaseMapper<AttributeEntity> {
|
||||
|
||||
List<AttributeEntity> queryList(@Param("params") Map<String, Object> params);
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
package net.geedge.asw.module.attribute.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
@Data
|
||||
@TableName("attribute_dict")
|
||||
public class AttributeEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String type;
|
||||
|
||||
private String protocol;
|
||||
|
||||
private String layer;
|
||||
|
||||
private String stage;
|
||||
|
||||
private String objectType;
|
||||
|
||||
private Long createTimestamp;
|
||||
|
||||
private Long updateTimestamp;
|
||||
|
||||
private String createUserId;
|
||||
|
||||
private String updateUserId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package net.geedge.asw.module.attribute.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.attribute.entity.AttributeEntity;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface IAttributeService extends IService<AttributeEntity> {
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
AttributeEntity queryAttribute(String name);
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package net.geedge.asw.module.attribute.service.impl;
|
||||
|
||||
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 net.geedge.asw.common.config.Query;
|
||||
import net.geedge.asw.module.attribute.dao.AttributeDao;
|
||||
import net.geedge.asw.module.attribute.entity.AttributeEntity;
|
||||
import net.geedge.asw.module.attribute.service.IAttributeService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class AttributeServiceImpl extends ServiceImpl<AttributeDao, AttributeEntity> implements IAttributeService {
|
||||
|
||||
|
||||
@Override
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(AttributeEntity.class).getPage(params);
|
||||
List<AttributeEntity> attributeList = this.getBaseMapper().queryList(params);
|
||||
page.setRecords(attributeList);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AttributeEntity queryAttribute(String name) {
|
||||
AttributeEntity one = this.getOne(new LambdaQueryWrapper<AttributeEntity>()
|
||||
.eq(AttributeEntity::getName, name)
|
||||
.last("limit 1")
|
||||
);
|
||||
return one;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,224 +0,0 @@
|
||||
package net.geedge.asw.module.environment.controller;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.common.util.*;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.environment.util.EnvironmentUtil;
|
||||
import net.geedge.asw.module.runner.entity.PcapEntity;
|
||||
import net.geedge.asw.module.runner.service.IPcapService;
|
||||
import net.geedge.asw.module.runner.util.RunnerConstant;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.socket.CloseStatus;
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/env")
|
||||
public class EnvironmentController {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Autowired
|
||||
private IPcapService pcapService;
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id) {
|
||||
EnvironmentEntity entity = environmentService.queryInfo(id);
|
||||
return R.ok().putData("record", entity);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
Page page = environmentService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@GetMapping("/mgt")
|
||||
public R queryList(@RequestParam Map<String, Object> params) {
|
||||
Page page = environmentService.findEnvironmentByCurrentUserId(params);
|
||||
return R.ok().putData(page);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/mgt")
|
||||
public R save(@RequestBody EnvironmentEntity entity) {
|
||||
EnvironmentEntity env = environmentService.saveEnv(entity);
|
||||
return R.ok().putData("record", env.getId());
|
||||
}
|
||||
|
||||
@PutMapping("/mgt")
|
||||
public R update(@RequestBody EnvironmentEntity entity) {
|
||||
EnvironmentEntity env = environmentService.updateEnv(entity);
|
||||
return R.ok().putData("record", env.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping("/mgt")
|
||||
public R delete(String ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
environmentService.removeEnv(T.ListUtil.of(ids.split(",")));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@PostMapping("/test")
|
||||
public R testConnect(@RequestBody EnvironmentEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getParam()).notEmpty(RCode.PARAM_CANNOT_EMPTY);
|
||||
|
||||
JSONObject jsonObject = entity.getParamJSONObject();
|
||||
String url = jsonObject.getStr("url");
|
||||
String token = jsonObject.getStr("token");
|
||||
if (T.StrUtil.hasEmpty(url, token)) {
|
||||
return R.error(RCode.PARAM_CANNOT_EMPTY);
|
||||
}
|
||||
|
||||
try {
|
||||
HttpRequest request = T.HttpUtil.createGet(String.format("%s/api/v1/env/status", url));
|
||||
request.header("Authorization", token);
|
||||
HttpResponse response = request.execute();
|
||||
log.info("[testConnect] [status: {}]", response.getStatus());
|
||||
if (response.getStatus() == 401) {
|
||||
return R.error(401, "Unauthorized");
|
||||
}
|
||||
if (response.isOk()) {
|
||||
return R.ok();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e);
|
||||
return R.error(RCode.ERROR);
|
||||
}
|
||||
return R.error(RCode.ERROR);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/{envId}/session/{sessionId}/**", method ={ RequestMethod.GET, RequestMethod.POST, RequestMethod.DELETE}, headers = "Upgrade!=websocket")
|
||||
public void agentEvn(@PathVariable("envId") String envId, @PathVariable("sessionId") String sessionId, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
||||
EnvironmentSessionEntity session = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getId, sessionId).eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
if (T.ObjectUtil.isNull(session)){
|
||||
throw new ASWException(RCode.ENVIRONMENT_SESSION_NOT_EXIST);
|
||||
}
|
||||
|
||||
EnvironmentEntity environment = environmentService.getById(session.getEnvId());
|
||||
if (T.ObjectUtil.isNull(environment)) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_NOT_EXIST);
|
||||
}
|
||||
|
||||
EnvironmentUtil.getForObject(environment, request, response, sessionId);
|
||||
}
|
||||
|
||||
@GetMapping("/mySession")
|
||||
public R mySession(@RequestParam Map params){
|
||||
Page page = environmentService.mySession(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{envId}/session")
|
||||
public R saveSession(@PathVariable("envId") String envId, @RequestParam String workspaceId){
|
||||
EnvironmentSessionEntity session = environmentSessionService.saveSession(envId, workspaceId);
|
||||
return R.ok().putData("record", session.getId());
|
||||
}
|
||||
|
||||
@GetMapping("/{envId}/session/{sessionId}")
|
||||
public R querySession(@PathVariable("envId") String envId, @PathVariable("sessionId") String sessionId, @RequestParam String workspaceId){
|
||||
EnvironmentSessionEntity session = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getId, sessionId).eq(EnvironmentSessionEntity::getWorkspaceId, workspaceId));
|
||||
session.setEnv(environmentService.getById(envId));
|
||||
session.setWorkspace(workspaceService.getById(workspaceId));
|
||||
session.setUser(userService.getById(session.getUserId()));
|
||||
return R.ok().putData("record", session);
|
||||
}
|
||||
|
||||
|
||||
@DeleteMapping("/{envId}/session/{sessionId}")
|
||||
@Transactional
|
||||
public R removeSession(@PathVariable("envId") String envId, @PathVariable("sessionId") String sessionId, @RequestParam String workspaceId) {
|
||||
environmentService.removeSession(sessionId);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@DeleteMapping("/{envId}/session/{sessionId}/pcap/{pcapId}")
|
||||
public R stopTcpdump(@PathVariable("envId") String envId,
|
||||
@PathVariable("sessionId") String sessionId,
|
||||
@PathVariable("pcapId") String pcapId,
|
||||
@RequestParam Map param) throws IOException, ServletException {
|
||||
EnvironmentSessionEntity session = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getId, sessionId).eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
if (T.ObjectUtil.isNull(session)){
|
||||
throw new ASWException(RCode.ENVIRONMENT_SESSION_NOT_EXIST);
|
||||
}
|
||||
EnvironmentEntity environment = environmentService.getById(envId);
|
||||
if (T.ObjectUtil.isNull(environment)) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_NOT_EXIST);
|
||||
}
|
||||
// build query param
|
||||
Map params = T.MapUtil.builder().put("id", pcapId).put("returnFile", T.MapUtil.getBool(param, "savePcap")).build();
|
||||
ResponseEntity<byte[]> responseEntity = EnvironmentUtil.stopTcpdump(environment, params);
|
||||
if (T.MapUtil.getBool(param, "savePcap")){
|
||||
// save pcap to workspace
|
||||
WorkspaceEntity workspace = workspaceService.getById(session.getWorkspaceId());
|
||||
String pcapName = T.StrUtil.emptyToDefault(T.MapUtil.getStr(param,"pcapName"), pcapId);
|
||||
File destination = T.FileUtil.file(T.WebPathUtil.getRootPath(), workspace.getId(), T.StrUtil.concat(true,pcapName, ".pcap"));
|
||||
if (destination.exists()){
|
||||
String formatTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
|
||||
destination = T.FileUtil.file(T.WebPathUtil.getRootPath(), workspace.getId(), T.StrUtil.concat(true, pcapName, "-", formatTime, ".pcap"));
|
||||
}
|
||||
// create empty file
|
||||
destination = FileUtil.touch(destination);
|
||||
if (ArrayUtil.isNotEmpty(responseEntity.getBody())){
|
||||
FileOutputStream fos = new FileOutputStream(destination);
|
||||
T.IoUtil.write(fos,true, responseEntity.getBody());
|
||||
}
|
||||
log.info("save pcap to path:{}", destination.getAbsolutePath());
|
||||
// save entity
|
||||
PcapEntity entity = new PcapEntity();
|
||||
entity.setId(pcapId);
|
||||
entity.setName(destination.getName());
|
||||
entity.setSize(destination.length());
|
||||
entity.setStatus(RunnerConstant.PcapStatus.UPLOADED.getValue());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setWorkspaceId(workspace.getId());
|
||||
entity.setPath(destination.getPath());
|
||||
entity.setMd5(destination.length() == 0 ? Constants.EMPTY_FILE_MD5 : T.DigestUtil.md5Hex(destination));
|
||||
pcapService.save(entity);
|
||||
}
|
||||
return R.ok();
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package net.geedge.asw.module.environment.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface EnvironmentDao extends BaseMapper<EnvironmentEntity> {
|
||||
|
||||
List<EnvironmentEntity> queryList(Page page, Map<String, Object> params);
|
||||
|
||||
List<EnvironmentEntity> mySession(Page page, Map params);
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package net.geedge.asw.module.environment.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface EnvironmentSessionDao extends BaseMapper<EnvironmentSessionEntity> {
|
||||
|
||||
List<EnvironmentSessionEntity> queryListByUsed();
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package net.geedge.asw.module.environment.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentWorkspaceEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface EnvironmentWorkspaceDao extends BaseMapper<EnvironmentWorkspaceEntity> {
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package net.geedge.asw.module.environment.entity;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@TableName("environment")
|
||||
public class EnvironmentEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String name;
|
||||
private String location;
|
||||
private String platform;
|
||||
private Object param;
|
||||
private String description;
|
||||
private Integer status;
|
||||
|
||||
private Long lastHealthCheck;
|
||||
private Long createTimestamp;
|
||||
private Long updateTimestamp;
|
||||
private String createUserId;
|
||||
private String updateUserId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private JSONObject useUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<WorkspaceEntity> workspaces;
|
||||
|
||||
@TableField(exist = false)
|
||||
private EnvironmentSessionEntity session;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<String> workspaceIds;
|
||||
|
||||
@JsonIgnore
|
||||
public String getParamStr() {
|
||||
return null == this.param ? "{}" : T.JSONUtil.toJsonStr(this.param);
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
public JSONObject getParamJSONObject() {
|
||||
return null == this.param ? new JSONObject() : T.JSONUtil.parseObj(this.getParamStr());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package net.geedge.asw.module.environment.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
|
||||
@Data
|
||||
@TableName("environment_session")
|
||||
public class EnvironmentSessionEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String envId;
|
||||
private String userId;
|
||||
private Integer status;
|
||||
private String jobId;
|
||||
|
||||
private Long startTimestamp;
|
||||
private Long endTimestamp;
|
||||
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private EnvironmentEntity env;
|
||||
|
||||
@TableField(exist = false)
|
||||
private WorkspaceEntity workspace;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity user;
|
||||
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package net.geedge.asw.module.environment.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@Data
|
||||
@TableName("environment_workspace")
|
||||
public class EnvironmentWorkspaceEntity {
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
|
||||
private String envId;
|
||||
private String workspaceId;
|
||||
private Long createTimestamp;
|
||||
private String createUserId;
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
package net.geedge.asw.module.environment.job;
|
||||
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import org.apache.commons.lang3.time.StopWatch;
|
||||
import org.quartz.DisallowConcurrentExecution;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.quartz.JobExecutionException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.quartz.QuartzJobBean;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@DisallowConcurrentExecution
|
||||
public class JobEnvironmentStatusChecker extends QuartzJobBean {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService envService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService envSessionService;
|
||||
|
||||
@Override
|
||||
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
|
||||
Thread.currentThread().setName("JobEnvironmentStatusChecker");
|
||||
|
||||
log.info("[JobEnvironmentStatusChecker] [begin]");
|
||||
StopWatch sw = new StopWatch();
|
||||
sw.start();
|
||||
try {
|
||||
this.environmentStatusChecker();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[JobEnvironmentStatusChecker] [error]");
|
||||
} finally {
|
||||
sw.stop();
|
||||
}
|
||||
log.info("[JobEnvironmentStatusChecker] [finshed] [Run Time: {}]", sw.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* environment status checker
|
||||
* <p>
|
||||
* 1. update entity status、lastHealthCheck
|
||||
* 2. close the offline env session
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void environmentStatusChecker() {
|
||||
List<EnvironmentEntity> list = envService.list();
|
||||
for (EnvironmentEntity entity : list) {
|
||||
Thread.ofVirtual().start(() -> {
|
||||
String result = null;
|
||||
try {
|
||||
JSONObject paramJSONObject = entity.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
|
||||
HttpRequest request = T.HttpUtil.createGet(String.format("%s/api/v1/env/status", url));
|
||||
request.header("Authorization", token);
|
||||
|
||||
HttpResponse response = request.execute();
|
||||
log.info("[environmentStatusChecker] [env: {}] [status: {}]", entity.getId(), response.getStatus());
|
||||
|
||||
if (response.isOk()) {
|
||||
result = response.body();
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
log.error(e, "[environmentStatusChecker] [request api error] [env: {}]", entity.getId());
|
||||
}
|
||||
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[environmentStatusChecker] [env: {}] [result: {}]", entity.getId(), result);
|
||||
}
|
||||
|
||||
entity.setStatus(0);
|
||||
entity.setLastHealthCheck(System.currentTimeMillis());
|
||||
|
||||
if (T.StrUtil.isNotEmpty(result)) {
|
||||
try {
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(result);
|
||||
if (T.ObjectUtil.equal(RCode.SUCCESS.getCode(), jsonObject.getInt("code"))) {
|
||||
JSONObject data = jsonObject.getJSONObject("data");
|
||||
String status = data.getStr("status");
|
||||
if (T.StrUtil.equals("online", status)) {
|
||||
entity.setStatus(1);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[environmentStatusChecker] [parse result error] [env: {}]", entity.getId());
|
||||
}
|
||||
}
|
||||
|
||||
// update entity status、lastHealthCheck
|
||||
envService.update(new LambdaUpdateWrapper<EnvironmentEntity>()
|
||||
.set(EnvironmentEntity::getStatus, entity.getStatus())
|
||||
.set(EnvironmentEntity::getLastHealthCheck, entity.getLastHealthCheck())
|
||||
.eq(EnvironmentEntity::getId, entity.getId())
|
||||
);
|
||||
|
||||
// close the offline env session
|
||||
if (0 == entity.getStatus()) {
|
||||
envSessionService.update(new LambdaUpdateWrapper<EnvironmentSessionEntity>()
|
||||
.set(EnvironmentSessionEntity::getStatus, 2)
|
||||
.set(EnvironmentSessionEntity::getEndTimestamp, System.currentTimeMillis())
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1)
|
||||
.eq(EnvironmentSessionEntity::getEnvId, entity.getId())
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface IEnvironmentService extends IService<EnvironmentEntity>{
|
||||
|
||||
EnvironmentEntity queryInfo(String id);
|
||||
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
Page findEnvironmentByCurrentUserId(Map<String, Object> params);
|
||||
|
||||
void removeEnv(List<String> ids);
|
||||
|
||||
Page mySession(Map params);
|
||||
|
||||
EnvironmentEntity saveEnv(EnvironmentEntity entity);
|
||||
|
||||
EnvironmentEntity updateEnv(EnvironmentEntity entity);
|
||||
|
||||
void removeSession(String sessionId);
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IEnvironmentSessionService extends IService<EnvironmentSessionEntity>{
|
||||
|
||||
EnvironmentSessionEntity saveSession(String envId, String workspaceId);
|
||||
|
||||
List<EnvironmentSessionEntity> queryListByUsed();
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentWorkspaceEntity;
|
||||
|
||||
public interface IEnvironmentWorkspaceService extends IService<EnvironmentWorkspaceEntity> {
|
||||
}
|
||||
@@ -1,232 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
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 net.geedge.asw.common.config.Query;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.attribute.entity.AttributeEntity;
|
||||
import net.geedge.asw.module.environment.dao.EnvironmentDao;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentWorkspaceEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentWorkspaceService;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.sys.service.ISysUserService;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
import net.geedge.asw.module.workspace.service.IWorkspaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.socket.CloseStatus;
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, EnvironmentEntity> implements IEnvironmentService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentWorkspaceService environmentWorkspaceService;
|
||||
|
||||
@Autowired
|
||||
private IWorkspaceService workspaceService;
|
||||
|
||||
@Override
|
||||
public EnvironmentEntity queryInfo(String id) {
|
||||
EnvironmentEntity environment = this.getById(id);
|
||||
T.VerifyUtil.is(environment).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
// param
|
||||
environment.setParam(environment.getParamJSONObject());
|
||||
|
||||
// user
|
||||
SysUserEntity createUser = sysUserService.getById(environment.getCreateUserId());
|
||||
SysUserEntity updateUser = sysUserService.getById(environment.getUpdateUserId());
|
||||
createUser.setPwd(null);
|
||||
updateUser.setPwd(null);
|
||||
environment.setCreateUser(createUser);
|
||||
environment.setUpdateUser(updateUser);
|
||||
|
||||
// workspaces
|
||||
List<EnvironmentWorkspaceEntity> environmentWorkspaceList = environmentWorkspaceService.list(new LambdaQueryWrapper<EnvironmentWorkspaceEntity>().eq(EnvironmentWorkspaceEntity::getEnvId, id));
|
||||
if (T.CollUtil.isNotEmpty(environmentWorkspaceList)) {
|
||||
List<String> workspaceIds = environmentWorkspaceList.stream().map(x -> x.getWorkspaceId()).toList();
|
||||
List<WorkspaceEntity> workspaceList = workspaceService.list(new LambdaQueryWrapper<WorkspaceEntity>().in(WorkspaceEntity::getId, workspaceIds));
|
||||
environment.setWorkspaces(workspaceList);
|
||||
}
|
||||
|
||||
// session
|
||||
EnvironmentSessionEntity deviceSession = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getEnvId, environment.getId())
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
if (null != deviceSession) {
|
||||
SysUserEntity useUser = sysUserService.getById(deviceSession.getUserId());
|
||||
useUser.setPwd(null);
|
||||
WorkspaceEntity workspace = workspaceService.getById(deviceSession.getWorkspaceId());
|
||||
deviceSession.setUser(useUser);
|
||||
deviceSession.setWorkspace(workspace);
|
||||
environment.setSession(deviceSession);
|
||||
environment.setStatus(environment.getStatus() == 1 ? 2 : environment.getStatus());
|
||||
}
|
||||
return environment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page queryList(Map<String, Object> params) {
|
||||
Page page = new Query(EnvironmentEntity.class).getPage(params);
|
||||
List<EnvironmentEntity> packageList = this.getBaseMapper().queryList(page, params);
|
||||
|
||||
List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.queryListByUsed();
|
||||
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
|
||||
|
||||
Map<String, EnvironmentSessionEntity> sessionByEnvId = sessionEntityList.stream().collect(Collectors.toMap(EnvironmentSessionEntity::getEnvId, Function.identity()));
|
||||
|
||||
for (EnvironmentEntity entity : packageList) {
|
||||
entity.setParam(entity.getParamJSONObject());
|
||||
entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus());
|
||||
entity.setSession(sessionByEnvId.get(entity.getId()));
|
||||
}
|
||||
page.setRecords(packageList);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page findEnvironmentByCurrentUserId(Map<String, Object> params) {
|
||||
params.put("currentUserId", StpUtil.getLoginIdAsString());
|
||||
Page page = this.queryList(params);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void removeEnv(List<String> ids) {
|
||||
// remove
|
||||
this.remove(new LambdaQueryWrapper<EnvironmentEntity>().in(EnvironmentEntity::getId, ids).eq(EnvironmentEntity::getCreateUserId, StpUtil.getLoginIdAsString()));
|
||||
|
||||
// session
|
||||
environmentSessionService.remove(new LambdaQueryWrapper<EnvironmentSessionEntity>().in(EnvironmentSessionEntity::getEnvId, ids));
|
||||
|
||||
//device workspace
|
||||
environmentWorkspaceService.remove(new LambdaQueryWrapper<EnvironmentWorkspaceEntity>().in(EnvironmentWorkspaceEntity::getEnvId, ids));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page mySession(Map params) {
|
||||
String currentUserId = StpUtil.getLoginIdAsString();
|
||||
params.put("currentUserId", currentUserId);
|
||||
Page page = new Query(EnvironmentEntity.class).getPage(params);
|
||||
|
||||
List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.queryListByUsed();
|
||||
List<EnvironmentEntity> packageList = this.getBaseMapper().mySession(page, params);
|
||||
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
|
||||
Map<String, EnvironmentSessionEntity> sessionByEnvId = sessionEntityList.stream().collect(Collectors.toMap(EnvironmentSessionEntity::getEnvId, Function.identity()));
|
||||
for (EnvironmentEntity entity : packageList) {
|
||||
entity.setParam(entity.getParamJSONObject());
|
||||
entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus());
|
||||
entity.setSession(sessionByEnvId.get(entity.getId()));
|
||||
}
|
||||
page.setRecords(packageList);
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public EnvironmentEntity saveEnv(EnvironmentEntity entity) {
|
||||
entity.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setParam(entity.getParamStr());
|
||||
this.save(entity);
|
||||
|
||||
// save env workspace
|
||||
if (T.CollUtil.isNotEmpty(entity.getWorkspaceIds())){
|
||||
List<EnvironmentWorkspaceEntity> list = T.ListUtil.list(false);
|
||||
for (String workspaceId : entity.getWorkspaceIds()) {
|
||||
EnvironmentWorkspaceEntity environmentWorkspace = new EnvironmentWorkspaceEntity();
|
||||
environmentWorkspace.setEnvId(entity.getId());
|
||||
environmentWorkspace.setWorkspaceId(workspaceId);
|
||||
environmentWorkspace.setCreateTimestamp(System.currentTimeMillis());
|
||||
environmentWorkspace.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
list.add(environmentWorkspace);
|
||||
}
|
||||
environmentWorkspaceService.saveBatch(list);
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public EnvironmentEntity updateEnv(EnvironmentEntity entity) {
|
||||
|
||||
EnvironmentEntity environment = this.getOne(new LambdaQueryWrapper<EnvironmentEntity>().eq(EnvironmentEntity::getId, entity.getId()).eq(EnvironmentEntity::getCreateUserId, StpUtil.getLoginIdAsString()));
|
||||
if (T.ObjectUtil.isNull(environment)) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_NOT_EXIST);
|
||||
}
|
||||
entity.setUpdateUserId(StpUtil.getLoginIdAsString());
|
||||
entity.setUpdateTimestamp(System.currentTimeMillis());
|
||||
entity.setParam(entity.getParamStr());
|
||||
|
||||
this.updateById(entity);
|
||||
|
||||
environmentWorkspaceService.remove(new LambdaQueryWrapper<EnvironmentWorkspaceEntity>().eq(EnvironmentWorkspaceEntity::getEnvId, entity.getId()));
|
||||
// save env workspace
|
||||
if (T.CollUtil.isNotEmpty(entity.getWorkspaceIds())){
|
||||
List<EnvironmentWorkspaceEntity> list = T.ListUtil.list(false);
|
||||
for (String workspaceId : entity.getWorkspaceIds()) {
|
||||
EnvironmentWorkspaceEntity environmentWorkspace = new EnvironmentWorkspaceEntity();
|
||||
environmentWorkspace.setEnvId(entity.getId());
|
||||
environmentWorkspace.setWorkspaceId(workspaceId);
|
||||
environmentWorkspace.setCreateTimestamp(System.currentTimeMillis());
|
||||
environmentWorkspace.setCreateUserId(StpUtil.getLoginIdAsString());
|
||||
list.add(environmentWorkspace);
|
||||
}
|
||||
environmentWorkspaceService.saveBatch(list);
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeSession(String sessionId) {
|
||||
EnvironmentSessionEntity session = environmentSessionService.getById(sessionId);
|
||||
WebSocketSession novncSession = Constants.ENV_NOVNC_WEBSOCKET_SESSION.get(sessionId);
|
||||
WebSocketSession terminalSession = Constants.ENV_TERMINAL_WEBSOCKET_SESSION.get(sessionId);
|
||||
// 根据 session 找到 novncSession&terminalSession ，更新状态，设置结束时间
|
||||
session.setEndTimestamp(System.currentTimeMillis());
|
||||
session.setStatus(2);
|
||||
environmentSessionService.updateById(session);
|
||||
try {
|
||||
if (T.ObjectUtil.isNotEmpty(novncSession)) {
|
||||
Constants.ENV_NOVNC_WEBSOCKET_SESSION.remove(sessionId);
|
||||
novncSession.close(CloseStatus.NORMAL.withReason("Administrator disconnected."));
|
||||
}
|
||||
if (T.ObjectUtil.isNotEmpty(terminalSession)) {
|
||||
Constants.ENV_TERMINAL_WEBSOCKET_SESSION.remove(sessionId);
|
||||
terminalSession.close(CloseStatus.NORMAL.withReason("Administrator disconnected."));
|
||||
}
|
||||
} catch (IOException e) {
|
||||
log.error(e, "RemoveSession send exit prompt error sessionId: {}", sessionId);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service.impl;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.dao.EnvironmentSessionDao;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.environment.util.EnvironmentUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class EnvironmentSessionServiceImpl extends ServiceImpl<EnvironmentSessionDao, EnvironmentSessionEntity> implements IEnvironmentSessionService {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Override
|
||||
public EnvironmentSessionEntity saveSession(String envId, String workspaceId) {
|
||||
|
||||
List<EnvironmentSessionEntity> sessionEntityList = this.list(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getEnvId, envId)
|
||||
.eq(EnvironmentSessionEntity::getWorkspaceId, workspaceId)
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
|
||||
if (T.CollectionUtil.isNotEmpty(sessionEntityList)) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_USED);
|
||||
}
|
||||
boolean isFree = this.checkEnvironmentStatus(envId);
|
||||
if (!isFree) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_STATUS_ERROR);
|
||||
}
|
||||
EnvironmentSessionEntity session = new EnvironmentSessionEntity();
|
||||
session.setEnvId(envId);
|
||||
session.setWorkspaceId(workspaceId);
|
||||
session.setStatus(1);
|
||||
session.setStartTimestamp(System.currentTimeMillis());
|
||||
session.setUserId(StpUtil.getLoginIdAsString());
|
||||
|
||||
this.save(session);
|
||||
return session;
|
||||
}
|
||||
|
||||
private boolean checkEnvironmentStatus(String envId) {
|
||||
boolean isFree = true;
|
||||
EnvironmentEntity environment = environmentService.getById(envId);
|
||||
if (T.ObjectUtil.isNull(environment)) {
|
||||
throw new ASWException(RCode.ENVIRONMENT_NOT_EXIST);
|
||||
}
|
||||
if (environment.getStatus() != 1){
|
||||
isFree = false;
|
||||
}
|
||||
String resultJsonStr = T.StrUtil.EMPTY_JSON;
|
||||
try {
|
||||
resultJsonStr = EnvironmentUtil.requestGet(environment, Constants.ENV_API_STATUS_PATH, null, String.class);
|
||||
}catch (Exception e){
|
||||
log.error(e, "CheckEnvironmentStatus. request environment status api error environment: {}]", T.JSONUtil.toJsonStr(environment));
|
||||
isFree = false;
|
||||
}
|
||||
log.info("CheckEnvironmentStatus. environment status api result: {}", resultJsonStr);
|
||||
|
||||
Map resultObj = T.JSONUtil.toBean(resultJsonStr, Map.class);
|
||||
if (T.BooleanUtil.or(
|
||||
T.MapUtil.isEmpty(resultObj),
|
||||
T.ObjectUtil.notEqual(RCode.SUCCESS.getCode(), resultObj.get("code")))) {
|
||||
isFree = false;
|
||||
} else {
|
||||
Map data = T.MapUtil.get(resultObj, "data", Map.class);
|
||||
String status = T.MapUtil.getStr(data, "status");
|
||||
if (!T.StrUtil.equalsIgnoreCase(status, "online")){
|
||||
isFree = false;
|
||||
}
|
||||
}
|
||||
return isFree;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EnvironmentSessionEntity> queryListByUsed() {
|
||||
List<EnvironmentSessionEntity> sessionEntityList = this.getBaseMapper().queryListByUsed();
|
||||
return sessionEntityList;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package net.geedge.asw.module.environment.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.geedge.asw.module.environment.dao.EnvironmentWorkspaceDao;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentWorkspaceEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentWorkspaceService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class EnvironmentWorkspaceServiceImpl extends ServiceImpl<EnvironmentWorkspaceDao, EnvironmentWorkspaceEntity> implements IEnvironmentWorkspaceService {
|
||||
}
|
||||
@@ -1,243 +0,0 @@
|
||||
package net.geedge.asw.module.environment.util;
|
||||
|
||||
import cn.hutool.core.net.url.UrlBuilder;
|
||||
import cn.hutool.core.net.url.UrlPath;
|
||||
import cn.hutool.core.net.url.UrlQuery;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.core.util.URLUtil;
|
||||
import cn.hutool.http.Header;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.Part;
|
||||
import net.geedge.asw.common.util.ASWException;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.util.LinkedMultiValueMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
|
||||
@Configuration
|
||||
@SuppressWarnings("all")
|
||||
public class EnvironmentUtil {
|
||||
|
||||
private static Log log = Log.get();
|
||||
private static RestTemplate restTemplate;
|
||||
|
||||
public static <T> T requestGet(EnvironmentEntity environment, String path, String queryString, Class<T> responseType) {
|
||||
return request(environment, HttpMethod.GET, path, queryString, null, responseType);
|
||||
}
|
||||
|
||||
public static <T> T request(EnvironmentEntity environment, HttpMethod method, String path, String queryString, Object body,
|
||||
Class<T> responseType) {
|
||||
JSONObject jsonObject = environment.getParamJSONObject();
|
||||
String url = jsonObject.getStr("url");
|
||||
String token = jsonObject.getStr("token");
|
||||
|
||||
String urlString = UrlBuilder.of(url)
|
||||
.setPath(UrlPath.of(path, Charset.forName("UTF-8")))
|
||||
.setQuery(UrlQuery.of(queryString, Charset.forName("UTF-8"), false, true))
|
||||
.setCharset(StandardCharsets.UTF_8).toString();
|
||||
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add(HttpHeaders.AUTHORIZATION,token);
|
||||
HttpEntity httpEntity = body == null ? new HttpEntity(headers) : new HttpEntity(body, headers);
|
||||
// 发送 请求
|
||||
return request(urlString, method, token, body, responseType);
|
||||
}
|
||||
|
||||
public static <T> T request(String url, HttpMethod method, String token, Object body, Class<T> responseType) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add(HttpHeaders.AUTHORIZATION, token);
|
||||
HttpEntity httpEntity = body == null ? new HttpEntity(headers) : new HttpEntity(body, headers);
|
||||
// 发送 请求
|
||||
ResponseEntity<T> exchange = null;
|
||||
try {
|
||||
exchange = restTemplate.exchange(new URI(url), method, httpEntity, responseType);
|
||||
} catch (URISyntaxException e) {
|
||||
log.error(e);
|
||||
}
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
public static <T> T requestGet(String url, String token, Class<T> responseType) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add(HttpHeaders.AUTHORIZATION, token);
|
||||
HttpEntity httpEntity = new HttpEntity(headers);
|
||||
// 发送 请求
|
||||
ResponseEntity<T> exchange = restTemplate.exchange(url, HttpMethod.GET, httpEntity, responseType);
|
||||
return exchange.getBody();
|
||||
}
|
||||
|
||||
/**
|
||||
* agent stop tcpdump
|
||||
* @param environment
|
||||
* @param params
|
||||
* @return
|
||||
* @throws IOException
|
||||
* @throws ServletException
|
||||
*/
|
||||
public static ResponseEntity<byte[]> stopTcpdump(EnvironmentEntity environment, Map params) throws IOException, ServletException {
|
||||
JSONObject jsonObject = environment.getParamJSONObject();
|
||||
String url = jsonObject.getStr("url");
|
||||
String token = jsonObject.getStr("token");
|
||||
|
||||
String urlStr = UrlBuilder.of(url)
|
||||
.setPath(UrlPath.of(Constants.ENV_API_TCPDUMP_PATH, Charset.forName("UTF-8")))
|
||||
.setQuery(UrlQuery.of(params))
|
||||
.setCharset(StandardCharsets.UTF_8).toString();
|
||||
// token
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.add(HttpHeaders.AUTHORIZATION, token);
|
||||
HttpEntity httpEntity = new HttpEntity(headers);
|
||||
ResponseEntity<byte[]> responseEntity = null;
|
||||
try {
|
||||
responseEntity = restTemplate.exchange(new URI(urlStr), HttpMethod.DELETE, httpEntity, byte[].class);
|
||||
} catch (Exception e) {
|
||||
log.error(e, "stop tcpdump request error. url:{}", urlStr);
|
||||
String message = e.getMessage();
|
||||
if (ObjectUtil.isNotNull(e.getCause())) {
|
||||
message = e.getCause().getMessage();
|
||||
}
|
||||
throw new ASWException(message, HttpStatus.INTERNAL_SERVER_ERROR.value());
|
||||
}
|
||||
int statusCode = responseEntity.getStatusCodeValue();
|
||||
log.info("stop tcpdump request url:{}, responseStatus:{}", urlStr, statusCode);
|
||||
return responseEntity;
|
||||
}
|
||||
|
||||
/**
|
||||
* env api agent
|
||||
* @param device
|
||||
* @param request
|
||||
* @param response
|
||||
* @param sessionId
|
||||
* @throws IOException
|
||||
* @throws ServletException
|
||||
*/
|
||||
public static void getForObject(EnvironmentEntity device, HttpServletRequest request, HttpServletResponse response, String sessionId) throws IOException, ServletException {
|
||||
// path
|
||||
String[] paths = request.getServletPath().split(sessionId);
|
||||
String path = Arrays.asList(paths).getLast();
|
||||
path = path.startsWith("/") ? (String.format("%s%s", Constants.ENV_API_PREFIX, path))
|
||||
: (String.format("%s/%s", Constants.ENV_API_PREFIX, path));
|
||||
|
||||
// host port token
|
||||
JSONObject jsonObject = device.getParamJSONObject();
|
||||
String url = jsonObject.getStr("url");
|
||||
String token = jsonObject.getStr("token");
|
||||
|
||||
// query param
|
||||
String queryString = request.getQueryString();
|
||||
queryString = StrUtil.isNotBlank(queryString) ? queryString : "";
|
||||
queryString = URLUtil.decode(queryString);
|
||||
|
||||
|
||||
String urlStr = UrlBuilder.of(url)
|
||||
.setPath(UrlPath.of(path, Charset.forName("UTF-8")))
|
||||
.setQuery(UrlQuery.of(queryString, Charset.forName("UTF-8"), false, true))
|
||||
.setCharset(StandardCharsets.UTF_8).toString();
|
||||
|
||||
// token
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
Enumeration<String> headerNames = request.getHeaderNames();
|
||||
while (headerNames.hasMoreElements()) {
|
||||
String hn = headerNames.nextElement();
|
||||
if (Constants.AUTH_TOKEN_CODE.equalsIgnoreCase(hn)) {
|
||||
continue;
|
||||
}
|
||||
headers.add(hn, request.getHeader(hn));
|
||||
}
|
||||
headers.add(HttpHeaders.AUTHORIZATION, token);
|
||||
|
||||
// body
|
||||
byte[] body = T.IoUtil.readBytes(request.getInputStream());
|
||||
HttpEntity httpEntity = new HttpEntity(body, headers);
|
||||
|
||||
// from-data
|
||||
if (request.getContentType() != null &&
|
||||
request.getContentType().startsWith("multipart")) {
|
||||
// 获取表单中的文件和参数
|
||||
Collection<Part> parts = request.getParts();
|
||||
// from 表单文件
|
||||
MultiValueMap<String, Object> form = new LinkedMultiValueMap<>();
|
||||
for (Part part : parts) {
|
||||
String partName = part.getName();
|
||||
if (part.getSubmittedFileName() != null) {
|
||||
ByteArrayResource resource = new ByteArrayResource(part.getInputStream().readAllBytes()) {
|
||||
@Override
|
||||
public String getFilename() {
|
||||
return part.getSubmittedFileName();
|
||||
}
|
||||
};
|
||||
form.add(partName, resource);
|
||||
} else {
|
||||
form.add(partName, part.getInputStream().readAllBytes());
|
||||
}
|
||||
httpEntity = new HttpEntity(form, headers);
|
||||
}
|
||||
}
|
||||
|
||||
ResponseEntity<byte[]> responseEntity = null;
|
||||
try {
|
||||
responseEntity = restTemplate.exchange(new URI(urlStr), HttpMethod.valueOf(request.getMethod()), httpEntity, byte[].class);
|
||||
} catch (Exception e) {
|
||||
log.error(e, "env request error. url:{}", urlStr);
|
||||
String message = e.getMessage();
|
||||
if (ObjectUtil.isNotNull(e.getCause())) {
|
||||
message = e.getCause().getMessage();
|
||||
}
|
||||
throw new ASWException(message, HttpStatus.INTERNAL_SERVER_ERROR.value());
|
||||
}
|
||||
log.info("env request url:{}, responseStatus:{}", urlStr, responseEntity.getStatusCode());
|
||||
writeResponseWithHeaders(response, responseEntity);
|
||||
}
|
||||
|
||||
public static void writeResponseWithHeaders(HttpServletResponse response, ResponseEntity<byte[]> responseEntity) throws IOException {
|
||||
HttpHeaders httpHeaders = responseEntity.getHeaders();
|
||||
int statusCode = responseEntity.getStatusCodeValue();
|
||||
byte[] responseBody = responseEntity.getBody();
|
||||
response.reset();
|
||||
response.setStatus(statusCode);
|
||||
Set<Map.Entry<String, List<String>>> entrySet = httpHeaders.entrySet();
|
||||
// 设置 cors 响应头
|
||||
Constants.CORS_HEADER.forEach((k, v) -> {
|
||||
response.setHeader(k, v);
|
||||
});
|
||||
for (Map.Entry<String, List<String>> en : entrySet) {
|
||||
String name = en.getKey();
|
||||
List<String> value = en.getValue();
|
||||
if (en.getKey().equalsIgnoreCase(Header.CONTENT_LENGTH.getValue())) {
|
||||
continue;
|
||||
}
|
||||
if (en.getKey().equalsIgnoreCase(Header.TRANSFER_ENCODING.getValue())) {
|
||||
continue;
|
||||
}
|
||||
response.setHeader(name, T.StrUtil.join(",", value.toArray()));
|
||||
}
|
||||
response.setContentLength(T.ArrayUtil.length(responseBody));
|
||||
response.getOutputStream().write(responseBody);
|
||||
response.flushBuffer();
|
||||
}
|
||||
|
||||
@Autowired
|
||||
public void setRestTemplate(RestTemplate restTemplate) {
|
||||
EnvironmentUtil.restTemplate = restTemplate;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,10 @@ import cn.hutool.core.net.url.UrlBuilder;
|
||||
import cn.hutool.log.Log;
|
||||
import feign.Feign;
|
||||
import feign.form.FormEncoder;
|
||||
import net.geedge.asw.module.feign.client.*;
|
||||
import net.geedge.asw.module.feign.client.GeoipClient;
|
||||
import net.geedge.asw.module.feign.client.KibanaClient;
|
||||
import net.geedge.asw.module.feign.client.WebSharkClient;
|
||||
import net.geedge.asw.module.feign.client.ZeekClient;
|
||||
import net.geedge.asw.module.feign.support.Fastjson2Decoder;
|
||||
import net.geedge.asw.module.feign.support.Fastjson2Encoder;
|
||||
import net.geedge.asw.module.feign.support.Http2Client;
|
||||
@@ -29,9 +32,6 @@ public class FeignClientConfiguration {
|
||||
@Value("${webShark.url:127.0.0.1:8085}")
|
||||
private String websharkurl;
|
||||
|
||||
@Value("${pcapComment.url:127.0.0.1:5000}")
|
||||
private String pcapCommentUrl;
|
||||
|
||||
@Bean("zeekClient")
|
||||
public ZeekClient zeekClient() {
|
||||
String url = UrlBuilder.ofHttp(zeekUrl).toString();
|
||||
@@ -71,29 +71,9 @@ public class FeignClientConfiguration {
|
||||
log.info("[webSharkClient] [url: {}]", url);
|
||||
return Feign.builder()
|
||||
.encoder(new FormEncoder())
|
||||
.decoder(new Fastjson2Decoder())
|
||||
.client(new Http2Client())
|
||||
.target(WebSharkClient.class, url);
|
||||
}
|
||||
|
||||
@Bean("pcapCommentClient")
|
||||
public PcapCommentClient pcapCommentClient() {
|
||||
String url = UrlBuilder.ofHttp(pcapCommentUrl).toString();
|
||||
log.info("[pcapCommentClient] [url: {}]", url);
|
||||
return Feign.builder()
|
||||
.encoder(new FormEncoder())
|
||||
.client(new Http2Client())
|
||||
.target(PcapCommentClient.class, url);
|
||||
}
|
||||
|
||||
@Bean("dashboardClient")
|
||||
public DashboardClient dashboardClient() {
|
||||
String url = UrlBuilder.ofHttp(kibanaUrl).toString();
|
||||
log.info("[kibanaClient] [url: {}]", url);
|
||||
return Feign.builder()
|
||||
.encoder(new FormEncoder())
|
||||
.decoder(new Fastjson2Decoder())
|
||||
.client(new Http2Client())
|
||||
.target(DashboardClient.class, url);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package net.geedge.asw.module.feign.client;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import feign.Headers;
|
||||
import feign.Param;
|
||||
import feign.RequestLine;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@FeignClient(name = "dashboardClient")
|
||||
@Headers("Authorization: Bearer {token}")
|
||||
public interface DashboardClient {
|
||||
|
||||
@Headers({
|
||||
"Content-Type: multipart/form-data",
|
||||
"osd-xsrf: true",
|
||||
"kbn-xsrf: true"
|
||||
})
|
||||
@RequestLine("POST /api/saved_objects/_import?createNewCopies={createNewCopies}")
|
||||
JSONObject importDashboard(@Param("token") String token, @Param("file") File file, @Param("createNewCopies") boolean createNewCopies);
|
||||
}
|
||||
@@ -10,8 +10,8 @@ import org.springframework.cloud.openfeign.FeignClient;
|
||||
@Headers("Authorization: Bearer {token}")
|
||||
public interface KibanaClient {
|
||||
|
||||
@RequestLine("GET /api/saved_objects/_find?fields=title&per_page=10000&type={type}&search_fields=title&search={name}")
|
||||
JSONObject findIndexPattern(@Param("token") String token, @Param("type") String type , @Param("name") String name);
|
||||
@RequestLine("GET /api/saved_objects/_find?fields=title&per_page=10000&type=index-pattern&search_fields=title&search={name}")
|
||||
JSONObject findIndexPattern(@Param("token") String token, @Param("name") String name);
|
||||
|
||||
@Headers({
|
||||
"Content-Type: application/json",
|
||||
@@ -20,11 +20,4 @@ public interface KibanaClient {
|
||||
@RequestLine("POST /api/saved_objects/index-pattern/{id}")
|
||||
JSONObject saveIndexPattern(@Param("token") String token, @Param("id") String id, JSONObject body);
|
||||
|
||||
@Headers({
|
||||
"Content-Type: application/json",
|
||||
"osd-xsrf: true"
|
||||
})
|
||||
@RequestLine("DELETE /api/saved_objects/index-pattern/{id}?force={force}")
|
||||
JSONObject deleteIndexPattern(@Param("token") String token, @Param("id") String id , @Param("force") boolean force);
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package net.geedge.asw.module.feign.client;
|
||||
|
||||
import feign.Headers;
|
||||
import feign.Param;
|
||||
import feign.RequestLine;
|
||||
import feign.Response;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@FeignClient(name = "pcapCommentClient")
|
||||
public interface PcapCommentClient {
|
||||
|
||||
@RequestLine("POST /api/v1/pcap/comment")
|
||||
@Headers("Content-Type: multipart/form-data")
|
||||
Response addCommon(@Param("file") File file, @Param("url") String url, @Param("id") String pcapId);
|
||||
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package net.geedge.asw.module.feign.client;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import feign.Headers;
|
||||
import feign.Param;
|
||||
import feign.RequestLine;
|
||||
import feign.Response;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
|
||||
import java.io.File;
|
||||
@@ -14,5 +14,5 @@ public interface WebSharkClient {
|
||||
|
||||
@RequestLine("POST /webshark/upload")
|
||||
@Headers("Content-Type: multipart/form-data")
|
||||
Response upload(@Param("fileKey") File file);
|
||||
JSONObject upload(@Param("fileKey") File file);
|
||||
}
|
||||
|
||||
@@ -1,162 +1,67 @@
|
||||
package net.geedge.asw.module.runner.controller;
|
||||
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.http.Method;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.util.JobQueueManager;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.runner.util.RunnerConstant;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
@RequestMapping("/api/v1/job")
|
||||
public class JobController {
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService sessionService;
|
||||
|
||||
@Autowired
|
||||
private JobQueueManager jobQueueManager;
|
||||
|
||||
@GetMapping("/{workspaceId}/job/{id}")
|
||||
public R detail(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("id") String id) {
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id) {
|
||||
JobEntity jobEntity = jobService.queryInfo(id);
|
||||
return R.ok().putData("record", jobEntity);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/job")
|
||||
public R list(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam Map<String, Object> params) {
|
||||
params.put("workspaceId", workspaceId);
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
Page page = jobService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/job")
|
||||
public R add(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestBody JobEntity entity) {
|
||||
@PostMapping
|
||||
public R add(@RequestBody JobEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getEnvironmentId()).notEmpty(RCode.ENVIRONMENT_ID_CANNOT_EMPTY)
|
||||
.and(entity.getRunnerId()).notEmpty(RCode.RUNNER_ID_CANNOT_EMPTY)
|
||||
.and(entity.getPackageId()).notEmpty(RCode.PACKAGE_ID_CANNOT_EMPTY)
|
||||
.and(entity.getPlaybookId()).notEmpty(RCode.PLAYBOOK_ID_CANNOT_EMPTY);
|
||||
|
||||
entity.setWorkspaceId(workspaceId);
|
||||
entity.setEnvId(entity.getEnvironmentId());
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
JobEntity jobEntity = jobService.saveJob(entity);
|
||||
return R.ok().putData("id", jobEntity.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/job")
|
||||
public R delete(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam String ids) {
|
||||
@DeleteMapping
|
||||
public R delete(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
jobService.removeJob(idList);
|
||||
jobService.removeJob(T.ListUtil.of(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/job/cancel")
|
||||
public R cancel(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam String ids) {
|
||||
@PutMapping("/cancel")
|
||||
public R cancel(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
for (String id : idList) {
|
||||
cancelJob(id);
|
||||
}
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
private void cancelJob(String id) {
|
||||
JobEntity job = jobService.getById(id);
|
||||
EnvironmentEntity environment = environmentService.getById(job.getEnvId());
|
||||
log.info("[cancelJob] [jobId: {}]", id);
|
||||
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
|
||||
HttpRequest requestStatus = T.HttpUtil.createGet(String.format("%s/api/v1/env/playbook/%s", url, id));
|
||||
requestStatus.header("Authorization", token);
|
||||
|
||||
if (job.getStatus().contains(RunnerConstant.JobStatus.RUNNING.getValue())){
|
||||
while (true){
|
||||
HttpResponse response = requestStatus.execute();
|
||||
if (response.isOk()){
|
||||
break;
|
||||
}
|
||||
T.ThreadUtil.sleep(3, TimeUnit.SECONDS);
|
||||
}
|
||||
HttpRequest request = T.HttpUtil.createRequest(Method.DELETE, String.format("%s/api/v1/env/playbook/%s", url, id));
|
||||
request.header("Authorization", token);
|
||||
HttpResponse response = request.execute();
|
||||
log.info("[cancelJob] [request env stop playbook] [status: {}]", response.body());
|
||||
}
|
||||
|
||||
if (job.getStatus().contains(RunnerConstant.JobStatus.PENDING.getValue())){
|
||||
jobQueueManager.requeueJob(job);
|
||||
}
|
||||
|
||||
Thread runningThread = Constants.RUNNING_JOB_THREAD.get(id);
|
||||
if (runningThread != null) {
|
||||
runningThread.interrupt();
|
||||
}
|
||||
|
||||
Thread resultThread = Constants.RESULT_JOB_THREAD.get(id);
|
||||
if (resultThread != null) {
|
||||
resultThread.interrupt();
|
||||
}
|
||||
EnvironmentSessionEntity session = sessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getJobId, id)
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1));
|
||||
|
||||
if (T.ObjectUtil.isNotEmpty(session)) {
|
||||
environmentService.removeSession(session.getId());
|
||||
}
|
||||
// TODO 其他处理
|
||||
|
||||
// update state
|
||||
jobService.update(new LambdaUpdateWrapper<JobEntity>()
|
||||
.eq(JobEntity::getId, id)
|
||||
.in(JobEntity::getId, ids)
|
||||
.set(JobEntity::getStatus, "cancel")
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/{workspaceId}/job/{id}/log")
|
||||
public R getJobLog(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("id") String id,
|
||||
@RequestParam Integer offset) {
|
||||
offset = offset == null ? 0 : offset;
|
||||
Map result = jobService.queryJobLog(id, offset);
|
||||
return R.ok().putData("record", result);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,11 +4,10 @@ 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.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import feign.Response;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.common.config.SpringContextUtils;
|
||||
import net.geedge.asw.common.util.*;
|
||||
@@ -17,7 +16,6 @@ import net.geedge.asw.module.runner.entity.PcapEntity;
|
||||
import net.geedge.asw.module.runner.service.IPcapService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -25,14 +23,10 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
@RequestMapping("/api/v1/pcap")
|
||||
public class PcapController {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
@@ -43,33 +37,34 @@ public class PcapController {
|
||||
@Value("${webShark.url:127.0.0.1:8085}")
|
||||
private String websharkurl;
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap/{id}")
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id) {
|
||||
PcapEntity pcapEntity = pcapService.queryInfo(id);
|
||||
return R.ok().putData("record", pcapEntity);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap")
|
||||
public R list(@PathVariable("workspaceId") String workspaceId, @RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull();
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
params.put("workspaceId", workspaceId);
|
||||
Page page = pcapService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/pcap")
|
||||
@PostMapping
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public R add(@RequestParam(value = "files", required = true) List<MultipartFile> fileList,
|
||||
@RequestParam(value = "descriptions", required = false) List<String> descriptionList,
|
||||
@PathVariable("workspaceId") String workspaceId) throws IOException {
|
||||
@RequestParam(required = false) String workbookId,
|
||||
@RequestParam(required = false) String workspaceId) throws IOException {
|
||||
T.VerifyUtil.is(workspaceId).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
List<Object> recordList = T.ListUtil.list(true);
|
||||
for (int i = 0; i < fileList.size(); i++) {
|
||||
MultipartFile file = fileList.get(i);
|
||||
String description = T.StrUtil.emptyToDefault(T.CollUtil.get(descriptionList, i), "");
|
||||
PcapEntity pcapEntity = pcapService.savePcap(file.getResource(), description, workspaceId);
|
||||
PcapEntity pcapEntity = pcapService.savePcap(file.getResource(), description, workbookId, workspaceId);
|
||||
recordList.add(
|
||||
T.MapUtil.builder()
|
||||
.put("id", pcapEntity.getId())
|
||||
@@ -79,9 +74,9 @@ public class PcapController {
|
||||
return R.ok().putData("records", recordList);
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/pcap")
|
||||
@PutMapping
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public R update(@PathVariable("workspaceId") String workspaceId, @RequestBody List<Map<String, String>> body) {
|
||||
public R update(@RequestBody List<Map<String, String>> body) {
|
||||
List<Object> recordList = T.ListUtil.list(true);
|
||||
for (Map<String, String> map : body) {
|
||||
String id = T.MapUtil.getStr(map, "id", "");
|
||||
@@ -102,7 +97,7 @@ public class PcapController {
|
||||
return R.ok().putData("records", recordList);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/pcap")
|
||||
@DeleteMapping
|
||||
public R delete(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
|
||||
@@ -110,28 +105,16 @@ public class PcapController {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/pcap/parse2session")
|
||||
@PutMapping("/parse2session")
|
||||
public R parse2session(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
|
||||
pcapService.parse2session(ids);
|
||||
|
||||
// records
|
||||
List<PcapEntity> entityList = pcapService.list(new LambdaQueryWrapper<PcapEntity>().in(PcapEntity::getId, ids));
|
||||
List<Map<String, String>> records = entityList.stream()
|
||||
.map(entity ->
|
||||
Map.of(
|
||||
"id", entity.getId(),
|
||||
"name", entity.getName(),
|
||||
"status", entity.getStatus()
|
||||
)
|
||||
)
|
||||
.collect(Collectors.toList());
|
||||
return R.ok().putData("records", records);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap/download")
|
||||
@GetMapping("/download")
|
||||
public void download(HttpServletResponse response, String ids) throws IOException {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
List<String> pcapIdList = Arrays.asList(ids.split(","));
|
||||
@@ -150,27 +133,24 @@ public class PcapController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap/{id}/webshark")
|
||||
public R webshark(@PathVariable("id") String id) {
|
||||
@GetMapping("/{id}/webshark")
|
||||
public R webshark(@PathVariable String id) {
|
||||
T.VerifyUtil.is(id).notEmpty();
|
||||
|
||||
HashMap<Object, Object> result = T.MapUtil.newHashMap();
|
||||
PcapEntity pcap = pcapService.getById(id);
|
||||
Map summary = T.JSONUtil.toBean(pcap.getSummary(), Map.class);
|
||||
File pcapFile = FileUtil.file(T.MapUtil.getStr(summary, "commentPath"));
|
||||
pcapFile = FileUtil.exist(pcapFile) ? pcapFile : T.FileUtil.file(pcap.getPath());
|
||||
File pcapFile = T.FileUtil.file(pcap.getPath());
|
||||
String uploadFileName = T.StrUtil.concat(true, id, ".", T.FileUtil.getSuffix(pcapFile));
|
||||
File newFile = FileUtil.copy(pcapFile, FileUtil.file(Constants.TEMP_PATH, uploadFileName), false);
|
||||
try {
|
||||
WebSharkClient webSharkClient = (WebSharkClient) SpringContextUtils.getBean("webSharkClient");
|
||||
Response obj = webSharkClient.upload(newFile);
|
||||
if (T.ObjectUtil.isNotEmpty(obj) && HttpStatus.resolve(obj.status()).is2xxSuccessful()){
|
||||
String baseUrl = UrlBuilder.ofHttp(websharkurl)
|
||||
.addPath("/webshark")
|
||||
.toString();
|
||||
result.put("fileName", uploadFileName);
|
||||
result.put("url", baseUrl);
|
||||
}
|
||||
JSONObject obj = webSharkClient.upload(newFile);
|
||||
|
||||
String baseUrl = UrlBuilder.ofHttp(websharkurl)
|
||||
.addPath("/webshark")
|
||||
.toString();
|
||||
result.put("fileName", uploadFileName);
|
||||
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);
|
||||
@@ -181,23 +161,11 @@ public class PcapController {
|
||||
}
|
||||
|
||||
|
||||
@PutMapping("/{workspaceId}/pcap/unparse2session")
|
||||
@PutMapping("/unparse2session")
|
||||
public R unparse2session(String[] ids) {
|
||||
T.VerifyUtil.is(ids).notEmpty();
|
||||
|
||||
pcapService.unparse2session(ids);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap/explore")
|
||||
public R explore(@PathVariable("workspaceId") String workspaceId, @RequestParam String pcapIds, @RequestParam(required = false) String protocol, @RequestParam(required = false) String streamId) {
|
||||
String discoverUrl = pcapService.generateKibanaDiscoverUrl(workspaceId, pcapIds, protocol, streamId);
|
||||
return R.ok().putData("url", discoverUrl);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/pcap/dashboard")
|
||||
public R dashboard(@PathVariable("workspaceId") String workspaceId, @RequestParam String pcapIds) {
|
||||
String dashboardUrl = pcapService.generateKibanaDashboardUrl(workspaceId, pcapIds);
|
||||
return R.ok().putData("url", dashboardUrl);
|
||||
}
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
package net.geedge.asw.module.runner.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.ResponseUtil;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.runner.entity.PlaybookEntity;
|
||||
import net.geedge.asw.module.runner.service.IPlaybookService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/workspace")
|
||||
public class PlaybookController {
|
||||
|
||||
@Autowired
|
||||
private IPlaybookService playbookService;
|
||||
|
||||
@GetMapping("/{workspaceId}/playbook/{id}")
|
||||
public R detail(@PathVariable("workspaceId") String workspaceId, @PathVariable("id") String id) {
|
||||
PlaybookEntity playbook = playbookService.detail(workspaceId, id);
|
||||
return R.ok().putData("record", playbook);
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/playbook")
|
||||
public R list(@PathVariable("workspaceId") String workspaceId, @RequestParam Map params) {
|
||||
Page page = playbookService.queryList(workspaceId, params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping("/{workspaceId}/playbook")
|
||||
public R save(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam("file") MultipartFile file,
|
||||
@RequestParam("name") String name,
|
||||
@RequestParam("type") String type,
|
||||
@RequestParam(value = "description", required = false) String description) {
|
||||
PlaybookEntity playbook = playbookService.savePlaybook(workspaceId, file, name, type, description);
|
||||
return R.ok().put("record", playbook);
|
||||
}
|
||||
|
||||
@PutMapping("/{workspaceId}/playbook/{playbookId}")
|
||||
public R update(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("playbookId") String playbookId,
|
||||
@RequestParam("name") String name,
|
||||
@RequestParam(value = "description", required = false) String description) {
|
||||
PlaybookEntity playbook = playbookService.updatePlaybook(workspaceId, playbookId, name, description);
|
||||
return R.ok().putData("record", playbook);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{workspaceId}/playbook")
|
||||
public R delete(@PathVariable("workspaceId") String workspaceId,
|
||||
@RequestParam("ids") String ids) {
|
||||
playbookService.delete(workspaceId, ids);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@GetMapping("/{workspaceId}/playbook/{id}/download")
|
||||
public void download(@PathVariable("workspaceId") String workspaceId,
|
||||
@PathVariable("id") String id, HttpServletResponse response) throws IOException {
|
||||
|
||||
PlaybookEntity entity = playbookService.getById(id);
|
||||
T.VerifyUtil.is(entity).notNull(RCode.SYS_RECORD_NOT_FOUND);
|
||||
|
||||
File playbookFile = T.FileUtil.file(entity.getPath());
|
||||
ResponseUtil.downloadFile(response, MediaType.APPLICATION_OCTET_STREAM_VALUE, playbookFile.getName(), T.FileUtil.readBytes(playbookFile));
|
||||
}
|
||||
}
|
||||
@@ -1,174 +1,174 @@
|
||||
//package net.geedge.asw.module.runner.controller;
|
||||
//
|
||||
//import cn.dev33.satoken.annotation.SaIgnore;
|
||||
//import cn.hutool.core.lang.Opt;
|
||||
//import cn.hutool.log.Log;
|
||||
//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
//import jakarta.servlet.http.HttpServletResponse;
|
||||
//import net.geedge.asw.common.util.R;
|
||||
//import net.geedge.asw.common.util.RCode;
|
||||
//import net.geedge.asw.common.util.T;
|
||||
//import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
//import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
//import net.geedge.asw.module.runner.entity.PlaybookEntity;
|
||||
//import net.geedge.asw.module.runner.entity.RunnerEntity;
|
||||
//import net.geedge.asw.module.runner.service.IJobService;
|
||||
//import net.geedge.asw.module.runner.service.IRunnerService;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.web.bind.annotation.*;
|
||||
//import org.springframework.web.multipart.MultipartFile;
|
||||
//
|
||||
//import java.io.IOException;
|
||||
//import java.util.Map;
|
||||
//
|
||||
//@RestController
|
||||
//@RequestMapping("/api/v1/runner")
|
||||
//public class RunnerController {
|
||||
//
|
||||
// private static final Log log = Log.get();
|
||||
//
|
||||
// @Autowired
|
||||
// private IJobService jobService;
|
||||
//
|
||||
// @Autowired
|
||||
// private IRunnerService runnerService;
|
||||
//
|
||||
// @GetMapping("/{id}")
|
||||
// public R detail(@PathVariable("id") String id) {
|
||||
// RunnerEntity runnerEntity = runnerService.getById(id);
|
||||
// return R.ok().putData("record", runnerEntity);
|
||||
// }
|
||||
//
|
||||
// @GetMapping
|
||||
// public R list(@RequestParam Map<String, Object> params) {
|
||||
// T.VerifyUtil.is(params).notNull()
|
||||
// .and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
//
|
||||
// Page page = runnerService.queryList(params);
|
||||
// return R.ok(page);
|
||||
// }
|
||||
//
|
||||
// @PostMapping
|
||||
// public R add(@RequestBody RunnerEntity entity) {
|
||||
// T.VerifyUtil.is(entity).notNull()
|
||||
// .and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
//
|
||||
// RunnerEntity runner = runnerService.saveRunner(entity);
|
||||
// return R.ok().putData("record", runner);
|
||||
// }
|
||||
//
|
||||
// @PutMapping
|
||||
// public R update(@RequestBody RunnerEntity entity) {
|
||||
// T.VerifyUtil.is(entity).notNull()
|
||||
// .and(entity.getId()).notEmpty(RCode.ID_CANNOT_EMPTY)
|
||||
// .and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
//
|
||||
// RunnerEntity runner = runnerService.updateRunner(entity);
|
||||
// return R.ok().putData("record", runner);
|
||||
// }
|
||||
//
|
||||
// @DeleteMapping("/{id}")
|
||||
// public R delete(@PathVariable("id") String id) {
|
||||
// runnerService.removeById(id);
|
||||
// return R.ok();
|
||||
// }
|
||||
//
|
||||
// @SaIgnore
|
||||
// @PostMapping("/register")
|
||||
// public void register(@RequestHeader("Authorization") String token, HttpServletResponse response) throws IOException {
|
||||
// RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
// String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
// if (!T.StrUtil.equals("online", status)) {
|
||||
// log.warn("[register] [runner is offline] [token: {}]", token);
|
||||
// response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @SaIgnore
|
||||
// @PostMapping("/heartbeat")
|
||||
// public void heartbeat(@RequestHeader("Authorization") String token, @RequestBody Map<String, Integer> platformMap,
|
||||
// HttpServletResponse response) throws IOException {
|
||||
// RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
// String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
// if (!T.StrUtil.equals("online", status)) {
|
||||
// log.warn("[heartbeat] [runner is offline] [token: {}]", token);
|
||||
// response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// // update last_heartbeat_timestamp
|
||||
// runnerService.update(new LambdaUpdateWrapper<RunnerEntity>()
|
||||
// .set(RunnerEntity::getLastHeartbeatTimestamp, System.currentTimeMillis())
|
||||
// .eq(RunnerEntity::getId, runner.getId()));
|
||||
//
|
||||
// // findjob by platform
|
||||
// String platform = platformMap.entrySet().stream().filter(entry -> entry.getValue() > 0).findFirst().map(entry -> entry.getKey()).orElseGet(null);
|
||||
// JobEntity job = jobService.assignPendingJob(runner.getId(), platform);
|
||||
// if (T.ObjectUtil.isNotNull(job)) {
|
||||
// // package
|
||||
// PackageEntity pkg = job.getPkg();
|
||||
// Map<String, String> pkgInfo = T.MapUtil.builder("id", pkg.getId())
|
||||
// .put("platform", pkg.getPlatform())
|
||||
// .put("identifier", pkg.getIdentifier())
|
||||
// .put("version", pkg.getVersion())
|
||||
// .build();
|
||||
//
|
||||
// // playbook
|
||||
// PlaybookEntity playbook = job.getPlaybook();
|
||||
// Map<String, String> pbInfo = T.MapUtil.builder("id", playbook.getId())
|
||||
// .put("name", playbook.getName())
|
||||
// .build();
|
||||
//
|
||||
// // response job info
|
||||
// Map<Object, Object> responseData = T.MapUtil.builder()
|
||||
// .put("id", job.getId())
|
||||
// .put("pkg", pkgInfo)
|
||||
// .put("playbook", pbInfo)
|
||||
// .build();
|
||||
// response.setCharacterEncoding("UTF-8");
|
||||
// response.setContentType("text/html; charset=UTF-8");
|
||||
// response.getWriter().write(T.JSONUtil.toJsonStr(responseData));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @SaIgnore
|
||||
// @PutMapping("/trace/{jobId}")
|
||||
// public void trace(@RequestHeader("Authorization") String token, @PathVariable String jobId, @RequestBody byte[] bytes,
|
||||
// HttpServletResponse response) throws IOException {
|
||||
// RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
// String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
// if (!T.StrUtil.equals("online", status)) {
|
||||
// log.warn("[trace] [runner is offline] [token: {}]", token);
|
||||
// response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// try {
|
||||
// // 追加到文件中
|
||||
// String content = T.StrUtil.str(bytes, T.CharsetUtil.CHARSET_UTF_8);
|
||||
// jobService.appendTraceLogStrToFile(jobId, content);
|
||||
// } catch (Exception e) {
|
||||
// log.error("[trace] [error] [job: {}]", jobId);
|
||||
// response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @SaIgnore
|
||||
// @PutMapping("/jobResult/{jobId}")
|
||||
// public void jobResult(@RequestHeader("Authorization") String token, @PathVariable String jobId, @RequestParam String state,
|
||||
// @RequestParam(value = "file", required = false) MultipartFile pcapFile,
|
||||
// HttpServletResponse response) throws IOException {
|
||||
// RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
// String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
// if (!T.StrUtil.equals("online", status)) {
|
||||
// log.warn("[trace] [runner is offline] [token: {}]", token);
|
||||
// response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// // 更新任务状态
|
||||
// jobService.updateJobResult(jobId, state, pcapFile);
|
||||
// }
|
||||
//
|
||||
//}
|
||||
package net.geedge.asw.module.runner.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.hutool.core.lang.Opt;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import net.geedge.asw.common.util.R;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.entity.PlaybookEntity;
|
||||
import net.geedge.asw.module.runner.entity.RunnerEntity;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.runner.service.IRunnerService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/runner")
|
||||
public class RunnerController {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Autowired
|
||||
private IRunnerService runnerService;
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public R detail(@PathVariable("id") String id) {
|
||||
RunnerEntity runnerEntity = runnerService.getById(id);
|
||||
return R.ok().putData("record", runnerEntity);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
T.VerifyUtil.is(params).notNull()
|
||||
.and(T.MapUtil.getStr(params, "workspaceId")).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
Page page = runnerService.queryList(params);
|
||||
return R.ok(page);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public R add(@RequestBody RunnerEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
RunnerEntity runner = runnerService.saveRunner(entity);
|
||||
return R.ok().putData("record", runner);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public R update(@RequestBody RunnerEntity entity) {
|
||||
T.VerifyUtil.is(entity).notNull()
|
||||
.and(entity.getId()).notEmpty(RCode.ID_CANNOT_EMPTY)
|
||||
.and(entity.getWorkspaceId()).notEmpty(RCode.WORKSPACE_ID_CANNOT_EMPTY);
|
||||
|
||||
RunnerEntity runner = runnerService.updateRunner(entity);
|
||||
return R.ok().putData("record", runner);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public R delete(@PathVariable("id") String id) {
|
||||
runnerService.removeById(id);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@SaIgnore
|
||||
@PostMapping("/register")
|
||||
public void register(@RequestHeader("Authorization") String token, HttpServletResponse response) throws IOException {
|
||||
RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
if (!T.StrUtil.equals("online", status)) {
|
||||
log.warn("[register] [runner is offline] [token: {}]", token);
|
||||
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
}
|
||||
}
|
||||
|
||||
@SaIgnore
|
||||
@PostMapping("/heartbeat")
|
||||
public void heartbeat(@RequestHeader("Authorization") String token, @RequestBody Map<String, Integer> platformMap,
|
||||
HttpServletResponse response) throws IOException {
|
||||
RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
if (!T.StrUtil.equals("online", status)) {
|
||||
log.warn("[heartbeat] [runner is offline] [token: {}]", token);
|
||||
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
return;
|
||||
}
|
||||
|
||||
// update last_heartbeat_timestamp
|
||||
runnerService.update(new LambdaUpdateWrapper<RunnerEntity>()
|
||||
.set(RunnerEntity::getLastHeartbeatTimestamp, System.currentTimeMillis())
|
||||
.eq(RunnerEntity::getId, runner.getId()));
|
||||
|
||||
// findjob by platform
|
||||
String platform = platformMap.entrySet().stream().filter(entry -> entry.getValue() > 0).findFirst().map(entry -> entry.getKey()).orElseGet(null);
|
||||
JobEntity job = jobService.assignPendingJob(runner.getId(), platform);
|
||||
if (T.ObjectUtil.isNotNull(job)) {
|
||||
// package
|
||||
PackageEntity pkg = job.getPkg();
|
||||
Map<String, String> pkgInfo = T.MapUtil.builder("id", pkg.getId())
|
||||
.put("platform", pkg.getPlatform())
|
||||
.put("identifier", pkg.getIdentifier())
|
||||
.put("version", pkg.getVersion())
|
||||
.build();
|
||||
|
||||
// playbook
|
||||
PlaybookEntity playbook = job.getPlaybook();
|
||||
Map<String, String> pbInfo = T.MapUtil.builder("id", playbook.getId())
|
||||
.put("name", playbook.getName())
|
||||
.build();
|
||||
|
||||
// response job info
|
||||
Map<Object, Object> responseData = T.MapUtil.builder()
|
||||
.put("id", job.getId())
|
||||
.put("pkg", pkgInfo)
|
||||
.put("playbook", pbInfo)
|
||||
.build();
|
||||
response.setCharacterEncoding("UTF-8");
|
||||
response.setContentType("text/html; charset=UTF-8");
|
||||
response.getWriter().write(T.JSONUtil.toJsonStr(responseData));
|
||||
}
|
||||
}
|
||||
|
||||
@SaIgnore
|
||||
@PutMapping("/trace/{jobId}")
|
||||
public void trace(@RequestHeader("Authorization") String token, @PathVariable String jobId, @RequestBody byte[] bytes,
|
||||
HttpServletResponse response) throws IOException {
|
||||
RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
if (!T.StrUtil.equals("online", status)) {
|
||||
log.warn("[trace] [runner is offline] [token: {}]", token);
|
||||
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 追加到文件中
|
||||
String content = T.StrUtil.str(bytes, T.CharsetUtil.CHARSET_UTF_8);
|
||||
jobService.appendTraceLogStrToFile(jobId, content);
|
||||
} catch (Exception e) {
|
||||
log.error("[trace] [error] [job: {}]", jobId);
|
||||
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
@SaIgnore
|
||||
@PutMapping("/jobResult/{jobId}")
|
||||
public void jobResult(@RequestHeader("Authorization") String token, @PathVariable String jobId, @RequestParam String state,
|
||||
@RequestParam(value = "file", required = false) MultipartFile pcapFile,
|
||||
HttpServletResponse response) throws IOException {
|
||||
RunnerEntity runner = runnerService.getOne(new LambdaUpdateWrapper<RunnerEntity>().eq(RunnerEntity::getToken, token));
|
||||
String status = Opt.ofNullable(runner).map(RunnerEntity::getStatus).orElseGet(() -> null);
|
||||
if (!T.StrUtil.equals("online", status)) {
|
||||
log.warn("[trace] [runner is offline] [token: {}]", token);
|
||||
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Runner is offline");
|
||||
return;
|
||||
}
|
||||
|
||||
// 更新任务状态
|
||||
jobService.updateJobResult(jobId, state, pcapFile);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -14,4 +14,6 @@ public interface JobDao extends BaseMapper<JobEntity>{
|
||||
|
||||
List<JobEntity> queryList(IPage page, Map<String, Object> params);
|
||||
|
||||
JobEntity getPendingJobByPlatform(@Param("platform") String platform);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,18 +1,10 @@
|
||||
package net.geedge.asw.module.runner.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import net.geedge.asw.module.runner.entity.PlaybookEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface PlaybookDao extends BaseMapper<PlaybookEntity>{
|
||||
|
||||
PlaybookEntity queryInfo(@Param("workspaceId") String workspaceId, @Param("id") String id);
|
||||
|
||||
List<PlaybookEntity> queryList(Page page, @Param("workspaceId") String workspaceId, @Param("params") Map params);
|
||||
}
|
||||
|
||||
@@ -4,16 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@TableName("job")
|
||||
@@ -21,17 +15,17 @@ public class JobEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String packageId;
|
||||
private String envId;
|
||||
private String playbookId;
|
||||
private String parameters;
|
||||
private String packageId;
|
||||
private String runnerId;
|
||||
private String scheduleId;
|
||||
private String signatureIds;
|
||||
private String tags;
|
||||
private Long startTimestamp;
|
||||
private Long endTimestamp;
|
||||
private String status;
|
||||
@JsonIgnore
|
||||
private String pcapId;
|
||||
private String logPath;
|
||||
@JsonIgnore
|
||||
private String artifactsPath;
|
||||
|
||||
private Long createTimestamp;
|
||||
private Long updateTimestamp;
|
||||
@@ -41,30 +35,19 @@ public class JobEntity {
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String environmentId;
|
||||
private String workbookId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private ApplicationEntity application;
|
||||
|
||||
@TableField(exist = false)
|
||||
@JsonProperty(value = "package")
|
||||
private PackageEntity pkg;
|
||||
|
||||
@TableField(exist = false)
|
||||
private EnvironmentEntity environment;
|
||||
private RunnerEntity runner;
|
||||
|
||||
@TableField(exist = false)
|
||||
private PlaybookEntity playbook;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<PcapEntity> pcap;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private WorkspaceEntity workspace;
|
||||
|
||||
@TableField(exist = false)
|
||||
private EnvironmentSessionEntity session;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -4,19 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.FileResourceUtil;
|
||||
import net.geedge.asw.module.app.entity.ApplicationEntity;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
import net.geedge.asw.module.workspace.entity.WorkspaceEntity;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@Data
|
||||
@TableName("pcap")
|
||||
public class PcapEntity {
|
||||
@@ -25,7 +18,6 @@ public class PcapEntity {
|
||||
private String id;
|
||||
private String name;
|
||||
private String description;
|
||||
@JsonIgnore
|
||||
private String path;
|
||||
private Long size;
|
||||
private String md5;
|
||||
@@ -38,6 +30,7 @@ public class PcapEntity {
|
||||
@TableField(exist = false)
|
||||
private WorkspaceEntity workspace;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String jobId;
|
||||
|
||||
@TableField(exist = false)
|
||||
@@ -48,17 +41,9 @@ public class PcapEntity {
|
||||
private PackageEntity pkg;
|
||||
|
||||
@TableField(exist = false)
|
||||
private EnvironmentEntity environment;
|
||||
private RunnerEntity runner;
|
||||
|
||||
@TableField(exist = false)
|
||||
private PlaybookEntity playbook;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@JsonIgnore
|
||||
public File getCommonPcapFilePath(String resources) {
|
||||
return FileResourceUtil.createFile(resources, this.workspaceId, Constants.FileTypeEnum.PCAP.getType(), this.id, this.id + "-comment.pcapng");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,12 +1,9 @@
|
||||
package net.geedge.asw.module.runner.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Data;
|
||||
import net.geedge.asw.module.sys.entity.SysUserEntity;
|
||||
|
||||
@Data
|
||||
@TableName("playbook")
|
||||
@@ -15,11 +12,10 @@ public class PlaybookEntity {
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
private String name;
|
||||
private String type;
|
||||
private String appId;
|
||||
private String tags;
|
||||
@JsonIgnore
|
||||
private String path;
|
||||
private String description;
|
||||
private String script;
|
||||
private Long opVersion;
|
||||
|
||||
private Long createTimestamp;
|
||||
private Long updateTimestamp;
|
||||
@@ -28,10 +24,4 @@ public class PlaybookEntity {
|
||||
|
||||
private String workspaceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity createUser;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUserEntity updateUser;
|
||||
|
||||
}
|
||||
@@ -1,337 +0,0 @@
|
||||
package net.geedge.asw.module.runner.job;
|
||||
|
||||
import cn.hutool.core.net.url.UrlBuilder;
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.FileResourceUtil;
|
||||
import net.geedge.asw.common.util.RCode;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.app.service.IPackageService;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.entity.PcapEntity;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.runner.service.IPcapService;
|
||||
import net.geedge.asw.module.runner.util.RunnerConstant;
|
||||
import net.lingala.zip4j.ZipFile;
|
||||
import net.lingala.zip4j.model.FileHeader;
|
||||
import net.lingala.zip4j.model.ZipParameters;
|
||||
import net.lingala.zip4j.model.enums.CompressionLevel;
|
||||
import net.lingala.zip4j.model.enums.CompressionMethod;
|
||||
import org.apache.commons.lang3.time.StopWatch;
|
||||
import org.quartz.DisallowConcurrentExecution;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.quartz.JobExecutionException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.scheduling.quartz.QuartzJobBean;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@DisallowConcurrentExecution
|
||||
@SuppressWarnings("all")
|
||||
public class JobPlaybookExecResultChecker extends QuartzJobBean {
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Autowired
|
||||
private IPcapService pcapService;
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Autowired
|
||||
private IPackageService packageService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Value("${asw.resources.path:resources}")
|
||||
private String resources;
|
||||
|
||||
@Override
|
||||
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
|
||||
Thread.currentThread().setName("JobPlaybookExecResultChecker");
|
||||
|
||||
log.info("[JobPlaybookExecResultChecker] [begin]");
|
||||
StopWatch sw = new StopWatch();
|
||||
sw.start();
|
||||
try {
|
||||
this.playbookExecResultChecker();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[JobPlaybookExecResultChecker] [error]");
|
||||
} finally {
|
||||
sw.stop();
|
||||
}
|
||||
log.info("[JobPlaybookExecResultChecker] [finshed] [Run Time: {}]", sw.toString());
|
||||
}
|
||||
|
||||
private void playbookExecResultChecker() {
|
||||
|
||||
List<JobEntity> jobList = jobService.list(new LambdaQueryWrapper<JobEntity>().eq(JobEntity::getStatus, RunnerConstant.JobStatus.RUNNING.getValue()));
|
||||
if (jobList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (JobEntity job : jobList) {
|
||||
Thread.ofVirtual().start(() -> {
|
||||
String id = job.getId();
|
||||
EnvironmentEntity environment = environmentService.getById(job.getEnvId());
|
||||
log.info("[playbookExecResultChecker] [jobId: {}]", id);
|
||||
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
HttpRequest request = T.HttpUtil.createGet(String.format("%s/api/v1/env/playbook/%s", url, id));
|
||||
request.header("Authorization", token);
|
||||
|
||||
HttpResponse response = request.execute();
|
||||
log.info("[playbookExecResultChecker] [request env api] [env: {}] [status: {}]", environment.getId(), response.getStatus());
|
||||
|
||||
if (response.isOk()) {
|
||||
String result = response.body();
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[playbookExecResultChecker] [env: {}] [result: {}]", environment.getId(), result);
|
||||
}
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(result);
|
||||
if (T.ObjectUtil.equal(RCode.SUCCESS.getCode(), jsonObject.getInt("code"))) {
|
||||
JSONObject data = jsonObject.getJSONObject("data");
|
||||
String status = data.getStr("status");
|
||||
|
||||
switch (status) {
|
||||
case "running":
|
||||
Constants.RUNNING_JOB_THREAD.computeIfAbsent(id, jobId -> startGetJobLogThread(job, environment));
|
||||
break;
|
||||
case "error":
|
||||
Constants.RESULT_JOB_THREAD.computeIfAbsent(id, jobId -> startGetJobResultThread(job, environment,RunnerConstant.JobStatus.FAILED.getValue()));
|
||||
break;
|
||||
case "done":
|
||||
Constants.RESULT_JOB_THREAD.computeIfAbsent(id, jobId -> startGetJobResultThread(job, environment, RunnerConstant.JobStatus.PASSED.getValue()));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private Thread startGetJobLogThread(JobEntity job, EnvironmentEntity environment) {
|
||||
Thread thread = Thread.ofVirtual().start(() -> {
|
||||
log.info("[playbookExecResultChecker] [startGetJobLogThread] [begin] [job id: {}]", job.getId());
|
||||
try {
|
||||
while (true) {
|
||||
if (isJobInRunningStatus(job)) {
|
||||
Constants.RUNNING_JOB_THREAD.remove(job.getId());
|
||||
log.info("[playbookExecResultChecker] [startGetJobLogThread] [finshed ] [job id: {}]", job.getId());
|
||||
break;
|
||||
}
|
||||
performJobLogic(job, environment);
|
||||
Thread.sleep(2000); // 每 2 秒执行一次
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
log.info("[playbookExecResultChecker] [startGetJobLogThread] [stop thread] [job id: {}]", job.getId());
|
||||
Constants.RUNNING_JOB_THREAD.remove(job.getId());
|
||||
Thread.currentThread().interrupt(); // 恢复中断状态
|
||||
}
|
||||
});
|
||||
return thread;
|
||||
}
|
||||
|
||||
// 检查 Job 的状态是否为 running
|
||||
private boolean isJobInRunningStatus(JobEntity jobEntity) {
|
||||
JobEntity job = jobService.getById(jobEntity.getId());
|
||||
return job != null && !T.StrUtil.equalsIgnoreCase(job.getStatus(), RunnerConstant.JobStatus.RUNNING.getValue());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 playbook 执行日志
|
||||
*
|
||||
* @param job
|
||||
* @param environment
|
||||
*/
|
||||
private void performJobLogic(JobEntity job, EnvironmentEntity environment) {
|
||||
File logFile = T.FileUtil.file(job.getLogPath());
|
||||
Integer offset = 0;
|
||||
if (logFile.exists()) {
|
||||
offset = T.FileUtil.readBytes(logFile).length;
|
||||
}
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
HttpRequest request = T.HttpUtil.createGet(String.format("%s/api/v1/env/playbook/%s/log", url, job.getId()));
|
||||
request.form("offset", offset);
|
||||
request.header("Authorization", token);
|
||||
|
||||
HttpResponse response = request.execute();
|
||||
|
||||
if (response.isOk()) {
|
||||
String result = response.body();
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("[playbookExecResultChecker] [performJobLogic] [env: {}] [result: {}]", environment.getId(), result);
|
||||
}
|
||||
JSONObject jsonObject = T.JSONUtil.parseObj(result);
|
||||
if (T.ObjectUtil.equal(RCode.SUCCESS.getCode(), jsonObject.getInt("code"))) {
|
||||
JSONObject data = jsonObject.getJSONObject("data");
|
||||
String content = data.getStr("content");
|
||||
content = T.StrUtil.nullToDefault(content, T.StrUtil.EMPTY);
|
||||
T.FileUtil.appendString(content, logFile, "UTF-8");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get pcap log
|
||||
*
|
||||
* @param job
|
||||
* @param value job status: error and done
|
||||
* @param environment
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
private Thread startGetJobResultThread(JobEntity job, EnvironmentEntity environment, String status) {
|
||||
Thread thread = Thread.ofVirtual().start(() -> {
|
||||
File destination = null;
|
||||
File artifactZip = null;
|
||||
InputStream inputStream = null;
|
||||
ZipFile zipFile = null;
|
||||
ZipFile artifactsZipFile = null;
|
||||
List<File> artifactFiles = T.ListUtil.list(false);
|
||||
try {
|
||||
log.info("[playbookExecResultChecker] [startGetJobResultThread] [job status: {}] [jod id: {}] [time: {}]", status, job.getId(), System.currentTimeMillis());
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
UrlBuilder urlBuilder = UrlBuilder.of(String.format("%s/api/v1/env/playbook/%s/artifact", url, job.getId()));
|
||||
|
||||
String parameters = job.getParameters();
|
||||
if (T.StrUtil.isNotEmpty(parameters)){
|
||||
JSONObject obj = T.JSONUtil.parseObj(parameters);
|
||||
JSONArray artifacts = obj.getJSONArray("artifacts");
|
||||
if (artifacts != null){
|
||||
for (Object artifact : artifacts) {
|
||||
urlBuilder.addQuery("artifacts", artifact);
|
||||
}
|
||||
}
|
||||
}
|
||||
HttpRequest request = T.HttpUtil.createGet(urlBuilder.build());
|
||||
request.header("Authorization", token);
|
||||
HttpResponse response = request.execute();
|
||||
log.info("[playbookExecResultChecker] [startGetJobResultThread] [request env playbook result api] [status: {}] [time: {}]", response.getStatus(), System.currentTimeMillis());
|
||||
|
||||
if (response.isOk()) {
|
||||
destination = T.FileUtil.file(Constants.TEMP_PATH, T.StrUtil.concat(true, job.getId(), ".zip"));
|
||||
T.FileUtil.writeBytes(response.bodyBytes(), destination);
|
||||
zipFile = new ZipFile(destination);
|
||||
List<FileHeader> fileHeaders = zipFile.getFileHeaders();
|
||||
for (FileHeader fileHeader : fileHeaders) {
|
||||
// 检查中断状态
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
log.info("[playbookExecResultChecker] [startGetJobResultThread] [stop thread] [job id: {}]", job.getId());
|
||||
return; // 中断线程，退出循环
|
||||
}
|
||||
// 处理 pcap 文件
|
||||
if (fileHeader.getFileName().endsWith("pcap")) {
|
||||
PackageEntity packageEntity = packageService.getById(job.getPackageId());
|
||||
String fileName = T.StrUtil.concat(true, "job", T.StrUtil.DASHED, T.StrUtil.sub(job.getId(), 0, 8), T.StrUtil.DASHED, packageEntity.getName(), ".pcap");
|
||||
if (fileHeader.getFileName().contains("all")) {
|
||||
fileName = T.StrUtil.concat(true, "job", T.StrUtil.DASHED, T.StrUtil.sub(job.getId(), 0, 8), ".pcap");
|
||||
}
|
||||
|
||||
String pcapId = T.StrUtil.uuid();
|
||||
// 上传 pcap 文件流
|
||||
File pcapFile = FileResourceUtil.createFile(resources, job.getWorkspaceId(), Constants.FileTypeEnum.PCAP.getType(), pcapId, pcapId + "pcap");
|
||||
File parentDir = pcapFile.getParentFile();
|
||||
if (!parentDir.exists()) {
|
||||
parentDir.mkdirs();
|
||||
}
|
||||
inputStream = zipFile.getInputStream(fileHeader);
|
||||
T.FileUtil.writeFromStream(inputStream, pcapFile);
|
||||
PcapEntity entity = new PcapEntity();
|
||||
entity.setId(pcapId);
|
||||
entity.setName(fileName);
|
||||
|
||||
entity.setSize(pcapFile.length());
|
||||
entity.setStatus(RunnerConstant.PcapStatus.UPLOADED.getValue());
|
||||
entity.setCreateTimestamp(System.currentTimeMillis());
|
||||
entity.setCreateUserId(job.getCreateUserId());
|
||||
entity.setWorkspaceId(job.getWorkspaceId());
|
||||
entity.setJobId(job.getId());
|
||||
entity.setPath(pcapFile.getPath());
|
||||
|
||||
// md5
|
||||
String md5Hex = T.DigestUtil.md5Hex(pcapFile);
|
||||
entity.setMd5(md5Hex);
|
||||
pcapService.save(entity);
|
||||
log.info("[playbookExecResultChecker] [startGetJobResultThread] [upload pcap: {}] [job id: {}] [time: {}]", T.JSONUtil.toJsonStr(entity), job.getId(), System.currentTimeMillis());
|
||||
} else if (fileHeader.getFileName().equals("result.log")) {
|
||||
// 处理 log 文件
|
||||
File logFile = T.FileUtil.file(job.getLogPath());
|
||||
inputStream = zipFile.getInputStream(fileHeader);
|
||||
T.FileUtil.writeFromStream(inputStream, logFile);
|
||||
} else {
|
||||
File artifactFile = FileResourceUtil.createFile(resources, job.getWorkspaceId(), Constants.FileTypeEnum.JOB.getType(), job.getId(), fileHeader.getFileName());
|
||||
inputStream = zipFile.getInputStream(fileHeader);
|
||||
T.FileUtil.writeFromStream(inputStream, artifactFile);
|
||||
artifactFiles.add(artifactFile);
|
||||
}
|
||||
}
|
||||
|
||||
if (T.CollUtil.isNotEmpty(artifactFiles) && artifactFiles.size() > 1) {
|
||||
artifactZip = FileResourceUtil.createFile(resources, job.getWorkspaceId(), Constants.FileTypeEnum.JOB.getType(), job.getId(), T.StrUtil.concat(true, job.getId(), ".zip"));
|
||||
artifactsZipFile = new ZipFile(artifactZip);
|
||||
|
||||
ZipParameters zipParameters = new ZipParameters();
|
||||
zipParameters.setCompressionMethod(CompressionMethod.DEFLATE); // 压缩方法
|
||||
zipParameters.setCompressionLevel(CompressionLevel.FASTEST); // 压缩级别，选项有 FASTEST、ULTRA 等
|
||||
artifactsZipFile.addFiles(artifactFiles, zipParameters);
|
||||
job.setArtifactsPath(artifactZip.getPath());
|
||||
}
|
||||
if (T.CollUtil.isNotEmpty(artifactFiles) && artifactFiles.size() == 1) {
|
||||
job.setArtifactsPath(artifactFiles.getFirst().getPath());
|
||||
}
|
||||
// update job status
|
||||
job.setStatus(status);
|
||||
job.setEndTimestamp(System.currentTimeMillis());
|
||||
jobService.updateById(job);
|
||||
|
||||
// remove session
|
||||
EnvironmentSessionEntity session = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getJobId, job.getId())
|
||||
.eq(EnvironmentSessionEntity::getStatus, 1)
|
||||
);
|
||||
if (session != null) {
|
||||
environmentService.removeSession(session.getId());
|
||||
}
|
||||
log.info("[playbookExecResultChecker] [startGetJobResultThread] [finshed] [job id: {}]", job.getId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (e.getMessage().contains("Closed by interrupt")) {
|
||||
Thread.currentThread().interrupt(); // 恢复中断状态
|
||||
}
|
||||
log.error("[playbookExecResultChecker] [startGetJobResultThread] [error]", e);
|
||||
} finally {
|
||||
T.IoUtil.close(zipFile);
|
||||
T.IoUtil.close(artifactsZipFile);
|
||||
T.FileUtil.del(destination);
|
||||
T.IoUtil.close(inputStream);
|
||||
if (artifactFiles.size() > 1){
|
||||
artifactFiles.stream().forEach(file-> T.FileUtil.del(file));
|
||||
}
|
||||
Constants.RESULT_JOB_THREAD.remove(job.getId());
|
||||
}
|
||||
});
|
||||
return thread;
|
||||
}
|
||||
}
|
||||
@@ -1,228 +0,0 @@
|
||||
package net.geedge.asw.module.runner.job;
|
||||
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.log.Log;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import net.geedge.asw.common.util.Constants;
|
||||
import net.geedge.asw.common.util.T;
|
||||
import net.geedge.asw.module.app.entity.PackageEntity;
|
||||
import net.geedge.asw.module.app.service.IPackageService;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentEntity;
|
||||
import net.geedge.asw.module.environment.entity.EnvironmentSessionEntity;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentService;
|
||||
import net.geedge.asw.module.environment.service.IEnvironmentSessionService;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import net.geedge.asw.module.runner.entity.PlaybookEntity;
|
||||
import net.geedge.asw.module.runner.service.IJobService;
|
||||
import net.geedge.asw.module.runner.service.IPlaybookService;
|
||||
import net.geedge.asw.module.runner.util.JobQueueManager;
|
||||
import net.geedge.asw.module.runner.util.RunnerConstant;
|
||||
import org.apache.commons.lang3.time.StopWatch;
|
||||
import org.quartz.DisallowConcurrentExecution;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.quartz.QuartzJobBean;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@DisallowConcurrentExecution
|
||||
@SuppressWarnings("all")
|
||||
public class JobPlaybookExecutor extends QuartzJobBean {
|
||||
|
||||
private static final Log log = Log.get();
|
||||
|
||||
@Autowired
|
||||
private IJobService jobService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentService environmentService;
|
||||
|
||||
@Autowired
|
||||
private IPackageService packageService;
|
||||
|
||||
@Autowired
|
||||
private IPlaybookService playbookService;
|
||||
|
||||
@Autowired
|
||||
private IEnvironmentSessionService environmentSessionService;
|
||||
|
||||
@Autowired
|
||||
private JobQueueManager jobQueueManager;
|
||||
|
||||
@Override
|
||||
protected void executeInternal(JobExecutionContext context) {
|
||||
Thread.currentThread().setName("JobPlaybookExecutor");
|
||||
|
||||
log.info("[JobPlaybookExecutor] [begin]");
|
||||
StopWatch sw = new StopWatch();
|
||||
sw.start();
|
||||
try {
|
||||
this.playbookExecutor();
|
||||
} catch (Exception e) {
|
||||
log.error(e, "[JobPlaybookExecutor] [error]");
|
||||
} finally {
|
||||
sw.stop();
|
||||
}
|
||||
log.info("[JobPlaybookExecutor] [finshed] [Run Time: {}]", sw.toString());
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void playbookExecutor() {
|
||||
List<JobEntity> createdJobs = jobService.list(
|
||||
new LambdaQueryWrapper<JobEntity>()
|
||||
.eq(JobEntity::getStatus, RunnerConstant.JobStatus.CREATED.getValue())
|
||||
.orderByAsc(JobEntity::getCreateTimestamp)
|
||||
);
|
||||
|
||||
if (T.CollUtil.isNotEmpty(createdJobs)) {
|
||||
log.info("[JobPlaybookExecutor] [playbookExecutor] [fetching created jobs] [size: {}]", createdJobs.size());
|
||||
// 将 CREATED 任务加入队列
|
||||
createdJobs.forEach(jobQueueManager::addJob);
|
||||
// 更新 createdJobs 状态为 pending
|
||||
createdJobs.forEach(x -> x.setStatus(RunnerConstant.JobStatus.PENDING.getValue()));
|
||||
jobService.updateBatchById(createdJobs);
|
||||
}
|
||||
|
||||
// 处理队列中的任务
|
||||
if (!jobQueueManager.isAllQueuesEmpty()) {
|
||||
List<JobEntity> nextJobList = jobQueueManager.fetchNextJob();
|
||||
for (JobEntity nextJob : nextJobList) {
|
||||
String envId = nextJob.getEnvId();
|
||||
log.info("[JobPlaybookExecutor] [playbookExecutor] [Processing jobId: {}] [envId: {}]", nextJob.getId(), envId);
|
||||
|
||||
EnvironmentEntity environment = environmentService.getById(envId);
|
||||
if (!environment.getStatus().equals(1)) {
|
||||
log.warn("[JobPlaybookExecutor] [playbookExecutor] [environment is not available] [jobId: {}] [envId: {}]", nextJob.getId(), environment.getId());
|
||||
jobQueueManager.requeueJob(nextJob); // 将任务放回队列
|
||||
continue;
|
||||
}
|
||||
|
||||
List<EnvironmentSessionEntity> sessionList = environmentSessionService.list(new LambdaQueryWrapper<EnvironmentSessionEntity>()
|
||||
.eq(EnvironmentSessionEntity::getStatus, "1")
|
||||
.eq(EnvironmentSessionEntity::getEnvId, envId));
|
||||
if (T.CollUtil.isNotEmpty(sessionList)) {
|
||||
log.warn("[JobPlaybookExecutor] [playbookExecutor] [environment is in used] [jobId: {}] [envId: {}]", nextJob.getId(), environment.getId());
|
||||
jobQueueManager.requeueJob(nextJob); // 将任务放回队列
|
||||
continue;
|
||||
}
|
||||
|
||||
// update job status running
|
||||
jobService.update(new LambdaUpdateWrapper<JobEntity>()
|
||||
.set(JobEntity::getStatus, RunnerConstant.JobStatus.RUNNING.getValue())
|
||||
.set(JobEntity::getStartTimestamp, System.currentTimeMillis())
|
||||
.eq(JobEntity::getId, nextJob.getId())
|
||||
);
|
||||
|
||||
// add session
|
||||
EnvironmentSessionEntity session = new EnvironmentSessionEntity();
|
||||
session.setEnvId(envId);
|
||||
session.setJobId(nextJob.getId());
|
||||
session.setStatus(1);
|
||||
session.setUserId("system");
|
||||
session.setWorkspaceId(nextJob.getWorkspaceId());
|
||||
session.setStartTimestamp(System.currentTimeMillis());
|
||||
environmentSessionService.save(session);
|
||||
|
||||
// 执行任务
|
||||
processJobAsync(nextJob, environment, session);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void processJobAsync(JobEntity job, EnvironmentEntity environment, EnvironmentSessionEntity session) {
|
||||
T.ThreadUtil.execAsync(() -> {
|
||||
log.info("[JobPlaybookExecutor] [processJobAsync] [start jobId: {}]", job.getId());
|
||||
try {
|
||||
// 执行请求
|
||||
HttpResponse response = requestEnvironment(job, environment);
|
||||
if (!response.isOk()) {
|
||||
String result = response.body();
|
||||
log.warn("[JobPlaybookExecutor] [processJobAsync] [envId: {}] [result: {}]", environment.getId(), result);
|
||||
|
||||
File logFile = T.FileUtil.file(job.getLogPath());
|
||||
T.FileUtil.appendString(String.format("ERROR: Request %s environment error! msg: %s.\n", environment.getName(), result), logFile, "UTF-8");
|
||||
|
||||
// update job status, starTime, updateTimestamp
|
||||
jobService.update(new LambdaUpdateWrapper<JobEntity>()
|
||||
.set(JobEntity::getStatus, RunnerConstant.JobStatus.FAILED.getValue())
|
||||
.set(JobEntity::getEndTimestamp, System.currentTimeMillis())
|
||||
.eq(JobEntity::getId, job.getId()));
|
||||
|
||||
// remove session
|
||||
environmentService.removeSession(session.getId());
|
||||
}
|
||||
log.info("[JobPlaybookExecutor] [processJobAsync] [Finished jobId: {}]", job.getId());
|
||||
} catch (Exception e) {
|
||||
|
||||
// update job status, starTime, updateTimestamp
|
||||
jobService.update(new LambdaUpdateWrapper<JobEntity>()
|
||||
.set(JobEntity::getStatus, RunnerConstant.JobStatus.FAILED.getValue())
|
||||
.set(JobEntity::getEndTimestamp, System.currentTimeMillis())
|
||||
.eq(JobEntity::getId, job.getId()));
|
||||
|
||||
// remove session
|
||||
environmentService.removeSession(session.getId());
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private HttpResponse requestEnvironment(JobEntity job, EnvironmentEntity environment) {
|
||||
File zipFile = null;
|
||||
try {
|
||||
String playbookId = job.getPlaybookId();
|
||||
String packageId = job.getPackageId();
|
||||
|
||||
// package playbook file
|
||||
PackageEntity packageEntity = packageService.getById(packageId);
|
||||
File packageFile = T.FileUtil.file(packageEntity.getPath());
|
||||
PlaybookEntity playbook = playbookService.getById(playbookId);
|
||||
File playbookFile = T.FileUtil.file(playbook.getPath());
|
||||
|
||||
// zip
|
||||
zipFile = T.FileUtil.file(Constants.TEMP_PATH, T.StrUtil.concat(true, job.getId(), ".zip"));
|
||||
T.ZipUtil.zip(zipFile, true, packageFile, playbookFile);
|
||||
|
||||
JSONObject paramJSONObject = environment.getParamJSONObject();
|
||||
String url = paramJSONObject.getStr("url");
|
||||
String token = paramJSONObject.getStr("token");
|
||||
|
||||
// parameters
|
||||
String packageName = packageEntity.getIdentifier();
|
||||
String parameters = job.getParameters();
|
||||
Map<String, Object> params = T.MapUtil.newHashMap();
|
||||
if (T.StrUtil.isNotEmpty(parameters)) {
|
||||
params = T.JSONUtil.toBean(parameters, Map.class);
|
||||
} else {
|
||||
params.put("reInstall", true);
|
||||
params.put("clearCache", true);
|
||||
params.put("unInstall", true);
|
||||
}
|
||||
|
||||
// build request
|
||||
log.info("[JobPlaybookExecutor] [requestEnvironment] [jobId: {}] [envId: {}] [playbookId: {}] [packageId: {}]", job.getId(), environment.getId(), playbookId, packageId);
|
||||
HttpRequest request = T.HttpUtil.createPost(String.format("%s/api/v1/env/playbook", url));
|
||||
request.header("Authorization", token);
|
||||
request.form("file", zipFile);
|
||||
request.form("id", job.getId());
|
||||
request.form("packageName", packageName);
|
||||
request.form("type", playbook.getType());
|
||||
for (Map.Entry<String, Object> param : params.entrySet()) {
|
||||
request.form(param.getKey(), param.getValue());
|
||||
}
|
||||
HttpResponse response = request.execute();
|
||||
return response;
|
||||
} catch (Exception e) {
|
||||
log.error("[JobPlaybookExecutor] [requestEnvironment] [error] [jobId: {}]", job.getId(), e);
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
T.FileUtil.del(zipFile);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package net.geedge.asw.module.runner.service;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import net.geedge.asw.module.runner.entity.JobEntity;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -17,12 +18,10 @@ public interface IJobService extends IService<JobEntity>{
|
||||
|
||||
void removeJob(List<String> ids);
|
||||
|
||||
Map queryJobLog(String id, Integer offset);
|
||||
JobEntity assignPendingJob(String id, String platform);
|
||||
|
||||
// JobEntity assignPendingJob(String id, String platform);
|
||||
//
|
||||
// void appendTraceLogStrToFile(String jobId, String content) throws RuntimeException;
|
||||
//
|
||||
// void updateJobResult(String jobId, String state, MultipartFile pcapFile);
|
||||
void appendTraceLogStrToFile(String jobId, String content) throws RuntimeException;
|
||||
|
||||
void updateJobResult(String jobId, String state, MultipartFile pcapFile);
|
||||
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@ public interface IPcapService extends IService<PcapEntity>{
|
||||
|
||||
Page queryList(Map<String, Object> params);
|
||||
|
||||
PcapEntity savePcap(String jobId, Resource fileResource);
|
||||
|
||||
PcapEntity savePcap(Resource fileResource,String... params);
|
||||
|
||||
void deletePcap(String... ids);
|
||||
@@ -20,8 +22,4 @@ public interface IPcapService extends IService<PcapEntity>{
|
||||
void parse2session(String... ids);
|
||||
|
||||
void unparse2session(String[] ids);
|
||||
|
||||
String generateKibanaDiscoverUrl(String workspaceId, String pcapIds, String protocol, String streamId);
|
||||
|
||||
String generateKibanaDashboardUrl(String workspaceId, String pcapIds);
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user