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-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java
View File

@@ -27,7 +27,7 @@ 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.constant.ErrorMessage;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.log.core.annotation.IgnoreLog;
import org.dromara.visor.framework.log.core.enums.IgnoreLogMode;
import org.dromara.visor.framework.web.core.annotation.RestWrapper;
@@ -70,8 +70,8 @@ public class HostExtraController {
@PutMapping("/update")
@Operation(summary = "修改主机拓展信息")
public Integer updateHostExtra(@Validated @RequestBody HostExtraUpdateRequest request) {
HostExtraItemEnum item = Valid.valid(HostExtraItemEnum::of, request.getItem());
Valid.isTrue(item.isUserExtra(), ErrorMessage.PARAM_ERROR);
HostExtraItemEnum item = Assert.valid(HostExtraItemEnum::of, request.getItem());
Assert.isTrue(item.isUserExtra(), ErrorMessage.PARAM_ERROR);
return hostExtraService.updateHostExtra(request);
}

6
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/agent/intstall/AbstractAgentInstaller.java
View File

@@ -23,7 +23,6 @@
package org.dromara.visor.module.asset.handler.agent.intstall;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.Valid;
import cn.orionsec.kit.lang.utils.io.FileReaders;
import cn.orionsec.kit.lang.utils.io.Streams;
import cn.orionsec.kit.net.host.SessionStore;
@@ -36,6 +35,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.FileConst;
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.module.asset.entity.domain.HostAgentLogDO;
import org.dromara.visor.module.asset.enums.AgentLogStatusEnum;
@@ -94,8 +94,8 @@ public abstract class AbstractAgentInstaller implements AgentInstaller {
log.info("AgentInstaller install start {}", logId);
// 查询记录
this.record = hostAgentLogService.selectById(logId);
Valid.notNull(record, "AgentInstaller record is null {}", logId);
Valid.eq(record.getStatus(), AgentLogStatusEnum.WAIT.name(), "AgentInstaller record status is not WAIT {}", logId);
Assert.notNull(record, "AgentInstaller record is null {}", logId);
Assert.eq(record.getStatus(), AgentLogStatusEnum.WAIT.name(), "AgentInstaller record status is not WAIT {}", logId);
try {
// 更新状态
this.updateStatus(AgentLogStatusEnum.RUNNING, null);

8
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/AbstractHostConfigStrategy.java
View File

@@ -29,8 +29,8 @@ import org.dromara.visor.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
import org.dromara.visor.common.security.UpdatePasswordAction;
import org.dromara.visor.common.utils.AesEncryptUtils;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.utils.RsaParamDecryptUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.module.asset.enums.HostAuthTypeEnum;
/**
@@ -61,10 +61,10 @@ public abstract class AbstractHostConfigStrategy<T extends GenericsDataModel> ex
return;
}
// 检查新密码
String newPassword = Valid.notBlank(after.getPassword(), ErrorMessage.PASSWORD_MISSING);
String newPassword = Assert.notBlank(after.getPassword(), ErrorMessage.PASSWORD_MISSING);
// 解密密码
newPassword = RsaParamDecryptUtils.decrypt(newPassword);
Valid.notBlank(newPassword, ErrorMessage.DECRYPT_ERROR);
Assert.notBlank(newPassword, ErrorMessage.DECRYPT_ERROR);
// 设置密码
after.setPassword(AesEncryptUtils.encryptAsString(newPassword));
}
@@ -75,7 +75,7 @@ public abstract class AbstractHostConfigStrategy<T extends GenericsDataModel> ex
* @param charset charset
*/
protected void validCharset(String charset) {
Valid.isTrue(Charsets.isSupported(charset), ErrorMessage.UNSUPPORTED_CHARSET, charset);
Assert.isTrue(Charsets.isSupported(charset), ErrorMessage.UNSUPPORTED_CHARSET, charset);
}
}

8
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostRdpConfigStrategy.java
View File

@@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.config;
import cn.orionsec.kit.lang.utils.Strings;
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.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO;
@@ -71,15 +71,15 @@ public class HostRdpConfigStrategy extends AbstractHostConfigStrategy<HostRdpCon
// 检查主机身份是否存在
Long identityId = model.getIdentityId();
if (identityId != null) {
HostIdentityDO identity = Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Valid.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
HostIdentityDO identity = Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Assert.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
}
}
@Override
protected void valid(HostRdpConfigDTO model) {
// 验证填充后的参数
Valid.valid(model);
Assert.valid(model);
}
@Override

8
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostSshConfigStrategy.java
View File

@@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.handler.host.config;
import cn.orionsec.kit.lang.utils.Strings;
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.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.dao.HostKeyDAO;
import org.dromara.visor.module.asset.entity.dto.host.HostSshConfigDTO;
@@ -77,19 +77,19 @@ public class HostSshConfigStrategy extends AbstractHostConfigStrategy<HostSshCon
// 检查主机密钥是否存在
Long keyId = model.getKeyId();
if (keyId != null) {
Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
Assert.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
}
// 检查主机身份是否存在
Long identityId = model.getIdentityId();
if (identityId != null) {
Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
}
}
@Override
protected void valid(HostSshConfigDTO model) {
// 验证填充后的参数
Valid.valid(model);
Assert.valid(model);
}
@Override

