gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.5.0):增加日志自定义存储及获取接口；增加websocket获取定时任务日志

Browse Source
This commit is contained in:
srzou 2025-03-24 10:16:17 +08:00 committed by opensnail
parent f0d8ee92fd
commit 319275b9b8
38 changed files with 547 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/config/SnailJobServerCommonAutoConfiguration.java
View File

@ -1,5 +1,10 @@
package com.aizuda.snailjob.server.common.config;
import com.aizuda.snailjob.server.common.service.LogService;
import com.aizuda.snailjob.server.common.service.impl.DatabaseLogService;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@ -32,4 +37,10 @@ public class SnailJobServerCommonAutoConfiguration {
scheduler.setThreadNamePrefix("snail-job-alarm-thread-");
return scheduler;
}
@Bean
@ConditionalOnMissingBean(LogService.class)
public LogService logService(JobLogMessageMapper jobLogMessageMapper, JobTaskBatchMapper jobTaskBatchMapper){
return new DatabaseLogService(jobLogMessageMapper, jobTaskBatchMapper);
}
}

25
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/convert/JobLogMessageConverter.java Normal file
View File

@ -0,0 +1,25 @@
package com.aizuda.snailjob.server.common.convert;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import com.aizuda.snailjob.server.model.dto.LogTaskDTO;
import com.aizuda.snailjob.template.datasource.persistence.po.JobLogMessage;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.common.support
* @Project：snail-job
* @Date：2025/3/10 21:16
* @Filename：JobLogMessageConverter
* @since 1.5.0
*/
@Mapper
public interface JobLogMessageConverter {
JobLogMessageConverter INSTANCE = Mappers.getMapper(JobLogMessageConverter.class);
JobLogMessage toJobLogMessage(JobLogDTO jobLogDTO);
JobLogMessage toJobLogMessage(LogTaskDTO logTaskDTO);
}

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/dto/JobLogDTO.java → snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/dto/JobLogDTO.java
View File

@ -1,4 +1,4 @@
package com.aizuda.snailjob.server.job.task.dto;
package com.aizuda.snailjob.server.common.dto;
import lombok.Data;

28
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/WebSocketSceneEnum.java Normal file
View File

@ -0,0 +1,28 @@
package com.aizuda.snailjob.server.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @since 1.5.0
*/
@Getter
@AllArgsConstructor
public enum WebSocketSceneEnum {
JOB_LOG_SCENE(1, "JOB_LOG_SCENE"),
WORKFLOW_LOG_SCENE(2, "WORKFLOW_LOG_SCENE"),
RETRY_LOG_SCENE(3,"RETRY_LOG_SCENE");
private final Integer type;
private final String scene;
// public static WebSocketSceneEnum valueOf(String scene) {
// for (WebSocketSceneEnum expressionTypeEnum : WebSocketSceneEnum.values()) {
// if (expressionTypeEnum.getScene().equals(scene)) {
// return expressionTypeEnum;
// }
// }
//
// return null;
// }
}

23
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/service/LogService.java Normal file
View File

@ -0,0 +1,23 @@
package com.aizuda.snailjob.server.common.service;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.model.dto.JobLogTaskDTO;
import jakarta.websocket.Session;
import java.io.IOException;
import java.util.List;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.common.service
* @Project：snail-job
* @Date：2025/3/10 20:57
* @Filename：LogService
* @since 1.5.0
*/
public interface LogService {
void saveLog(JobLogDTO jobLogDTO);
void batchSaveLogs(List<JobLogTaskDTO> jobLogTasks);
void getJobLogPage(JobLogQueryVO queryVO, Session session) throws IOException;
}

205
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/service/impl/DatabaseLogService.java Normal file
View File

