manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 修改配置.

Browse Source
This commit is contained in:
lijiahangmax
2025-09-25 11:31:57 +08:00
parent 364120c143
commit 24ad1f64df
85 changed files with 449 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java
View File

@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.validator.group.Page;
import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
@@ -192,7 +192,7 @@ public class ExecCommandLogController {
@Operation(summary = "中断批量执行命令")
@PreAuthorize("@ss.hasPermission('exec:exec-command-log:interrupt')")
public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) {
Long logId = Valid.notNull(request.getLogId());
Long logId = Assert.notNull(request.getLogId());
execLogService.interruptExec(logId, SOURCE);
return true;
}
@@ -202,7 +202,7 @@ public class ExecCommandLogController {
@Operation(summary = "中断批量执行主机命令")
@PreAuthorize("@ss.hasPermission('exec:exec-command-log:interrupt')")
public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
Long hostLogId = Valid.notNull(request.getHostLogId());
Long hostLogId = Assert.notNull(request.getHostLogId());
execLogService.interruptHostExec(hostLogId, SOURCE);
return true;
}

6
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java
View File

@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.validator.group.Page;
import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
@@ -181,7 +181,7 @@ public class ExecJobLogController {
@Operation(summary = "中断计划任务命令")
@PreAuthorize("@ss.hasPermission('exec:exec-job-log:interrupt')")
public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) {
Long logId = Valid.notNull(request.getLogId());
Long logId = Assert.notNull(request.getLogId());
execLogService.interruptExec(logId, SOURCE);
return true;
}
@@ -191,7 +191,7 @@ public class ExecJobLogController {
@Operation(summary = "中断计划任务主机命令")
@PreAuthorize("@ss.hasPermission('exec:exec-job-log:interrupt')")
public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
Long hostLogId = Valid.notNull(request.getHostLogId());
Long hostLogId = Assert.notNull(request.getHostLogId());
execLogService.interruptHostExec(hostLogId, SOURCE);
return true;
}

6
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java
View File