8
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/HostVncConfigStrategy.java
View File

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Booleans;
import cn.orionsec.kit.lang.utils.Strings;
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.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.entity.domain.HostIdentityDO;
import org.dromara.visor.module.asset.entity.dto.host.HostVncConfigDTO;
@@ -77,15 +77,15 @@ public class HostVncConfigStrategy extends AbstractHostConfigStrategy<HostVncCon
// 检查主机身份是否存在
Long identityId = model.getIdentityId();
if (identityId != null) {
HostIdentityDO identity = Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Valid.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
HostIdentityDO identity = Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Assert.eq(HostIdentityTypeEnum.PASSWORD.name(), identity.getType(), ErrorMessage.CHECK_IDENTITY_PASSWORD);
}
}
@Override
protected void valid(HostVncConfigDTO model) {
// 验证填充后的参数
Valid.valid(model);
Assert.valid(model);
}
@Override

10
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostRdpExtraStrategy.java
View File

@@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.extra.strategy;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
import org.dromara.visor.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.enums.HostExtraAuthTypeEnum;
@@ -65,17 +65,17 @@ public class HostRdpExtraStrategy extends AbstractGenericsDataStrategy<HostRdpEx
@Override
public void preValid(HostRdpExtraModel model) {
HostExtraAuthTypeEnum authType = Valid.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
HostExtraAuthTypeEnum authType = Assert.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
model.setAuthType(authType.name());
Long identityId = model.getIdentityId();
Long userId = SecurityUtils.getLoginUserId();
// 必填验证
if (HostExtraAuthTypeEnum.CUSTOM_IDENTITY.equals(authType)) {
Valid.notNull(identityId);
Assert.notNull(identityId);
// 验证主机身份是否存在
Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
// 验证主机身份是否有权限
Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_IDENTITY.getPermissionName());
}

16
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java
View File

@@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.handler.host.extra.strategy;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
import org.dromara.visor.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -68,34 +68,34 @@ public class HostSshExtraStrategy extends AbstractGenericsDataStrategy<HostSshEx
@Override
public void preValid(HostSshExtraModel model) {
HostExtraAuthTypeEnum authType = Valid.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
HostExtraAuthTypeEnum authType = Assert.valid(HostExtraAuthTypeEnum::of, model.getAuthType());
model.setAuthType(authType.name());
Long keyId = model.getKeyId();
Long identityId = model.getIdentityId();
// 必填验证
if (HostExtraAuthTypeEnum.CUSTOM_KEY.equals(authType)) {
Valid.notNull(keyId);
Assert.notNull(keyId);
} else if (HostExtraAuthTypeEnum.CUSTOM_IDENTITY.equals(authType)) {
Valid.notNull(identityId);
Assert.notNull(identityId);
}
// 验证主机密钥是否存在
if (keyId != null) {
Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
Assert.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
}
// 验证主机身份是否存在
if (identityId != null) {
Valid.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(hostIdentityDAO.selectById(identityId), ErrorMessage.IDENTITY_ABSENT);
}
Long userId = SecurityUtils.getLoginUserId();
// 验证主机密钥是否有权限
if (keyId != null) {
Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_KEY.getPermissionName());
}
// 验证主机身份是否有权限
if (identityId != null) {
Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_IDENTITY.getPermissionName());
}

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java
View File