@ -0,0 +1,205 @@
package com.aizuda.snailjob.server.common.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.core.util.StreamUtils;
import com.aizuda.snailjob.common.log.constant.LogFieldConstants;
import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import com.aizuda.snailjob.server.common.service.LogService;
import com.aizuda.snailjob.server.common.convert.JobLogMessageConverter;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.common.vo.JobLogResponseVO;
import com.aizuda.snailjob.server.model.dto.JobLogTaskDTO;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.JobLogMessage;
import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.google.common.collect.Lists;
import jakarta.websocket.Session;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum.COMPLETED;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.common.service.impl
* @Project：snail-job
* @Date：2025/3/10 21:12
* @Filename：DatabaseLogService
* @since 1.5.0
*/
@Slf4j
@RequiredArgsConstructor
public class DatabaseLogService implements LogService {
private final JobLogMessageMapper jobLogMessageMapper;
private final JobTaskBatchMapper jobTaskBatchMapper;
// 创建一个调度线程池
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
/**
* 保存单调日志
*
* @param jobLogDTO
*/
@Override
public void saveLog(JobLogDTO jobLogDTO) {
JobLogMessage jobLogMessage = JobLogMessageConverter.INSTANCE.toJobLogMessage(jobLogDTO);
jobLogMessage.setCreateDt(LocalDateTime.now());
jobLogMessage.setLogNum(1);
jobLogMessage.setMessage(Optional.ofNullable(jobLogDTO.getMessage()).orElse(StrUtil.EMPTY));
jobLogMessage.setTaskId(Optional.ofNullable(jobLogMessage.getTaskId()).orElse(0L));
jobLogMessageMapper.insert(jobLogMessage);
}
/**
* 批量保存日志
*
* @param jobLogTasks
*/
@Override
public void batchSaveLogs(List<JobLogTaskDTO> jobLogTasks) {
Map<Long, List<JobLogTaskDTO>> logTaskDTOMap = jobLogTasks.
stream().collect(Collectors.groupingBy(JobLogTaskDTO::getTaskId, Collectors.toList()));
List<JobLogMessage> jobLogMessageList = new ArrayList<>();
for (List<JobLogTaskDTO> logTaskDTOList : logTaskDTOMap.values()) {
JobLogMessage jobLogMessage = JobLogMessageConverter.INSTANCE.toJobLogMessage(logTaskDTOList.get(0));
jobLogMessage.setCreateDt(LocalDateTime.now());
jobLogMessage.setLogNum(logTaskDTOList.size());
List<Map<String, String>> messageMapList = StreamUtils.toList(logTaskDTOList,
taskDTO -> taskDTO.getFieldList()
.stream().filter(logTaskDTO_ -> !Objects.isNull(logTaskDTO_.getValue()))
.collect(Collectors.toMap(TaskLogFieldDTO::getName, TaskLogFieldDTO::getValue)));
jobLogMessage.setMessage(JsonUtil.toJsonString(messageMapList));
jobLogMessageList.add(jobLogMessage);
}
jobLogMessageMapper.insertBatch(jobLogMessageList);
}
@Override
public void getJobLogPage(JobLogQueryVO queryVO, Session session) throws IOException {
Boolean taskBatchComplete = false;
while (!taskBatchComplete){
PageDTO<JobLogMessage> pageDTO = new PageDTO<>(1, queryVO.getSize());
PageDTO<JobLogMessage> selectPage = jobLogMessageMapper.selectPage(pageDTO,
new LambdaQueryWrapper<JobLogMessage>()
.select(JobLogMessage::getId, JobLogMessage::getLogNum)
.ge(JobLogMessage::getId, queryVO.getStartId())
.eq(JobLogMessage::getTaskBatchId, queryVO.getTaskBatchId())
.eq(JobLogMessage::getTaskId, queryVO.getTaskId())
.orderByAsc(JobLogMessage::getId).orderByAsc(JobLogMessage::getRealTime));
List<JobLogMessage> records = selectPage.getRecords();
if (CollUtil.isEmpty(records)) {
JobTaskBatch jobTaskBatch = jobTaskBatchMapper.selectOne(
new LambdaQueryWrapper<JobTaskBatch>()
.eq(JobTaskBatch::getId, queryVO.getTaskBatchId())
);
JobLogResponseVO jobLogResponseVO = new JobLogResponseVO();
if (Objects.isNull(jobTaskBatch)
|| (COMPLETED.contains(jobTaskBatch.getTaskBatchStatus()) &&
jobTaskBatch.getUpdateDt().plusSeconds(15).isBefore(LocalDateTime.now()))
) {
jobLogResponseVO.setFinished(Boolean.TRUE);
jobLogResponseVO.setNextStartId(queryVO.getStartId());
jobLogResponseVO.setFromIndex(0);
session.getBasicRemote().sendText(JsonUtil.toJsonString(jobLogResponseVO));
System.out.println("结束了");
return;
}else {
// 如果没有完成，就等五秒执行
System.out.println("异步执行");
scheduleNextAttempt(queryVO, session);
return;
}
}
Integer fromIndex = Optional.ofNullable(queryVO.getFromIndex()).orElse(0);
JobLogMessage firstRecord = records.get(0);
List<Long> ids = Lists.newArrayList(firstRecord.getId());
int total = firstRecord.getLogNum() - fromIndex;
for (int i = 1; i < records.size(); i++) {
JobLogMessage record = records.get(i);
if (total + record.getLogNum() > queryVO.getSize()) {
break;
}
total += record.getLogNum();
ids.add(record.getId());
}
long nextStartId = 0;
List<Map<String, String>> messages = Lists.newArrayList();
List<JobLogMessage> jobLogMessages = jobLogMessageMapper.selectList(
new LambdaQueryWrapper<JobLogMessage>()
.in(JobLogMessage::getId, ids)
.orderByAsc(JobLogMessage::getId)
.orderByAsc(JobLogMessage::getRealTime)
);
for (final JobLogMessage jobLogMessage : jobLogMessages) {
List<Map<String, String>> originalList = JsonUtil.parseObject(jobLogMessage.getMessage(), List.class);
int size = originalList.size() - fromIndex;
List<Map<String, String>> pageList = originalList.stream().skip(fromIndex).limit(queryVO.getSize())
.collect(Collectors.toList());
if (messages.size() + size >= queryVO.getSize()) {
messages.addAll(pageList);
nextStartId = jobLogMessage.getId();
fromIndex = Math.min(fromIndex + queryVO.getSize(), originalList.size() - 1) + 1;
break;
}
messages.addAll(pageList);
nextStartId = jobLogMessage.getId() + 1;
fromIndex = 0;
}
messages = messages.stream()
.sorted(Comparator.comparingLong(o -> Long.parseLong(o.get(LogFieldConstants.TIME_STAMP))))
.collect(Collectors.toList());
JobLogResponseVO jobLogResponseVO = new JobLogResponseVO();
jobLogResponseVO.setMessage(messages);
jobLogResponseVO.setNextStartId(nextStartId);
jobLogResponseVO.setFromIndex(fromIndex);
session.getBasicRemote().sendText(JsonUtil.toJsonString(jobLogResponseVO));
queryVO.setFromIndex(fromIndex);
queryVO.setStartId(nextStartId);
}
}
private void scheduleNextAttempt(JobLogQueryVO queryVO, Session session) {
scheduler.schedule(() -> {
try {
// 再次调用查询
getJobLogPage(queryVO, session);
} catch (IOException e) {
e.printStackTrace();
}
// 5秒后执行
}, 5, TimeUnit.SECONDS);
}
}

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobLogQueryVO.java → snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobLogQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
package com.aizuda.snailjob.server.common.vo;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobLogResponseVO.java → snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobLogResponseVO.java
View File