@@ -47,8 +47,8 @@ import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.session.config.SshConnectConfig;
import org.dromara.visor.common.session.ssh.SessionStores;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.utils.PathUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.module.asset.api.HostConnectApi;
import org.dromara.visor.module.asset.enums.HostOsTypeEnum;
import org.dromara.visor.module.exec.dao.ExecHostLogDAO;
@@ -161,10 +161,10 @@ public abstract class BaseExecCommandHandler implements IExecCommandHandler {
try {
// 查询任务
this.execHostLog = execHostLogDAO.selectById(id);
Valid.notNull(this.execHostLog, ErrorMessage.TASK_ABSENT);
Assert.notNull(this.execHostLog, ErrorMessage.TASK_ABSENT);
// 检查任务状态
this.status = ExecHostStatusEnum.of(execHostLog.getStatus());
Valid.eq(this.status, ExecHostStatusEnum.WAITING, ErrorMessage.TASK_ABSENT, ErrorMessage.ILLEGAL_STATUS);
Assert.eq(this.status, ExecHostStatusEnum.WAITING, ErrorMessage.TASK_ABSENT, ErrorMessage.ILLEGAL_STATUS);
// 获取主机会话
this.connectConfig = hostConnectApi.getSshConnectConfig(execHostLog.getHostId(), execLog.getUserId());
// 设置日志路径

6
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/ExecTaskHandler.java
View File

@@ -29,7 +29,6 @@ import cn.orionsec.kit.lang.support.timeout.TimeoutEndpoint;
import cn.orionsec.kit.lang.utils.Booleans;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.Threads;
import cn.orionsec.kit.lang.utils.Valid;
import cn.orionsec.kit.lang.utils.collect.Lists;
import cn.orionsec.kit.lang.utils.io.Streams;
import cn.orionsec.kit.lang.utils.time.Dates;
@@ -39,6 +38,7 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.module.common.config.AppLogConfig;
import org.dromara.visor.module.exec.dao.ExecLogDAO;
import org.dromara.visor.module.exec.define.ExecThreadPools;
@@ -149,8 +149,8 @@ public class ExecTaskHandler implements IExecTaskHandler {
try {
// 查询任务
this.execLog = execLogDAO.selectById(id);
Valid.notNull(execLog, ErrorMessage.TASK_ABSENT);
Valid.eq(execLog.getStatus(), ExecStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
Assert.notNull(execLog, ErrorMessage.TASK_ABSENT);
Assert.eq(execLog.getStatus(), ExecStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
// 获取内置变量
this.builtParams = this.getBaseBuiltinParams();
return true;

8
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java
View File

@@ -39,7 +39,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.websocket.core.utils.WebSockets;
import org.dromara.visor.module.common.config.AppLogConfig;
import org.dromara.visor.module.exec.dao.ExecHostLogDAO;
@@ -128,12 +128,12 @@ public class ExecLogTracker implements IExecLogTracker {
private void initData() {
// 读取数据
this.execHostLog = execHostLogDAO.selectByIdAndLogId(execHostId, execId);
Valid.notNull(execHostLog, ErrorMessage.DATA_ABSENT);
Assert.notNull(execHostLog, ErrorMessage.DATA_ABSENT);
// 检查任务状态
Valid.neq(execHostLog.getStatus(), ExecHostStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
Assert.neq(execHostLog.getStatus(), ExecHostStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
// 获取文件路径
this.absolutePath = localFileClient.getAbsolutePath(execHostLog.getLogPath());
Valid.isTrue(Files1.isFile(absolutePath), ErrorMessage.FILE_ABSENT);
Assert.isTrue(Files1.isFile(absolutePath), ErrorMessage.FILE_ABSENT);
// 获取编码集
this.charset = Charsets.of(this.getCharset());
}

8
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java
View File

@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
import org.dromara.visor.module.asset.api.AssetAuthorizedDataApi;
@@ -97,7 +97,7 @@ public class ExecCommandServiceImpl implements ExecCommandService {
List<Long> authorizedHostIdList = assetAuthorizedDataApi.getUserAuthorizedEnabledHostId(userId, HostTypeEnum.SSH);
hostIdList.removeIf(s -> !authorizedHostIdList.contains(s));
log.info("ExecService.startExecCommand host hostList: {}", hostIdList);
Valid.notEmpty(hostIdList, ErrorMessage.CHECK_AUTHORIZED_HOST);
Assert.notEmpty(hostIdList, ErrorMessage.CHECK_AUTHORIZED_HOST);
// 创建命令
ExecCommandExecDTO execRequest = ExecConvert.MAPPER.to(request);
execRequest.setUserId(userId);
@@ -113,10 +113,10 @@ public class ExecCommandServiceImpl implements ExecCommandService {
log.info("ExecService.reExecCommand start logId: {}", logId);
// 获取执行记录
ExecLogDO execLog = execLogDAO.selectByIdSource(logId, ExecSourceEnum.BATCH.name());
Valid.notNull(execLog, ErrorMessage.DATA_ABSENT);
Assert.notNull(execLog, ErrorMessage.DATA_ABSENT);
// 获取执行主机
List<ExecHostLogDO> hostLogs = execHostLogDAO.selectByLogId(logId);
Valid.notEmpty(hostLogs, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(hostLogs, ErrorMessage.DATA_ABSENT);
List<Long> hostIdList = hostLogs.stream()
.map(ExecHostLogDO::getHostId)
.collect(Collectors.toList());

6
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java
View File

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.module.exec.convert.ExecHostLogConvert;
import org.dromara.visor.module.exec.dao.ExecHostLogDAO;
@@ -63,7 +63,7 @@ public class ExecHostLogServiceImpl implements ExecHostLogService {
@Override
public ExecHostLogVO getExecHostLog(Long id) {
ExecHostLogDO record = execHostLogDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
return ExecHostLogConvert.MAPPER.to(record);
}
@@ -100,7 +100,7 @@ public class ExecHostLogServiceImpl implements ExecHostLogService {
log.info("ExecHostLogService-deleteExecHostLogById id: {}", id);
// 检查数据是否存在
ExecHostLogDO record = execHostLogDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 中断
Optional.ofNullable(record.getLogId())
.map(execTaskManager::getTask)

22
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java
View File

@@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.job.core.utils.QuartzUtils;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
@@ -134,13 +134,13 @@ public class ExecJobServiceImpl implements ExecJobService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateExecJobById(ExecJobUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("ExecJobService-updateExecJobById id: {}, request: {}", id, JSON.toJSONString(request));
// 验证表达式是否正确
Cron.of(request.getExpression());
// 查询
ExecJobDO record = execJobDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
ExecJobDO updateRecord = ExecJobConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -167,7 +167,7 @@ public class ExecJobServiceImpl implements ExecJobService {
log.info("ExecJobService-updateExecJobStatus id: {}, status: {}", id, status);
// 查询任务
ExecJobDO record = execJobDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 更新状态
ExecJobDO update = new ExecJobDO();
update.setId(id);
@@ -189,10 +189,10 @@ public class ExecJobServiceImpl implements ExecJobService {
log.info("ExecJobService-updateExecJobExecUser id: {}, userId: {}", id, userId);
// 查询任务
ExecJobDO job = execJobDAO.selectById(id);
Valid.notNull(job, ErrorMessage.DATA_ABSENT);
Assert.notNull(job, ErrorMessage.DATA_ABSENT);
// 查询用户
String username = systemUserApi.getUsernameById(userId);
Valid.notNull(username, ErrorMessage.USER_ABSENT);
Assert.notNull(username, ErrorMessage.USER_ABSENT);
// 修改任务
ExecJobDO update = new ExecJobDO();
update.setId(id);
@@ -210,7 +210,7 @@ public class ExecJobServiceImpl implements ExecJobService {
public ExecJobVO getExecJobById(Long id) {
// 查询任务
ExecJobDO record = execJobDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
ExecJobVO vo = ExecJobConvert.MAPPER.to(record);
// 查询任务主机
@@ -309,7 +309,7 @@ public class ExecJobServiceImpl implements ExecJobService {
log.info("ExecJobService-deleteExecJobByIdList idList: {}", idList);
// 检查数据是否存在
List<ExecJobDO> jobList = execJobDAO.selectBatchIds(idList);
Valid.notEmpty(jobList, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(jobList, ErrorMessage.DATA_ABSENT);
// 删除任务
int effect = execJobDAO.deleteBatchIds(idList);
// 删除任务主机
@@ -332,7 +332,7 @@ public class ExecJobServiceImpl implements ExecJobService {
log.info("ExecJobService.manualTriggerExecJob start id: {}", id);
// 查询任务
ExecJobDO job = execJobDAO.selectById(id);
Valid.notNull(job, ErrorMessage.DATA_ABSENT);
Assert.notNull(job, ErrorMessage.DATA_ABSENT);
// 触发请求
ExecJobTriggerRequest request = new ExecJobTriggerRequest();
request.setId(id);
@@ -408,7 +408,7 @@ public class ExecJobServiceImpl implements ExecJobService {
.eq(ExecJobDO::getName, domain.getName());
// 检查是否存在
boolean present = execJobDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
/**
@@ -439,7 +439,7 @@ public class ExecJobServiceImpl implements ExecJobService {
// 查询有权限的主机
List<Long> authorizedHostIdList = assetAuthorizedDataApi.getUserAuthorizedEnabledHostId(SecurityUtils.getLoginUserId(), HostTypeEnum.SSH);
for (Long hostId : hostIdList) {
Valid.isTrue(authorizedHostIdList.contains(hostId), Strings.format(ErrorMessage.PLEASE_CHECK_HOST_SSH, hostId));
Assert.isTrue(authorizedHostIdList.contains(hostId), Strings.format(ErrorMessage.PLEASE_CHECK_HOST_SSH, hostId));
}
}

18
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java
View File

@@ -40,8 +40,8 @@ import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.FileConst;
import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.utils.SqlUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.redis.core.utils.RedisStrings;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
@@ -122,7 +122,7 @@ public class ExecLogServiceImpl implements ExecLogService {
public ExecLogVO getExecLog(Long id, String source) {
// 查询执行日志
ExecLogDO row = execLogDAO.selectByIdSource(id, source);
Valid.notNull(row, ErrorMessage.LOG_ABSENT);
Assert.notNull(row, ErrorMessage.LOG_ABSENT);
// 查询执行主机
List<ExecHostLogDO> hosts = execHostLogDAO.selectByLogId(id);
// 返回
@@ -210,7 +210,7 @@ public class ExecLogServiceImpl implements ExecLogService {
.then()
.count()
.intValue();
Valid.isTrue(idList.size() == count, ErrorMessage.DATA_MODIFIED);
Assert.isTrue(idList.size() == count, ErrorMessage.DATA_MODIFIED);
// 删除
return this.deleteExecLogByIdList(idList);
}
@@ -269,7 +269,7 @@ public class ExecLogServiceImpl implements ExecLogService {
log.info("ExecLogService.interruptExec start logId: {}, source: {}", logId, source);
// 获取执行记录
ExecLogDO execLog = execLogDAO.selectByIdSource(logId, source);
Valid.notNull(execLog, ErrorMessage.DATA_ABSENT);
Assert.notNull(execLog, ErrorMessage.DATA_ABSENT);
// 检查状态
if (!ExecStatusEnum.of(execLog.getStatus()).isCloseable()) {
return;
@@ -306,10 +306,10 @@ public class ExecLogServiceImpl implements ExecLogService {
log.info("ExecLogService.interruptHostExec start hostLogId: {}, source: {}", hostLogId, source);
// 获取执行记录
ExecHostLogDO hostLog = execHostLogDAO.selectById(hostLogId);
Valid.notNull(hostLog, ErrorMessage.DATA_ABSENT);
Assert.notNull(hostLog, ErrorMessage.DATA_ABSENT);
Long logId = hostLog.getLogId();
ExecLogDO execLog = execLogDAO.selectByIdSource(logId, source);
Valid.notNull(execLog, ErrorMessage.DATA_ABSENT);
Assert.notNull(execLog, ErrorMessage.DATA_ABSENT);
// 添加日志参数
OperatorLogs.add(OperatorLogs.LOG_ID, logId);
OperatorLogs.add(OperatorLogs.HOST_NAME, hostLog.getHostName());
@@ -394,11 +394,11 @@ public class ExecLogServiceImpl implements ExecLogService {
try {
// 获取主机执行日志
ExecHostLogDO hostLog = execHostLogDAO.selectById(id);
Valid.notNull(hostLog, ErrorMessage.LOG_ABSENT);
Assert.notNull(hostLog, ErrorMessage.LOG_ABSENT);
String logPath = hostLog.getLogPath();
Valid.notNull(logPath, ErrorMessage.LOG_ABSENT);
Assert.notNull(logPath, ErrorMessage.LOG_ABSENT);
ExecLogDO execLog = execLogDAO.selectByIdSource(hostLog.getLogId(), source);
Valid.notNull(execLog, ErrorMessage.LOG_ABSENT);
Assert.notNull(execLog, ErrorMessage.LOG_ABSENT);
// 设置日志参数
OperatorLogs.add(OperatorLogs.LOG_ID, hostLog.getLogId());
OperatorLogs.add(OperatorLogs.HOST_ID, hostLog.getHostId());

14
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java
View File

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
import org.dromara.visor.module.asset.api.AssetAuthorizedDataApi;
@@ -89,11 +89,11 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
@Override
public Integer updateExecTemplateById(ExecTemplateUpdateRequest request) {
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
log.info("ExecTemplateService-updateExecTemplateById id: {}, request: {}", id, JSON.toJSONString(request));
// 查询
ExecTemplateDO record = execTemplateDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
ExecTemplateDO updateRecord = ExecTemplateConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -110,7 +110,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
public ExecTemplateVO getExecTemplateById(Long id) {
// 查询模板
ExecTemplateDO record = execTemplateDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
ExecTemplateVO template = ExecTemplateConvert.MAPPER.to(record);
// 查询模板主机
@@ -123,7 +123,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
public ExecTemplateVO getExecTemplateWithAuthorized(Long id) {
// 查询模板
ExecTemplateDO record = execTemplateDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
ExecTemplateVO template = ExecTemplateConvert.MAPPER.to(record);
// 查询模板主机
@@ -172,7 +172,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
log.info("ExecTemplateService-deleteExecTemplateByIdList idList: {}", idList);
// 检查数据是否存在
List<ExecTemplateDO> recordList = execTemplateDAO.selectBatchIds(idList);
Valid.notEmpty(recordList, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(recordList, ErrorMessage.DATA_ABSENT);
// 设置日志参数
String name = recordList.stream()
.map(ExecTemplateDO::getName)
@@ -208,7 +208,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService {
.eq(ExecTemplateDO::getName, domain.getName());
// 检查是否存在
boolean present = execTemplateDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
}

16
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java
View File

@@ -170,7 +170,7 @@ public class UploadTaskServiceImpl implements UploadTaskService {
public UploadTaskVO getUploadTask(Long id) {
// 查询任务
UploadTaskDO record = uploadTaskDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 查询任务文件
List<UploadTaskFileVO> files = uploadTaskFileService.getFileByTaskId(id);
// 返回
@@ -291,9 +291,9 @@ public class UploadTaskServiceImpl implements UploadTaskService {
public void startUploadTask(Long id) {
// 查询任务
UploadTaskDO record = uploadTaskDAO.selectById(id);
Valid.notNull(record, ErrorMessage.TASK_ABSENT);
Assert.notNull(record, ErrorMessage.TASK_ABSENT);
// 检查任务状态
Valid.eq(record.getStatus(), UploadTaskStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
Assert.eq(record.getStatus(), UploadTaskStatusEnum.WAITING.name(), ErrorMessage.ILLEGAL_STATUS);
// 检查文件完整性
this.checkFileCompleteness(id);
// 执行任务
@@ -304,9 +304,9 @@ public class UploadTaskServiceImpl implements UploadTaskService {
public void cancelUploadTask(UploadTaskRequest request) {
// 查询任务
UploadTaskDO record = uploadTaskDAO.selectById(request.getId());
Valid.notNull(record, ErrorMessage.TASK_ABSENT);
Assert.notNull(record, ErrorMessage.TASK_ABSENT);
// 检查状态
Valid.isTrue(UploadTaskStatusEnum.of(record.getStatus()).isCancelable(), ErrorMessage.ILLEGAL_STATUS);
Assert.isTrue(UploadTaskStatusEnum.of(record.getStatus()).isCancelable(), ErrorMessage.ILLEGAL_STATUS);
// 取消任务
if (Booleans.isTrue(request.getFailed())) {
this.checkCancelTask(Lists.singleton(record), UploadTaskStatusEnum.FAILED);
@@ -356,7 +356,7 @@ public class UploadTaskServiceImpl implements UploadTaskService {
// 查询有权限的主机
List<Long> authorizedHostIdList = assetAuthorizedDataApi.getUserAuthorizedEnabledHostId(SecurityUtils.getLoginUserId(), HostTypeEnum.SSH);
for (Long hostId : hostIdList) {
Valid.isTrue(authorizedHostIdList.contains(hostId), Strings.format(ErrorMessage.PLEASE_CHECK_HOST_SSH, hostId));
Assert.isTrue(authorizedHostIdList.contains(hostId), Strings.format(ErrorMessage.PLEASE_CHECK_HOST_SSH, hostId));
}
}
@@ -370,10 +370,10 @@ public class UploadTaskServiceImpl implements UploadTaskService {
// 查询主机信息
List<HostDTO> hosts = hostApi.selectByIdList(hostIdList);
// 检查主机数量
Valid.eq(hosts.size(), hostIdList.size(), ErrorMessage.HOST_ABSENT);
Assert.eq(hosts.size(), hostIdList.size(), ErrorMessage.HOST_ABSENT);
// 检查主机状态
for (HostDTO host : hosts) {
Valid.eq(HostStatusEnum.ENABLED.name(), host.getStatus(), ErrorMessage.HOST_NOT_ENABLED, host.getName());
Assert.eq(HostStatusEnum.ENABLED.name(), host.getStatus(), ErrorMessage.HOST_NOT_ENABLED, host.getName());
}
return hosts;
}