@@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Maps;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.common.utils.TreeUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.module.asset.convert.HostGroupConvert;
import org.dromara.visor.module.asset.dao.HostDAO;
import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest;
@@ -98,7 +98,7 @@ public class AssetAuthorizedDataServiceImpl implements AssetAuthorizedDataServic
public List<Long> getAuthorizedDataRelId(DataPermissionTypeEnum type, AssetAuthorizedDataQueryRequest request) {
Long userId = request.getUserId();
Long roleId = request.getRoleId();
Valid.isTrue(userId != null || roleId != null);
Assert.isTrue(userId != null || roleId != null);
if (userId != null) {
// 查询用户数据
return dataPermissionApi.getRelIdListByUserId(type, userId);

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

@@ -27,7 +27,7 @@ import cn.orionsec.kit.spring.SpringHolder;
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.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -150,18 +150,18 @@ public class AssetDataGrantServiceImpl implements AssetDataGrantService {
private void checkGrantIdentity(AssetDataGrantRequest request) {
Long userId = request.getUserId();
Long roleId = request.getRoleId();
Valid.isTrue(userId != null || roleId != null);
Assert.isTrue(userId != null || roleId != null);
if (userId != null) {
// 检测用户是否存在
SystemUserDTO user = systemUserApi.getUserById(userId);
Valid.notNull(user, ErrorMessage.USER_ABSENT);
Assert.notNull(user, ErrorMessage.USER_ABSENT);
OperatorLogs.add(OperatorLogs.GRANT_TYPE, Const.CN_USER);
OperatorLogs.add(OperatorLogs.GRANT_NAME, user.getNickname() + "(" + user.getUsername() + ")");
}
if (roleId != null) {
// 检测角色是否存在
SystemRoleDTO role = systemRoleApi.getRoleById(roleId);
Valid.notNull(role, ErrorMessage.ROLE_ABSENT);
Assert.notNull(role, ErrorMessage.ROLE_ABSENT);
OperatorLogs.add(OperatorLogs.GRANT_TYPE, Const.CN_ROLE);
OperatorLogs.add(OperatorLogs.GRANT_NAME, role.getName() + "(" + role.getCode() + ")");
}

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

@@ -23,12 +23,12 @@
package org.dromara.visor.module.asset.service.impl;
import cn.orionsec.kit.lang.utils.Booleans;
import cn.orionsec.kit.lang.utils.Valid;
import cn.orionsec.kit.lang.utils.collect.Lists;
import cn.orionsec.kit.spring.SpringHolder;
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.Assert;
import org.dromara.visor.module.asset.dao.HostAgentLogDAO;
import org.dromara.visor.module.asset.dao.HostDAO;
import org.dromara.visor.module.asset.entity.domain.HostAgentLogDO;
@@ -106,7 +106,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
try {
// 查询主机信息
Long hostId = hostDAO.selectIdByAgentKey(agentKey);
Valid.notNull(hostId, ErrorMessage.HOST_ABSENT);
Assert.notNull(hostId, ErrorMessage.HOST_ABSENT);
// 查询主机规格信息
HostSpecExtraModel spec = hostExtraService.getHostExtra(Const.SYSTEM_USER_ID, hostId, HostExtraItemEnum.SPEC);
Boolean synced = Optional.ofNullable(spec)
@@ -149,7 +149,7 @@ public class HostAgentEndpointServiceImpl implements HostAgentEndpointService {
log.info("HostAgentEndpointService setAgentOffline agentKey: {}", agentKey);
// 查询主机信息
Long hostId = hostDAO.selectIdByAgentKey(agentKey);
Valid.notNull(hostId, ErrorMessage.HOST_ABSENT);
Assert.notNull(hostId, ErrorMessage.HOST_ABSENT);
// 修改缓存
ONLINE_STATUS_CACHE.put(agentKey, AgentOnlineStatusEnum.OFFLINE.getValue());
HEARTBEAT_RECV_CACHE.put(agentKey, 0L);

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

@@ -37,8 +37,8 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.constant.FileConst;
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.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.redis.core.utils.RedisStrings;
import org.dromara.visor.module.asset.convert.HostConvert;
@@ -133,7 +133,7 @@ public class HostAgentServiceImpl implements HostAgentService {
// 查询主机信息
List<Long> idList = request.getIdList();
List<HostDO> hosts = hostDAO.selectBatchIds(idList);
Valid.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT);
Assert.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT);
// 检查并创建安装任务参数
List<AgentInstallParams> installTaskParams = this.createInstallTaskParams(hosts);
@@ -146,7 +146,7 @@ public class HostAgentServiceImpl implements HostAgentService {
.in(HostAgentLogDO::getStatus, AgentLogStatusEnum.WAIT.name(), AgentLogStatusEnum.RUNNING.name())
.then()
.present();
Valid.isFalse(hasRunning, ErrorMessage.ILLEGAL_STATUS);
Assert.isFalse(hasRunning, ErrorMessage.ILLEGAL_STATUS);
// 创建日志记录
List<HostAgentLogDO> agentLogs = hosts.stream()
@@ -186,8 +186,8 @@ public class HostAgentServiceImpl implements HostAgentService {
.map(MultipartFile::getOriginalFilename)
.map(String::toLowerCase)
.orElse(Const.EMPTY);
Valid.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE);
Valid.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE);
Assert.notBlank(fileName, ErrorMessage.FILE_EXTENSION_TYPE);
Assert.isTrue(fileName.endsWith(Const.SUFFIX_TAR_GZ), ErrorMessage.FILE_EXTENSION_TYPE);
// 保存文件
String releaseDir = PathUtils.getOrionPath(FileConst.INSTANCE_AGENT_RELEASE);
String releaseTempDir = PathUtils.getOrionPath(FileConst.INSTANCE_AGENT_RELEASE_TEMP);
@@ -227,7 +227,7 @@ public class HostAgentServiceImpl implements HostAgentService {
log.info("HostAgentService.installAgent decompressFiles: {}", Lists.map(decompressFiles, File::getName));
// 检查版本文件
String versionFile = releaseTempDir + Const.SLASH + FileConst.VERSION;
Valid.isTrue(Files1.isFile(versionFile), ErrorMessage.DECOMPRESS_FILE_ABSENT + Const.SPACE + FileConst.VERSION);
Assert.isTrue(Files1.isFile(versionFile), ErrorMessage.DECOMPRESS_FILE_ABSENT + Const.SPACE + FileConst.VERSION);
// 移动文件
for (File decompressFile : decompressFiles) {
String releaseFile = releaseDir + Const.SLASH + decompressFile.getName();
@@ -261,10 +261,10 @@ public class HostAgentServiceImpl implements HostAgentService {
// 任务参数
for (HostDO 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());
// 是否支持 ssh
boolean supportSsh = HostTypeEnum.SSH.contains(host.getTypes());
Valid.isTrue(supportSsh, ErrorMessage.PLEASE_CHECK_HOST_SSH, host.getName());
Assert.isTrue(supportSsh, ErrorMessage.PLEASE_CHECK_HOST_SSH, host.getName());
// 文件名称
HostOsTypeEnum os = HostOsTypeEnum.of(host.getOsType());
String agentFileName = Strings.format(FileConst.INSTANCE_AGENT_FILE_FORMAT,
@@ -289,7 +289,7 @@ public class HostAgentServiceImpl implements HostAgentService {
// 检查文件是否存在
for (String file : checkFileList) {
Valid.isTrue(Files1.isFile(file), ErrorMessage.FILE_ABSENT + Const.SPACE + file);
Assert.isTrue(Files1.isFile(file), ErrorMessage.FILE_ABSENT + Const.SPACE + file);
}
return taskParams;
}

10
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java
View File

@@ -30,7 +30,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.enums.EnableStatus;
import org.dromara.visor.common.handler.data.model.GenericsDataModel;
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.asset.dao.HostConfigDAO;
import org.dromara.visor.module.asset.dao.HostDAO;
@@ -104,7 +104,7 @@ public class HostConfigServiceImpl implements HostConfigService {
OperatorLogs.add(ExtraFieldConst.CONFIG, param);
// 查询主机
HostDO host = hostDAO.selectById(hostId);
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
OperatorLogs.add(OperatorLogs.NAME, host.getName());
// 获取处理策略
HostConfigStrategyEnum strategy = HostConfigStrategyEnum.of(type);
@@ -169,12 +169,12 @@ public class HostConfigServiceImpl implements HostConfigService {
public <T extends GenericsDataModel> T getHostConfig(Long hostId, String type) {
// 查询配置信息
HostConfigDO config = hostConfigDAO.selectByHostIdType(hostId, type);
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
Assert.notNull(config, ErrorMessage.CONFIG_ABSENT);
// 检查配置状态
Valid.isTrue(HostStatusEnum.ENABLED.name().equals(config.getStatus()), ErrorMessage.CONFIG_NOT_ENABLED);
Assert.isTrue(HostStatusEnum.ENABLED.name().equals(config.getStatus()), ErrorMessage.CONFIG_NOT_ENABLED);
// 解析配置
T model = HostTypeEnum.of(type).parse(config.getConfig());
Valid.notNull(model, ErrorMessage.CONFIG_ABSENT);
Assert.notNull(model, ErrorMessage.CONFIG_ABSENT);
return model;
}

34
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java
View File

@@ -33,7 +33,7 @@ import org.dromara.visor.common.session.config.RdpConnectConfig;
import org.dromara.visor.common.session.config.SshConnectConfig;
import org.dromara.visor.common.session.config.VncConnectConfig;
import org.dromara.visor.common.session.ssh.SessionStores;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.module.asset.dao.HostDAO;
import org.dromara.visor.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -129,7 +129,7 @@ public class HostConnectServiceImpl implements HostConnectService {
public SshConnectConfig getSshConnectConfig(Long hostId, Long userId) {
// 查询主机
HostDO host = hostDAO.selectById(hostId);
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
// 获取配置
return this.getSshConnectConfig(host, userId);
}
@@ -142,7 +142,7 @@ public class HostConnectServiceImpl implements HostConnectService {
this.validHostAuthorized(userId, hostId);
// 获取主机配置
HostSshConfigDTO config = hostConfigService.getHostConfig(hostId, HostTypeEnum.SSH.name());
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
Assert.notNull(config, ErrorMessage.CONFIG_ABSENT);
// 查询主机额外配置
HostSshExtraModel extra = hostExtraService.getHostExtra(userId, hostId, HostExtraItemEnum.SSH);
if (extra != null) {
@@ -168,7 +168,7 @@ public class HostConnectServiceImpl implements HostConnectService {
public RdpConnectConfig getRdpConnectConfig(Long hostId, Long userId) {
// 查询主机
HostDO host = hostDAO.selectById(hostId);
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
// 获取配置
return this.getRdpConnectConfig(host, userId);
}
@@ -181,7 +181,7 @@ public class HostConnectServiceImpl implements HostConnectService {
this.validHostAuthorized(userId, hostId);
// 获取主机配置
HostRdpConfigDTO config = hostConfigService.getHostConfig(hostId, HostTypeEnum.RDP.name());
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
Assert.notNull(config, ErrorMessage.CONFIG_ABSENT);
// 查询主机额外配置
HostRdpExtraModel extra = hostExtraService.getHostExtra(userId, hostId, HostExtraItemEnum.RDP);
if (extra != null) {
@@ -207,7 +207,7 @@ public class HostConnectServiceImpl implements HostConnectService {
public VncConnectConfig getVncConnectConfig(Long hostId, Long userId) {
// 查询主机
HostDO host = hostDAO.selectById(hostId);
Valid.notNull(host, ErrorMessage.HOST_ABSENT);
Assert.notNull(host, ErrorMessage.HOST_ABSENT);
// 获取配置
return this.getVncConnectConfig(host, userId);
}
@@ -220,7 +220,7 @@ public class HostConnectServiceImpl implements HostConnectService {
this.validHostAuthorized(userId, hostId);
// 获取主机配置
HostVncConfigDTO config = hostConfigService.getHostConfig(hostId, HostTypeEnum.VNC.name());
Valid.notNull(config, ErrorMessage.CONFIG_ABSENT);
Assert.notNull(config, ErrorMessage.CONFIG_ABSENT);
// 查询主机额外配置
HostVncExtraModel extra = hostExtraService.getHostExtra(userId, hostId, HostExtraItemEnum.VNC);
// 获取连接配置
@@ -269,9 +269,9 @@ public class HostConnectServiceImpl implements HostConnectService {
HostAuthTypeEnum authType = HostAuthTypeEnum.of(config.getAuthType());
if (HostAuthTypeEnum.IDENTITY.equals(authType)) {
// 身份认证
Valid.notNull(config.getIdentityId(), ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(config.getIdentityId(), ErrorMessage.IDENTITY_ABSENT);
HostIdentityDO identity = hostIdentityDAO.selectById(config.getIdentityId());
Valid.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
config.setUsername(identity.getUsername());
HostIdentityTypeEnum identityType = HostIdentityTypeEnum.of(identity.getType());
if (HostIdentityTypeEnum.PASSWORD.equals(identityType)) {
@@ -398,7 +398,7 @@ public class HostConnectServiceImpl implements HostConnectService {
private void validHostAuthorized(Long userId, Long hostId) {
// 验证主机是否有权限
List<Long> hostIdList = assetAuthorizedDataService.getUserAuthorizedHostId(userId);
Valid.isTrue(hostIdList.contains(hostId),
Assert.isTrue(hostIdList.contains(hostId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_GROUP.getPermissionName());
}
@@ -415,14 +415,14 @@ public class HostConnectServiceImpl implements HostConnectService {
HostExtraAuthTypeEnum extraAuthType = HostExtraAuthTypeEnum.of(authType);
if (HostExtraAuthTypeEnum.CUSTOM_KEY.equals(extraAuthType)) {
// 验证主机密钥是否有权限
Valid.notNull(keyId, ErrorMessage.KEY_ABSENT);
Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
Assert.notNull(keyId, ErrorMessage.KEY_ABSENT);
Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_KEY, userId, keyId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_KEY.getPermissionName());
} else if (HostExtraAuthTypeEnum.CUSTOM_IDENTITY.equals(extraAuthType)) {
// 验证主机身份是否有权限
Valid.notNull(identityId, ErrorMessage.IDENTITY_ABSENT);
Valid.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
Assert.notNull(identityId, ErrorMessage.IDENTITY_ABSENT);
Assert.isTrue(dataPermissionApi.hasPermission(DataPermissionTypeEnum.HOST_IDENTITY, userId, identityId),
ErrorMessage.ANY_NO_PERMISSION,
DataPermissionTypeEnum.HOST_IDENTITY.getPermissionName());
}
@@ -440,7 +440,7 @@ public class HostConnectServiceImpl implements HostConnectService {
}
// 查询身份信息
HostIdentityDO identity = hostIdentityDAO.selectById(identityId);
Valid.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
Assert.notNull(identity, ErrorMessage.IDENTITY_ABSENT);
// 设置身份信息
connectConfig.setUsername(identity.getUsername());
connectConfig.setPassword(identity.getPassword());
@@ -453,10 +453,10 @@ public class HostConnectServiceImpl implements HostConnectService {
* @param connectConfig connectConfig
*/
private void setSshKey(Long keyId, SshConnectConfig connectConfig) {
Valid.notNull(keyId, ErrorMessage.KEY_ABSENT);
Assert.notNull(keyId, ErrorMessage.KEY_ABSENT);
// 查询密钥信息
HostKeyDO key = hostKeyDAO.selectById(keyId);
Valid.notNull(key, ErrorMessage.KEY_ABSENT);
Assert.notNull(key, ErrorMessage.KEY_ABSENT);
connectConfig.setKeyId(keyId);
connectConfig.setPublicKey(key.getPublicKey());
connectConfig.setPrivateKey(key.getPrivateKey());

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

@@ -29,7 +29,7 @@ import com.alibaba.fastjson.JSONObject;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.security.core.utils.SecurityUtils;
import org.dromara.visor.module.asset.dao.HostDAO;
import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest;
@@ -66,7 +66,7 @@ public class HostExtraServiceImpl implements HostExtraService {
@Override
public Map<String, Object> getHostExtraView(Long hostId, String item) {
HostExtraItemEnum extraItem = Valid.valid(HostExtraItemEnum::of, item);
HostExtraItemEnum extraItem = Assert.valid(HostExtraItemEnum::of, item);
Long userId = this.getExtraUserId(extraItem);
// 查询配置项
DataExtraQueryDTO query = DataExtraQueryDTO.builder()
@@ -108,7 +108,7 @@ public class HostExtraServiceImpl implements HostExtraService {
@Override
public Integer updateHostExtra(HostExtraUpdateRequest request) {
HostExtraItemEnum item = Valid.valid(HostExtraItemEnum::of, request.getItem());
HostExtraItemEnum item = Assert.valid(HostExtraItemEnum::of, request.getItem());
Long hostId = request.getHostId();
Long userId = this.getExtraUserId(item);
// 查询原始配置
@@ -159,7 +159,7 @@ public class HostExtraServiceImpl implements HostExtraService {
try {
// 查询主机id
Long id = hostDAO.selectIdByAgentKey(key);
Valid.notNull(id, ErrorMessage.HOST_ABSENT);
Assert.notNull(id, ErrorMessage.HOST_ABSENT);
// 设置已同步标识
spec.put(Const.SYNCED, true);
// 查询配置信息

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

@@ -34,7 +34,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.security.PasswordModifier;
import org.dromara.visor.common.utils.AesEncryptUtils;
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.redis.core.utils.RedisMaps;
import org.dromara.visor.framework.redis.core.utils.RedisUtils;
@@ -118,15 +118,15 @@ public class HostIdentityServiceImpl implements HostIdentityService {
public Integer updateHostIdentityById(HostIdentityUpdateRequest request) {
log.info("HostIdentityService-updateHostIdentityById request: {}", JSON.toJSONString(request));
// 验证参数
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
HostIdentityTypeEnum type = Valid.valid(HostIdentityTypeEnum::of, request.getType());
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
HostIdentityTypeEnum type = Assert.valid(HostIdentityTypeEnum::of, request.getType());
if (HostIdentityTypeEnum.KEY.equals(type)) {
// 密钥认证
this.checkKeyId(request.getKeyId());
}
// 查询主机身份
HostIdentityDO record = hostIdentityDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
HostIdentityDO updateRecord = HostIdentityConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -151,7 +151,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
public HostIdentityVO getHostIdentityById(Long id) {
// 查询
HostIdentityDO record = hostIdentityDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
return HostIdentityConvert.MAPPER.to(record);
}
@@ -224,7 +224,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
log.info("HostIdentityService-deleteHostIdentityByIdList idList: {}", idList);
// 检查数据是否存在
List<HostIdentityDO> list = hostIdentityDAO.selectBatchIds(idList);
Valid.notEmpty(list, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(list, ErrorMessage.DATA_ABSENT);
// 添加日志参数
String name = list.stream()
.map(HostIdentityDO::getName)
@@ -258,7 +258,7 @@ public class HostIdentityServiceImpl implements HostIdentityService {
.eq(HostIdentityDO::getName, domain.getName());
// 检查是否存在
boolean present = hostIdentityDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
/**
@@ -267,10 +267,10 @@ public class HostIdentityServiceImpl implements HostIdentityService {
* @param request request
*/
private void checkCreateParams(HostIdentityCreateRequest request) {
HostIdentityTypeEnum type = Valid.valid(HostIdentityTypeEnum::of, request.getType());
HostIdentityTypeEnum type = Assert.valid(HostIdentityTypeEnum::of, request.getType());
if (HostIdentityTypeEnum.PASSWORD.equals(type)) {
// 密码认证
Valid.notBlank(request.getPassword(), ErrorMessage.PARAM_MISSING);
Assert.notBlank(request.getPassword(), ErrorMessage.PARAM_MISSING);
} else if (HostIdentityTypeEnum.KEY.equals(type)) {
// 密钥认证
this.checkKeyId(request.getKeyId());
@@ -283,8 +283,8 @@ public class HostIdentityServiceImpl implements HostIdentityService {
* @param keyId keyId
*/
private void checkKeyId(Long keyId) {
Valid.notNull(keyId, ErrorMessage.PARAM_MISSING);
Valid.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
Assert.notNull(keyId, ErrorMessage.PARAM_MISSING);
Assert.notNull(hostKeyDAO.selectById(keyId), ErrorMessage.KEY_ABSENT);
}
/**

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

@@ -32,7 +32,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.security.PasswordModifier;
import org.dromara.visor.common.utils.AesEncryptUtils;
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.redis.core.utils.RedisMaps;
import org.dromara.visor.framework.redis.core.utils.RedisUtils;
@@ -112,9 +112,9 @@ public class HostKeyServiceImpl implements HostKeyService {
public Integer updateHostKeyById(HostKeyUpdateRequest request) {
log.info("HostKeyService-updateHostKeyById request: {}", JSON.toJSONString(request));
// 查询
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
HostKeyDO record = hostKeyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 转换
HostKeyDO updateRecord = HostKeyConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -138,7 +138,7 @@ public class HostKeyServiceImpl implements HostKeyService {
public HostKeyVO getHostKeyById(Long id) {
// 查询
HostKeyDO record = hostKeyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 解密密钥
this.decryptKey(record);
// 转换
@@ -148,7 +148,7 @@ public class HostKeyServiceImpl implements HostKeyService {
@Override
public HostKeyDO getHostKey(Long id) {
HostKeyDO record = hostKeyDAO.selectById(id);
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
Assert.notNull(record, ErrorMessage.DATA_ABSENT);
// 解密密钥
this.decryptKey(record);
// 解密密码
@@ -206,7 +206,7 @@ public class HostKeyServiceImpl implements HostKeyService {
log.info("HostKeyService-deleteHostKeyById idList: {}", idList);
// 检查数据是否存在
List<HostKeyDO> list = hostKeyDAO.selectBatchIds(idList);
Valid.notEmpty(list, ErrorMessage.DATA_ABSENT);
Assert.notEmpty(list, ErrorMessage.DATA_ABSENT);
// 添加日志参数
String name = list.stream()
.map(HostKeyDO::getName)
@@ -242,7 +242,7 @@ public class HostKeyServiceImpl implements HostKeyService {
.eq(HostKeyDO::getName, domain.getName());
// 检查是否存在
boolean present = hostKeyDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
Assert.isFalse(present, ErrorMessage.DATA_PRESENT);
}
/**

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

@@ -35,7 +35,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.enums.EnableStatus;
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.mybatis.core.query.DataQuery;
import org.dromara.visor.framework.redis.core.utils.RedisMaps;
@@ -160,7 +160,7 @@ public class HostServiceImpl implements HostService {
log.info("HostService-copyHost originId: {}, request: {}", originId, JSON.toJSONString(request));
// 查询原始主机
HostDO originHost = hostDAO.selectById(originId);
Valid.notNull(originHost, ErrorMessage.HOST_ABSENT);
Assert.notNull(originHost, ErrorMessage.HOST_ABSENT);
// 创建主机
Long newId = SpringHolder.getBean(HostService.class)
.createHost(HostConvert.MAPPER.toCreate(request));
@@ -177,9 +177,9 @@ public class HostServiceImpl implements HostService {
log.info("HostService-updateHostById request: {}", JSON.toJSONString(request));
List<String> types = request.getTypes();
// 查询
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING);
HostDO record = hostDAO.selectById(id);
Valid.notNull(record, ErrorMessage.HOST_ABSENT);
Assert.notNull(record, ErrorMessage.HOST_ABSENT);
// 转换
HostDO updateRecord = HostConvert.MAPPER.to(request);
// 查询数据是否冲突
@@ -207,10 +207,10 @@ public class HostServiceImpl implements HostService {
public Integer updateHostStatus(HostUpdateStatusRequest request) {
log.info("HostService-updateHostStatus request: {}", JSON.toJSONString(request));
Long id = request.getId();
String status = Valid.valid(HostStatusEnum::of, request.getStatus()).name();
String status = Assert.valid(HostStatusEnum::of, request.getStatus()).name();
// 查询主机
HostDO record = hostDAO.selectById(id);
Valid.notNull(record, ErrorMessage.HOST_ABSENT);
Assert.notNull(record, ErrorMessage.HOST_ABSENT);
// 更新
HostDO update = HostDO.builder()
.id(id)
@@ -230,7 +230,7 @@ public class HostServiceImpl implements HostService {
log.info("HostService-updateHostSpec request: {}", JSON.toJSONString(request));
// 查询主机
HostDO record = hostDAO.selectById(request.getHostId());
Valid.notNull(record, ErrorMessage.HOST_ABSENT);
Assert.notNull(record, ErrorMessage.HOST_ABSENT);
// 设置日志参数
OperatorLogs.add(OperatorLogs.NAME, record.getName());
// 更新
@@ -244,7 +244,7 @@ public class HostServiceImpl implements HostService {
// 查询主机基础信息
if (Booleans.isTrue(base)) {
HostDO record = hostDAO.selectById(id);
Valid.notNull(record, ErrorMessage.HOST_ABSENT);
Assert.notNull(record, ErrorMessage.HOST_ABSENT);
return HostConvert.MAPPER.to(record);
}
// 查询 tag 信息
@@ -253,7 +253,7 @@ public class HostServiceImpl implements HostService {
Future<Set<Long>> groupIdFuture = dataGroupRelApi.getGroupIdByRelIdAsync(DataGroupTypeEnum.HOST, id);
// 查询主机
HostDO record = hostDAO.selectById(id);
Valid.notNull(record, ErrorMessage.HOST_ABSENT);
Assert.notNull(record, ErrorMessage.HOST_ABSENT);
// 查询规格
HostSpecExtraModel spec = hostExtraService.getHostExtra(Const.SYSTEM_USER_ID, id, HostExtraItemEnum.SPEC);
// 转换
@@ -392,7 +392,7 @@ public class HostServiceImpl implements HostService {
.eq(HostDO::getName, domain.getName());
// 检查是否存在
boolean present = hostDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.NAME_PRESENT);
Assert.isFalse(present, ErrorMessage.NAME_PRESENT);
}
/**
@@ -408,7 +408,7 @@ public class HostServiceImpl implements HostService {
.eq(HostDO::getCode, domain.getCode());
// 检查是否存在
boolean present = hostDAO.of(wrapper).present();
Valid.isFalse(present, ErrorMessage.CODE_PRESENT);
Assert.isFalse(present, ErrorMessage.CODE_PRESENT);
}
@Override