@ -1,4 +1,4 @@
package com.aizuda.snailjob.server.web.model.response;
package com.aizuda.snailjob.server.common.vo;
import lombok.Data;

27
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WsRequestVO.java Normal file
View File

@ -0,0 +1,27 @@
package com.aizuda.snailjob.server.common.vo;
import com.aizuda.snailjob.server.common.enums.WebSocketSceneEnum;
import lombok.Data;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.web.model.request
* @Project：snail-job
* @Date：2025/3/5 16:54
* @Filename：WebSocketRequestVO
* @since 1.5.0
*/
@Data
public class WsRequestVO {
/**
* wb类型
*/
private String sid;
/**
* context
*/
private String message;
private WebSocketSceneEnum sceneEnum;
}

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/base/BaseQueryVO.java → snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/base/BaseQueryVO.java
View File

@ -1,4 +1,4 @@
package com.aizuda.snailjob.server.web.model.base;
package com.aizuda.snailjob.server.common.vo.base;
import cn.hutool.core.util.ObjUtil;
import lombok.Data;

1
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/JobTaskConverter.java
View File

@ -4,6 +4,7 @@ import com.aizuda.snailjob.client.model.request.DispatchJobRequest;
import com.aizuda.snailjob.client.model.request.DispatchJobResultRequest;
import com.aizuda.snailjob.client.model.request.MapTaskRequest;
import com.aizuda.snailjob.server.common.dto.JobAlarmInfo;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import com.aizuda.snailjob.server.common.dto.JobLogMetaDTO;
import com.aizuda.snailjob.server.job.task.dto.*;
import com.aizuda.snailjob.server.job.task.support.block.job.BlockStrategyContext;

40
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java
View File

@ -1,26 +1,18 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.core.util.StreamUtils;
import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO;
import com.aizuda.snailjob.server.common.pekko.ActorGenerator;
import com.aizuda.snailjob.server.job.task.dto.JobLogDTO;
import com.aizuda.snailjob.server.job.task.support.JobTaskConverter;
import com.aizuda.snailjob.server.common.service.LogService;
import com.aizuda.snailjob.server.model.dto.JobLogTaskDTO;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.JobLogMessage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author opensnail
@ -32,7 +24,7 @@ import java.util.stream.Collectors;
@Slf4j
@RequiredArgsConstructor
public class JobLogActor extends AbstractActor {
private final JobLogMessageMapper jobLogMessageMapper;
private final LogService logService;
@Override
public Receive createReceive() {
@ -44,24 +36,7 @@ public class JobLogActor extends AbstractActor {
}
List<JobLogTaskDTO> jobLogTasks = (List<JobLogTaskDTO>) list;
Map<Long, List<JobLogTaskDTO>> logTaskDTOMap = jobLogTasks.
stream().collect(Collectors.groupingBy(JobLogTaskDTO::getTaskId, Collectors.toList()));
List<JobLogMessage> jobLogMessageList = new ArrayList<>();
for (List<JobLogTaskDTO> logTaskDTOList : logTaskDTOMap.values()) {
JobLogMessage jobLogMessage = JobTaskConverter.INSTANCE.toJobLogMessage(logTaskDTOList.get(0));
jobLogMessage.setCreateDt(LocalDateTime.now());
jobLogMessage.setLogNum(logTaskDTOList.size());
List<Map<String, String>> messageMapList = StreamUtils.toList(logTaskDTOList,
taskDTO -> taskDTO.getFieldList()
.stream().filter(logTaskDTO_ -> !Objects.isNull(logTaskDTO_.getValue()))
.collect(Collectors.toMap(TaskLogFieldDTO::getName, TaskLogFieldDTO::getValue)));
jobLogMessage.setMessage(JsonUtil.toJsonString(messageMapList));
jobLogMessageList.add(jobLogMessage);
}
jobLogMessageMapper.insertBatch(jobLogMessageList);
logService.batchSaveLogs(jobLogTasks);
} catch (Exception e) {
log.error("保存客户端日志异常.", e);
} finally {
@ -81,11 +56,6 @@ public class JobLogActor extends AbstractActor {
}
private void saveLogMessage(JobLogDTO jobLogDTO) {
JobLogMessage jobLogMessage = JobTaskConverter.INSTANCE.toJobLogMessage(jobLogDTO);
jobLogMessage.setCreateDt(LocalDateTime.now());
jobLogMessage.setLogNum(1);
jobLogMessage.setMessage(Optional.ofNullable(jobLogDTO.getMessage()).orElse(StrUtil.EMPTY));
jobLogMessage.setTaskId(Optional.ofNullable(jobLogMessage.getTaskId()).orElse(0L));
jobLogMessageMapper.insert(jobLogMessage);
logService.saveLog(jobLogDTO);
}
}

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java
View File

@ -10,7 +10,7 @@ import com.aizuda.snailjob.server.common.pekko.ActorGenerator;
import com.aizuda.snailjob.server.common.dto.JobLogMetaDTO;
import com.aizuda.snailjob.server.common.dto.LogMetaDTO;
import com.aizuda.snailjob.server.common.log.LogStorageFactory;
import com.aizuda.snailjob.server.job.task.dto.JobLogDTO;
import com.aizuda.snailjob.server.common.dto.JobLogDTO;
import com.google.common.collect.Lists;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component;

4
snail-job-server/snail-job-server-web/pom.xml
View File

@ -39,6 +39,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- libs -->
<dependency>

74
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/config/WebSocketConfigurator.java Normal file
View File

@ -0,0 +1,74 @@
package com.aizuda.snailjob.server.web.config;
import com.aizuda.snailjob.common.core.exception.SnailJobAuthenticationException;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.template.datasource.persistence.po.SystemUser;
import com.auth0.jwt.JWT;
import com.auth0.jwt.exceptions.JWTDecodeException;
import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerEndpointConfig;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
import java.util.List;
import java.util.Map;
/**
* WebScoket配置处理器
* @since 1.5.0
*/
@Configuration
public class WebSocketConfigurator extends ServerEndpointConfig.Configurator {
public static final String AUTHENTICATION = "Snail-Job-Auth";
public static final String SID = "sid";
public static final String SCENE = "scene";
public static final String USER_INFO = "user-info";
/**
* ServerEndpointExporter 作用
*
* 这个Bean会自动注册使用@ServerEndpoint注解声明的websocket endpoint
*
* @return
*/
@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
}
@Override
public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
Map<String, List<String>> parameterMap = request.getParameterMap();
String queryString = request.getQueryString();
// 获取 token 中的 user id
SystemUser systemUser;
try {
String token = parameterMap.get(AUTHENTICATION).get(0);
systemUser = JsonUtil.parseObject(JWT.decode(token).getAudience().get(0), SystemUser.class);
} catch (JWTDecodeException j) {
throw new SnailJobAuthenticationException("登陆过期，请重新登陆");
}
String sid = parameterMap.get(SID).get(0);
String scene = parameterMap.get(SCENE).get(0);
Map<String, Object> userProperties = sec.getUserProperties();
userProperties.put(SID, sid);
userProperties.put(SCENE, scene);
userProperties.put(USER_INFO, systemUser);
}
/**
* 初始化端点对象,也就是被@ServerEndpoint所标注的对象
*/
@Override
public <T> T getEndpointInstance(Class<T> clazz) throws InstantiationException {
return super.getEndpointInstance(clazz);
}
}

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobLogController.java
View File

@ -1,8 +1,8 @@
package com.aizuda.snailjob.server.web.controller;
import com.aizuda.snailjob.server.web.annotation.LoginRequired;
import com.aizuda.snailjob.server.web.model.request.JobLogQueryVO;
import com.aizuda.snailjob.server.web.model.response.JobLogResponseVO;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.common.vo.JobLogResponseVO;
import com.aizuda.snailjob.server.web.service.JobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

47
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/listener/WsRequestListener.java Normal file
View File

@ -0,0 +1,47 @@
package com.aizuda.snailjob.server.web.listener;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.server.common.enums.WebSocketSceneEnum;
import com.aizuda.snailjob.server.common.service.LogService;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.common.vo.WsRequestVO;
import jakarta.websocket.Session;
import lombok.AllArgsConstructor;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.io.IOException;
import static com.aizuda.snailjob.server.web.socket.LogServer.USER_SESSION;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.web.listener
* @Project：snail-job
* @Date：2025/3/18 10:56
* @Filename：WsRequestListener
* @since 1.5.0
*/
@Component
@AllArgsConstructor
public class WsRequestListener {
private final LogService logService;
@Async
@EventListener(classes = WsRequestVO.class)
public void getJobLogs(WsRequestVO requestVO) {
if (!WebSocketSceneEnum.JOB_LOG_SCENE.equals(requestVO.getSceneEnum())) {
return;
}
String message = requestVO.getMessage();
JobLogQueryVO jobLogQueryVO = JsonUtil.parseObject(message, JobLogQueryVO.class);
Session session = USER_SESSION.get(requestVO.getSid());
try {
logService.getJobLogPage(jobLogQueryVO, session);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobNotifyConfigQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/LineQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NamespaceQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyRecipientQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogMessageQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SceneConfigQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ServerNodeQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SystemUserQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowBatchQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowQueryVO.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.server.web.model.base.BaseQueryVO;
import com.aizuda.snailjob.server.common.vo.base.BaseQueryVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/JobLogService.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.web.service;
import com.aizuda.snailjob.server.web.model.request.JobLogQueryVO;
import com.aizuda.snailjob.server.web.model.response.JobLogResponseVO;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.common.vo.JobLogResponseVO;
/**
* @author: opensnail

14
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java
View File

@ -3,8 +3,8 @@ package com.aizuda.snailjob.server.web.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.log.constant.LogFieldConstants;
import com.aizuda.snailjob.server.web.model.request.JobLogQueryVO;
import com.aizuda.snailjob.server.web.model.response.JobLogResponseVO;
import com.aizuda.snailjob.server.common.vo.JobLogQueryVO;
import com.aizuda.snailjob.server.common.vo.JobLogResponseVO;
import com.aizuda.snailjob.server.web.service.JobLogService;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper;
@ -20,6 +20,8 @@ import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import static com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum.COMPLETED;
/**
* @author: opensnail
* @date : 2023-10-12 09:55
@ -40,8 +42,8 @@ public class JobLogServiceImpl implements JobLogService {
new LambdaQueryWrapper<JobLogMessage>()
.select(JobLogMessage::getId, JobLogMessage::getLogNum)
.ge(JobLogMessage::getId, queryVO.getStartId())
.ge(JobLogMessage::getTaskBatchId, queryVO.getTaskBatchId())
.ge(JobLogMessage::getJobId, queryVO.getJobId())
.eq(JobLogMessage::getTaskBatchId, queryVO.getTaskBatchId())
// .ge(JobLogMessage::getJobId, queryVO.getJobId())
.eq(JobLogMessage::getTaskId, queryVO.getTaskId())
.orderByAsc(JobLogMessage::getId).orderByAsc(JobLogMessage::getRealTime));
List<JobLogMessage> records = selectPage.getRecords();
@ -55,7 +57,9 @@ public class JobLogServiceImpl implements JobLogService {
JobLogResponseVO jobLogResponseVO = new JobLogResponseVO();
if (Objects.isNull(jobTaskBatch)
|| jobTaskBatch.getUpdateDt().plusSeconds(15).isBefore(LocalDateTime.now())
|| (COMPLETED.contains(jobTaskBatch.getTaskBatchStatus()) &&
jobTaskBatch.getUpdateDt().plusSeconds(15).isBefore(LocalDateTime.now()))
) {
jobLogResponseVO.setFinished(Boolean.TRUE);
}

60
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/socket/LogServer.java Normal file
View File

@ -0,0 +1,60 @@
package com.aizuda.snailjob.server.web.socket;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;
import com.aizuda.snailjob.server.common.enums.WebSocketSceneEnum;
import com.aizuda.snailjob.server.common.vo.WsRequestVO;
import com.aizuda.snailjob.server.web.config.WebSocketConfigurator;
import jakarta.websocket.*;
import jakarta.websocket.server.PathParam;
import jakarta.websocket.server.ServerEndpoint;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* @Author：srzou
* @Package：com.aizuda.snailjob.server.web.socket
* @Project：snail-job
* @Date：2025/3/4 16:31
* @Filename：LogServer
* @since 1.5.0
*/
@Slf4j
@Component
@ServerEndpoint(value = "/webSocket", configurator = WebSocketConfigurator.class)
public class LogServer {
// 缓存session
public static final ConcurrentHashMap<String, Session> USER_SESSION = new ConcurrentHashMap<>();
@OnOpen
public void onOpen(Session session) {
Map<String, Object> userProperties = session.getUserProperties();
USER_SESSION.put((String) userProperties.get(WebSocketConfigurator.SID), session);
}
@OnMessage
public void onMessage(String message, Session session) throws IOException, EncodeException {
// 接收请求
Map<String, Object> userProperties = session.getUserProperties();
String sid = (String) userProperties.get(WebSocketConfigurator.SID);
String scene = (String) userProperties.get(WebSocketConfigurator.SCENE);
WsRequestVO requestVO = new WsRequestVO();
requestVO.setSceneEnum(WebSocketSceneEnum.valueOf(scene));
requestVO.setMessage(message);
requestVO.setSid(sid);
SnailSpringContext.getContext().publishEvent(requestVO);
}
//错误时调用
@OnError
public void onError(Session session, Throwable throwable) {
log.error("发生错误{}", throwable);
}
}