diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Assert.java similarity index 93% rename from orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/Assert.java index 6c61ac17..27ea214e 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Assert.java @@ -37,13 +37,13 @@ import java.util.Set; import java.util.function.Function; /** - * 验证器 + * 断言 * * @author Jiahang Li * @version 1.0.0 * @since 2023/7/18 11:23 */ -public class Valid extends cn.orionsec.kit.lang.utils.Valid { +public class Assert extends cn.orionsec.kit.lang.utils.Assert { private static final Validator validator = SpringHolder.getBean(Validator.class); @@ -155,8 +155,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid { * @param path path */ public static String checkNormalize(String path) { - Valid.notBlank(path); - Valid.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE); + Assert.notBlank(path); + Assert.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE); return Files1.getPath(path); } @@ -168,8 +168,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid { * @return file */ public static String checkSuffix(String file, String suffix) { - Valid.notBlank(file); - Valid.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix); + Assert.notBlank(file); + Assert.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix); return file; } diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index af86d80a..7684c8fd 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -18,7 +18,7 @@ 2.7.17 2.7.15 1.5.0 - 2.0.3 + 2.0.4 1.9.7 1.18.26 1.6.15 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java index aef79c7e..e65c69c2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.entity.PushUser; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.push.core.message.PushMessage; import java.util.stream.Collectors; @@ -67,7 +67,7 @@ public abstract class BasePushService implements IP */ protected void validateMessage(Message message) { // 验证消息 - Valid.valid(message); + Assert.valid(message); } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java index 141c8f8e..93aa021d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java @@ -25,9 +25,9 @@ package org.dromara.visor.framework.biz.push.core.service; import cn.orionsec.kit.http.ok.OkRequests; import cn.orionsec.kit.http.ok.OkResponse; import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.utils.Assert; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; -import cn.orionsec.kit.lang.utils.Valid; import cn.orionsec.kit.lang.utils.codec.Base64s; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.math.Hex; @@ -108,7 +108,7 @@ public class DingPushService extends BasePushService { OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body); DingResponseBody responseBody = JSON.parseObject(response.getBodyString(), DingResponseBody.class); // 验证发送结果 - Valid.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg()); + Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg()); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java index 5fa441a6..afb189c2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java @@ -27,12 +27,12 @@ import cn.orionsec.kit.http.ok.OkResponse; import cn.orionsec.kit.lang.constant.Const; import cn.orionsec.kit.lang.constant.StandardContentType; import cn.orionsec.kit.lang.utils.Strings; -import cn.orionsec.kit.lang.utils.Valid; import cn.orionsec.kit.lang.utils.codec.Base64s; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.crypto.enums.SecretKeySpecMode; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel; import org.dromara.visor.framework.biz.push.core.entity.FeiShuRequestBody; import org.dromara.visor.framework.biz.push.core.entity.FeiShuResponseBody; @@ -112,7 +112,7 @@ public class FeiShuPushService extends BasePushService { OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body); FeiShuResponseBody responseBody = JSON.parseObject(response.getBodyString(), FeiShuResponseBody.class); // 验证发送结果 - Valid.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg()); + Assert.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg()); } } \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java index 110c74cb..7f739c58 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.http.ok.OkResponse; import cn.orionsec.kit.lang.constant.StandardContentType; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel; import org.dromara.visor.framework.biz.push.core.entity.WeComRequestBody; import org.dromara.visor.framework.biz.push.core.entity.WeComResponseBody; @@ -79,7 +79,7 @@ public class WeComPushService extends BasePushService { OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body); WeComResponseBody responseBody = JSON.parseObject(response.getBodyString(), WeComResponseBody.class); // 验证发送结果 - Valid.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg()); + Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg()); } } \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java index 258e70c7..dfbef0cb 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java @@ -38,7 +38,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.ibatis.annotations.Mapper; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import org.dromara.visor.framework.mybatis.core.generator.template.Table; import org.dromara.visor.framework.mybatis.core.mapper.IMapper; @@ -101,7 +101,7 @@ public class CodeGenerator implements Executable { */ @Override public void exec() { - Valid.notEmpty(tables, "请先配置需要生成的表"); + Assert.notEmpty(tables, "请先配置需要生成的表"); // 创建引擎 VelocityTemplateEngine engine = this.getEngine(tables); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java index 2024c27f..86b96bc4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import org.dromara.visor.common.constant.ErrorMessage; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import java.util.Collection; @@ -81,7 +81,7 @@ public class Conditions { * @return wrapper */ public static LambdaQueryWrapper eq(SFunction mapping, E e) { - Valid.notNull(e, ErrorMessage.INVALID_PARAM); + Assert.notNull(e, ErrorMessage.INVALID_PARAM); return new LambdaQueryWrapper().eq(mapping, e); } @@ -95,7 +95,7 @@ public class Conditions { * @return wrapper */ public static LambdaQueryWrapper in(SFunction mapping, Collection es) { - Valid.notEmpty(es, ErrorMessage.INVALID_PARAM); + Assert.notEmpty(es, ErrorMessage.INVALID_PARAM); return new LambdaQueryWrapper().in(mapping, es); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java index cb175fba..5c93bb14 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java @@ -27,7 +27,6 @@ import cn.orionsec.kit.lang.define.wrapper.PageRequest; import cn.orionsec.kit.lang.define.wrapper.Pager; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Objects1; -import cn.orionsec.kit.lang.utils.Valid; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.reflect.Classes; import cn.orionsec.kit.spring.SpringHolder; @@ -42,6 +41,7 @@ import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.entity.IOrderRequest; import org.dromara.visor.common.entity.IPageRequest; import org.dromara.visor.common.enums.BooleanBit; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; @@ -85,23 +85,23 @@ public class DataQuery { */ @SuppressWarnings("unchecked") public static DataQuery create(Class entityClass) { - TableInfo table = Valid.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class"); + TableInfo table = Assert.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class"); Class> mapperClass = (Class>) Classes.loadClass(table.getCurrentNamespace()); return new DataQuery(SpringHolder.getBean(mapperClass)); } public static DataQuery of(BaseMapper dao) { - Valid.notNull(dao, "dao is null"); + Assert.notNull(dao, "dao is null"); return new DataQuery<>(dao); } public static DataQuery of(BaseMapper dao, Wrapper wrapper) { - Valid.notNull(dao, "dao is null"); + Assert.notNull(dao, "dao is null"); return new DataQuery<>(dao, wrapper); } public DataQuery page(IPageRequest request) { - Valid.notNull(request, "page is null"); + Assert.notNull(request, "page is null"); this.page = new PageRequest(request.getPage(), request.getLimit()); return this; } @@ -112,7 +112,7 @@ public class DataQuery { } public DataQuery wrapper(Wrapper wrapper) { - this.wrapper = Valid.notNull(wrapper, "wrapper is null"); + this.wrapper = Assert.notNull(wrapper, "wrapper is null"); return this; } @@ -177,18 +177,18 @@ public class DataQuery { // -------------------- id -------------------- public T get(Serializable id) { - Valid.notNull(id, "id is null"); + Assert.notNull(id, "id is null"); return dao.selectById(id); } public R get(Serializable id, Function mapper) { - Valid.notNull(id, "id is null"); - Valid.notNull(mapper, "convert function is null"); + Assert.notNull(id, "id is null"); + Assert.notNull(mapper, "convert function is null"); return Objects1.map(dao.selectById(id), mapper); } public Optional optional(Serializable id) { - Valid.notNull(id, "id is null"); + Assert.notNull(id, "id is null"); return Optional.ofNullable(dao.selectById(id)); } @@ -213,7 +213,7 @@ public class DataQuery { } public R get(Function mapper) { - Valid.notNull(mapper, "convert function is null"); + Assert.notNull(mapper, "convert function is null"); return Objects1.map(dao.selectOne(wrapper), mapper); } @@ -228,7 +228,7 @@ public class DataQuery { } public List list(Function mapper) { - Valid.notNull(mapper, "convert function is null"); + Assert.notNull(mapper, "convert function is null"); return Lists.map(dao.selectList(wrapper), mapper); } @@ -277,10 +277,10 @@ public class DataQuery { } public DataGrid dataGrid(Wrapper countWrapper, Function mapper) { - Valid.notNull(page, "page is null"); - Valid.notNull(wrapper, "wrapper is null"); - Valid.notNull(countWrapper, "count wrapper is null"); - Valid.notNull(mapper, "convert function is null"); + Assert.notNull(page, "page is null"); + Assert.notNull(wrapper, "wrapper is null"); + Assert.notNull(countWrapper, "count wrapper is null"); + Assert.notNull(mapper, "convert function is null"); Long count = dao.selectCount(countWrapper); Pager pager = new Pager<>(page); pager.setTotal(count.intValue()); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index 0e3e1090..50227646 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -29,7 +29,7 @@ import com.alibaba.fastjson.JSON; 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; #if($meta.enableCache) import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; @@ -84,11 +84,11 @@ public class ${table.serviceImplName} implements ${table.serviceName} { @Override @Transactional(rollbackFor = Exception.class) public Integer update${type}ById(${type}UpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 ${type}DO record = ${typeLower}DAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 ${type}DO updateRecord = ${type}Convert.MAPPER.to(request); // 查询数据是否冲突 @@ -125,7 +125,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { public ${type}VO get${type}ById(Long id) { // 查询 ${type}DO record = ${typeLower}DAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 return ${type}Convert.MAPPER.to(record); } @@ -202,7 +202,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { log.info("${type}Service-delete${type}ById id: {}", id); // 检查数据是否存在 ${type}DO record = ${typeLower}DAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 删除 int effect = ${typeLower}DAO.deleteById(id); log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect); @@ -260,7 +260,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} { #end // 检查是否存在 boolean present = ${typeLower}DAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } @Override diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm index 350941ae..dd456cc5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON; 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; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end @@ -64,7 +64,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Long create${type}(${type}CreateDTO dto) { log.info("${type}Api.create${type} dto: {}", JSON.toJSONString(dto)); - Valid.valid(dto); + Assert.valid(dto); // 转换 ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); // 创建 @@ -74,7 +74,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Integer update${type}ById(${type}UpdateDTO dto) { log.info("${type}Api.update${type}ById dto: {}", JSON.toJSONString(dto)); - Valid.valid(dto); + Assert.valid(dto); // 转换 ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); // 修改 @@ -84,8 +84,8 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Integer update${type}(${type}QueryDTO query, ${type}UpdateDTO update) { log.info("${type}Api.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update)); - Valid.valid(query); - Valid.valid(update); + Assert.valid(query); + Assert.valid(update); // 更新 int effect = ${typeLower}Service.update${type}(${type}ProviderConvert.MAPPER.toRequest(query), ${type}ProviderConvert.MAPPER.toRequest(update)); @@ -96,7 +96,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public ${type}DTO get${type}ById(Long id) { log.info("${type}Api.get${type}ById id: {}", id); - Valid.notNull(id, ErrorMessage.ID_MISSING); + Assert.notNull(id, ErrorMessage.ID_MISSING); // 修改 ${type}DO record = ${typeLower}DAO.selectById(id); if (record == null) { @@ -121,7 +121,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public List<${type}DTO> get${type}List(${type}QueryDTO dto) { log.info("${type}Api.get${type}List dto: {}", JSON.toJSONString(dto)); - Valid.valid(dto); + Assert.valid(dto); // 条件 LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto); // 查询 @@ -142,7 +142,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Long get${type}Count(${type}QueryDTO dto) { log.info("${type}Api.get${type}Count dto: {}", JSON.toJSONString(dto)); - Valid.valid(dto); + Assert.valid(dto); // 条件 LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto); // 查询 @@ -152,7 +152,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Integer delete${type}ById(Long id) { log.info("${type}Api.delete${type}ById id: {}", id); - Valid.notNull(id, ErrorMessage.ID_MISSING); + Assert.notNull(id, ErrorMessage.ID_MISSING); // 删除 Integer effect = ${typeLower}Service.delete${type}ById(id); log.info("${type}Api.delete${type}ById id: {}, effect: {}", id, effect); @@ -162,7 +162,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Integer delete${type}ByIdList(List idList) { log.info("${type}Api.delete${type}ByIdList idList: {}", idList); - Valid.notEmpty(idList, ErrorMessage.ID_MISSING); + Assert.notEmpty(idList, ErrorMessage.ID_MISSING); // 删除 Integer effect = ${typeLower}Service.delete${type}ByIdList(idList); log.info("${type}Api.delete${type}ByIdList effect: {}", effect); @@ -172,7 +172,7 @@ public class ${type}ApiImpl implements ${type}Api { @Override public Integer delete${type}(${type}QueryDTO dto) { log.info("${type}Api.delete${type} dto: {}", JSON.toJSONString(dto)); - Valid.valid(dto); + Assert.valid(dto); // 删除 Integer effect = ${typeLower}Service.delete${type}(${type}ProviderConvert.MAPPER.toRequest(dto)); log.info("${type}Api.delete${type} effect: {}", effect); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java index d5284920..f2c40a74 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.security.core.context; -import cn.orionsec.kit.lang.utils.Valid; import com.alibaba.ttl.TransmittableThreadLocal; +import org.dromara.visor.common.utils.Assert; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolderStrategy; import org.springframework.security.core.context.SecurityContextImpl; @@ -60,7 +60,7 @@ public class TransmittableThreadLocalSecurityContextHolderStrategy implements Se @Override public void setContext(SecurityContext context) { - Valid.notNull(context, "only non-null SecurityContext instances are permitted"); + Assert.notNull(context, "only non-null SecurityContext instances are permitted"); CONTEXT_HOLDER.set(context); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java index fee715dd..f3dc2852 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java @@ -28,8 +28,8 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.common.utils.RsaParamDecryptUtils; -import org.dromara.visor.common.utils.Valid; import java.io.IOException; @@ -52,7 +52,7 @@ public class ParamDecryptDeserializer extends JsonDeserializer { } // 解密参数 String decrypt = RsaParamDecryptUtils.decrypt(value); - return Valid.notNull(decrypt, ErrorMessage.DECRYPT_ERROR); + return Assert.notNull(decrypt, ErrorMessage.DECRYPT_ERROR); } } \ No newline at end of file diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java index c52d9739..97631b99 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java @@ -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); } diff --git a/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 b/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 index 38c8a3db..1caa10de 100644 --- a/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 +++ b/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 @@ -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); diff --git a/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 b/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 index b163e928..6c1c0b76 100644 --- a/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 +++ b/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 @@ -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 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 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); } } diff --git a/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 b/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 index e033e8d8..063c7d82 100644 --- a/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 +++ b/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 @@ -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 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); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java index 6a0df65e..d45f5ad3 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java @@ -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() + ")"); } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentEndpointServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentEndpointServiceImpl.java index c53caa5c..9cfc2f36 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentEndpointServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentEndpointServiceImpl.java @@ -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); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java index 5b45b621..a54a8e42 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostAgentServiceImpl.java @@ -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 idList = request.getIdList(); List hosts = hostDAO.selectBatchIds(idList); - Valid.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT); + Assert.eq(hosts.size(), idList.size(), ErrorMessage.HOST_ABSENT); // 检查并创建安装任务参数 List 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 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; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java index 96414948..92256b0e 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java @@ -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 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; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java index c369de68..34ad31e3 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConnectServiceImpl.java @@ -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 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()); diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java index 0e7cb714..a52a7bdf 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java @@ -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 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); // 查询配置信息 diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index ea267b1e..bc789f71 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -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 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); } /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index 0e3d5980..5ea6f8d8 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -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 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); } /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 4d10c694..5c729a8a 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -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 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> 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 diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java index 15ae415b..c18df6be 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecCommandLogController.java @@ -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; } diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java index d96b2227..a0287581 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/controller/ExecJobLogController.java @@ -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; } diff --git a/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 b/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 index bcb81f31..04effaac 100644 --- a/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 +++ b/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 @@ -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()); // 设置日志路径 diff --git a/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 b/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 index ad127cf0..ecb90eb7 100644 --- a/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 +++ b/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 @@ -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; diff --git a/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 b/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 index a261a12b..dde69604 100644 --- a/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 +++ b/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 @@ -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()); } diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java index f66b2c90..b1ccf14f 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java @@ -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 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 hostLogs = execHostLogDAO.selectByLogId(logId); - Valid.notEmpty(hostLogs, ErrorMessage.DATA_ABSENT); + Assert.notEmpty(hostLogs, ErrorMessage.DATA_ABSENT); List hostIdList = hostLogs.stream() .map(ExecHostLogDO::getHostId) .collect(Collectors.toList()); diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java index 8abc9f3d..1dd3cc30 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecHostLogServiceImpl.java @@ -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) diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java index 54861e49..c9deab3e 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java @@ -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 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 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)); } } diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java index e872a4f4..b1a1cd7d 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java @@ -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 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()); diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java index f420bae2..a8d4ac01 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java @@ -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 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); } } diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java index 2b214d69..f5098ce5 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java @@ -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 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 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 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; } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java index 0be17cee..2d7bee05 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.api.impl; 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.module.infra.api.AuthenticationApi; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; import org.dromara.visor.module.infra.entity.dto.user.SystemUserAuthDTO; @@ -59,7 +59,7 @@ public class AuthenticationApiImpl implements AuthenticationApi { // 检查用户密码 boolean passRight = authenticationService.checkUserPassword(user, password, addFailedCount); result.setPassRight(passRight); - Valid.isTrue(passRight, ErrorMessage.USERNAME_PASSWORD_ERROR); + Assert.isTrue(passRight, ErrorMessage.USERNAME_PASSWORD_ERROR); // 检查用户状态 authenticationService.checkUserStatus(user); result.setAuthed(true); diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java index 60b93b10..65096eb1 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataExtraApi; import org.dromara.visor.module.infra.convert.DataExtraProviderConvert; import org.dromara.visor.module.infra.dao.DataExtraDAO; @@ -63,7 +63,7 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public Integer setExtraItem(DataExtraSetDTO dto, DataExtraTypeEnum type) { - Valid.valid(dto); + Assert.valid(dto); // 更新 DataExtraSetRequest request = DataExtraProviderConvert.MAPPER.to(dto); request.setType(type.name()); @@ -72,7 +72,7 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public Long addExtraItem(DataExtraSetDTO dto, DataExtraTypeEnum type) { - Valid.valid(dto); + Assert.valid(dto); // 更新 DataExtraSetRequest request = DataExtraProviderConvert.MAPPER.to(dto); request.setType(type.name()); @@ -82,7 +82,7 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public void addExtraItems(List rows, DataExtraTypeEnum type) { for (DataExtraSetDTO row : rows) { - Valid.valid(row); + Assert.valid(row); } List extras = rows.stream() .map(DataExtraProviderConvert.MAPPER::to) @@ -103,7 +103,7 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public String getExtraValue(DataExtraQueryDTO dto, DataExtraTypeEnum type) { - Valid.allNotNull(dto.getUserId(), dto.getRelId(), dto.getItem()); + Assert.allNotNull(dto.getUserId(), dto.getRelId(), dto.getItem()); // 查询 DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); request.setType(type.name()); @@ -112,7 +112,7 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public Map getExtraItemValues(DataExtraQueryDTO dto, DataExtraTypeEnum type) { - Valid.allNotNull(dto.getUserId(), dto.getRelIdList(), dto.getItem()); + Assert.allNotNull(dto.getUserId(), dto.getRelIdList(), dto.getItem()); // 查询 DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); request.setType(type.name()); @@ -121,13 +121,13 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public String getExtraItemValueByCache(Long userId, DataExtraTypeEnum type, String item, Long relId) { - Valid.allNotNull(userId, type, item, relId); + Assert.allNotNull(userId, type, item, relId); return dataExtraService.getExtraItemValueByCache(userId, type.name(), item, relId); } @Override public Map getExtraItemValuesByCache(Long userId, DataExtraTypeEnum type, String item) { - Valid.allNotNull(userId, type, item); + Assert.allNotNull(userId, type, item); return dataExtraService.getExtraItemValuesByCache(userId, type.name(), item); } @@ -138,14 +138,14 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public Future>> getExtraItemsValuesByCacheAsync(Long userId, DataExtraTypeEnum type, List items) { - Valid.allNotNull(userId, type); - Valid.notEmpty(items); + Assert.allNotNull(userId, type); + Assert.notEmpty(items); return CompletableFuture.completedFuture(dataExtraService.getExtraItemsValuesByCache(userId, type.name(), items)); } @Override public DataExtraDTO getExtraItem(DataExtraQueryDTO dto, DataExtraTypeEnum type) { - Valid.allNotNull(dto.getUserId(), dto.getRelId(), dto.getItem()); + Assert.allNotNull(dto.getUserId(), dto.getRelId(), dto.getItem()); DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); request.setType(type.name()); DataExtraDO extraItem = dataExtraService.getExtraItem(request); @@ -174,13 +174,13 @@ public class DataExtraApiImpl implements DataExtraApi { @Override public int deleteHostKeyExtra(List keyIdList) { - Valid.notEmpty(keyIdList); + Assert.notEmpty(keyIdList); return dataExtraDAO.deleteHostKey(keyIdList); } @Override public int deleteHostIdentityExtra(List identityIdList) { - Valid.notEmpty(identityIdList); + Assert.notEmpty(identityIdList); return dataExtraDAO.deleteHostIdentity(identityIdList); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java index 862c2983..8a2985cf 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataGroupApi; import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; import org.dromara.visor.module.infra.dao.DataGroupDAO; @@ -64,7 +64,7 @@ public class DataGroupApiImpl implements DataGroupApi { @Override public Long createDataGroup(DataGroupTypeEnum type, DataGroupCreateDTO dto) { - Valid.valid(dto); + Assert.valid(dto); DataGroupCreateRequest request = DataGroupProviderConvert.MAPPER.toRequest(dto); request.setType(type.name()); request.setUserId(Const.SYSTEM_USER_ID); @@ -73,14 +73,14 @@ public class DataGroupApiImpl implements DataGroupApi { @Override public Integer renameDataGroup(DataGroupRenameDTO dto) { - Valid.valid(dto); + Assert.valid(dto); DataGroupRenameRequest request = DataGroupProviderConvert.MAPPER.toRequest(dto); return dataGroupService.renameDataGroup(request); } @Override public Integer moveDataGroup(DataGroupMoveDTO dto) { - Valid.valid(dto); + Assert.valid(dto); DataGroupMoveRequest request = DataGroupProviderConvert.MAPPER.toRequest(dto); return dataGroupService.moveDataGroup(request); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java index e19dd177..fdaa631b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataGroupRelApi; import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; @@ -58,26 +58,26 @@ public class DataGroupRelApiImpl implements DataGroupRelApi { @Override public void updateGroupRel(Long groupId, List relIdList) { - Valid.notNull(groupId); + Assert.notNull(groupId); dataGroupRelService.updateGroupRel(groupId, relIdList); } @Override public void updateRelGroup(DataGroupTypeEnum type, List groupIdList, Long relId) { - Valid.notNull(relId); + Assert.notNull(relId); dataGroupRelService.updateRelGroup(type.name(), Const.SYSTEM_USER_ID, groupIdList, relId); } @Override public void addGroupRel(DataGroupTypeEnum type, Long groupId, Long relId) { - Valid.notNull(groupId); - Valid.notNull(relId); + Assert.notNull(groupId); + Assert.notNull(relId); dataGroupRelService.addGroupRel(type.name(), groupId, Const.SYSTEM_USER_ID, relId); } @Override public void addGroupRel(DataGroupTypeEnum type, Map> groupRelListMap) { - Valid.notEmpty(groupRelListMap); + Assert.notEmpty(groupRelListMap); dataGroupRelService.addGroupRel(type.name(), Const.SYSTEM_USER_ID, groupRelListMap); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java index 33891592..7145f457 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataGroupUserApi; import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; @@ -53,7 +53,7 @@ public class DataGroupUserApiImpl implements DataGroupUserApi { @Override public Long createDataGroup(DataGroupTypeEnum type, Long userId, DataGroupCreateDTO dto) { - Valid.valid(dto); + Assert.valid(dto); DataGroupCreateRequest request = DataGroupProviderConvert.MAPPER.toRequest(dto); request.setType(type.name()); request.setUserId(userId); diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java index fc18a8cd..049a83c3 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataGroupUserRelApi; import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; @@ -57,20 +57,20 @@ public class DataGroupUserRelApiImpl implements DataGroupUserRelApi { @Override public void updateGroupRel(DataGroupTypeEnum type, Long userId, List groupIdList, Long relId) { - Valid.notNull(relId); + Assert.notNull(relId); dataGroupRelService.updateRelGroup(type.name(), userId, groupIdList, relId); } @Override public void addGroupRel(DataGroupTypeEnum type, Long userId, Long groupId, Long relId) { - Valid.notNull(groupId); - Valid.notNull(relId); + Assert.notNull(groupId); + Assert.notNull(relId); dataGroupRelService.addGroupRel(type.name(), userId, groupId, relId); } @Override public void addGroupRel(DataGroupTypeEnum type, Long userId, Map> groupRelListMap) { - Valid.notEmpty(groupRelListMap); + Assert.notEmpty(groupRelListMap); dataGroupRelService.addGroupRel(type.name(), userId, groupRelListMap); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java index 9cc6200c..6a1ea6f2 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.DataPermissionApi; import org.dromara.visor.module.infra.entity.dto.data.DataPermissionBatchUpdateDTO; import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; @@ -55,7 +55,7 @@ public class DataPermissionApiImpl implements DataPermissionApi { Long userId = dto.getUserId(); Long roleId = dto.getRoleId(); // 校验参数 - Valid.isTrue(userId != null || roleId != null); + Assert.isTrue(userId != null || roleId != null); // 修改权限 DataPermissionUpdateRequest request = DataPermissionUpdateRequest.builder() .type(type.name()) @@ -75,7 +75,7 @@ public class DataPermissionApiImpl implements DataPermissionApi { List userIdList = dto.getUserIdList(); List roleIdList = dto.getRoleIdList(); // 校验参数 - Valid.isTrue(Lists.isNotEmpty(userIdList) || Lists.isNotEmpty(roleIdList)); + Assert.isTrue(Lists.isNotEmpty(userIdList) || Lists.isNotEmpty(roleIdList)); // 修改权限 DataPermissionUpdateRequest request = DataPermissionUpdateRequest.builder() .type(type.name()) @@ -88,7 +88,7 @@ public class DataPermissionApiImpl implements DataPermissionApi { @Override public boolean hasPermission(DataPermissionTypeEnum type, Long userId, Long relId) { - Valid.allNotNull(userId, relId); + Assert.allNotNull(userId, relId); return dataPermissionService.hasPermission(type.name(), userId, relId); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java index a5a2e4b4..7846d3f2 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api.impl; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.FavoriteApi; import org.dromara.visor.module.infra.dao.FavoriteDAO; import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; @@ -54,7 +54,7 @@ public class FavoriteApiImpl implements FavoriteApi { @Override public List getFavoriteRelIdList(FavoriteTypeEnum type, Long userId) { - Valid.allNotNull(type, userId); + Assert.allNotNull(type, userId); // 查询 FavoriteQueryRequest request = new FavoriteQueryRequest(); request.setType(type.name()); @@ -65,21 +65,21 @@ public class FavoriteApiImpl implements FavoriteApi { @Override @Async("asyncExecutor") public Future> getFavoriteRelIdListAsync(FavoriteTypeEnum type, Long userId) { - Valid.allNotNull(type, userId); + Assert.allNotNull(type, userId); // 查询 return CompletableFuture.completedFuture(this.getFavoriteRelIdList(type, userId)); } @Override public void deleteByRelId(FavoriteTypeEnum type, Long relId) { - Valid.allNotNull(type, relId); + Assert.allNotNull(type, relId); favoriteDAO.deleteFavoriteByRelId(type.name(), relId); } @Override public void deleteByRelIdList(FavoriteTypeEnum type, List relIdList) { - Valid.notNull(type); - Valid.notEmpty(relIdList); + Assert.notNull(type); + Assert.notEmpty(relIdList); favoriteDAO.deleteFavoriteByRelIdList(type.name(), relIdList); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java index 4fa2edd4..f1780782 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.api.impl; import com.alibaba.fastjson.JSON; 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.module.infra.api.HistoryValueApi; import org.dromara.visor.module.infra.convert.HistoryValueProviderConvert; import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; @@ -56,8 +56,8 @@ public class HistoryValueApiImpl implements HistoryValueApi { @Override public Long createHistoryValue(HistoryValueTypeEnum type, HistoryValueCreateDTO dto) { log.info("HistoryValueApi.createHistoryValue dto: {}", JSON.toJSONString(dto)); - Valid.notNull(type); - Valid.valid(dto); + Assert.notNull(type); + Assert.valid(dto); // 转换 HistoryValueCreateRequest request = HistoryValueProviderConvert.MAPPER.toRequest(dto); request.setType(type.name()); @@ -68,7 +68,7 @@ public class HistoryValueApiImpl implements HistoryValueApi { @Override public HistoryValueDTO getHistoryValueById(Long id) { log.info("HistoryValueApi.getHistoryValueById id: {}", id); - Valid.notNull(id, ErrorMessage.ID_MISSING); + Assert.notNull(id, ErrorMessage.ID_MISSING); // 修改 HistoryValueDO record = historyValueService.getHistoryById(id); if (record == null) { @@ -81,7 +81,7 @@ public class HistoryValueApiImpl implements HistoryValueApi { @Override public HistoryValueDTO getHistoryValueByRelId(Long id, Long relId, HistoryValueTypeEnum type) { log.info("HistoryValueApi.getHistoryValueByRelId id: {}, relId: {}, type: {}", id, relId, type); - Valid.allNotNull(id, relId, type); + Assert.allNotNull(id, relId, type); // 修改 HistoryValueDO record = historyValueService.getHistoryByRelId(id, relId, type.name()); if (record == null) { diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java index 8e62d2c9..b78addf7 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.OperatorLogApi; import org.dromara.visor.module.infra.convert.OperatorLogProviderConvert; import org.dromara.visor.module.infra.dao.OperatorLogDAO; @@ -53,7 +53,7 @@ public class OperatorLogApiImpl implements OperatorLogApi { @Override public DataGrid getOperatorLogPage(OperatorLogQueryDTO request) { - Valid.valid(request); + Assert.valid(request); // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 @@ -66,7 +66,7 @@ public class OperatorLogApiImpl implements OperatorLogApi { @Override public List getOperatorLogList(OperatorLogQueryDTO request) { - Valid.valid(request); + Assert.valid(request); // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request) .orderByDesc(OperatorLogDO::getId); @@ -79,7 +79,7 @@ public class OperatorLogApiImpl implements OperatorLogApi { @Override public Long getOperatorLogCount(OperatorLogQueryDTO request) { - Valid.valid(request); + Assert.valid(request); // 条件 LambdaQueryWrapper wrapper = this.buildQueryWrapper(request); // 查询 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java index 3c6fcc5e..fa33a16c 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.SystemMessageApi; import org.dromara.visor.module.infra.convert.SystemMessageProviderConvert; import org.dromara.visor.module.infra.define.SystemMessageDefine; @@ -52,7 +52,7 @@ public class SystemMessageApiImpl implements SystemMessageApi { @Override public Long create(SystemMessageDefine define, SystemMessageDTO dto) { - Valid.valid(dto); + Assert.valid(dto); // 转换 SystemMessageCreateRequest request = SystemMessageCreateRequest.builder() .classify(define.getClassify().name()) @@ -70,7 +70,7 @@ public class SystemMessageApiImpl implements SystemMessageApi { @Override public Long create(MessageClassifyEnum classify, SystemMessageCreateDTO dto) { dto.setClassify(classify.name()); - Valid.valid(dto); + Assert.valid(dto); // 转换 SystemMessageCreateRequest request = SystemMessageProviderConvert.MAPPER.toRequest(dto); // 创建 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java index 2637c69d..5051817b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.infra.api.TagRelApi; import org.dromara.visor.module.infra.convert.TagProviderConvert; import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; @@ -56,7 +56,7 @@ public class TagRelApiImpl implements TagRelApi { @Override public void addTagRel(TagTypeEnum type, Long relId, List tagIdList) { - Valid.notNull(relId); + Assert.notNull(relId); if (Lists.isEmpty(tagIdList)) { return; } @@ -73,7 +73,7 @@ public class TagRelApiImpl implements TagRelApi { @Override public void setTagRel(TagTypeEnum type, Long relId, List tagIdList) { - Valid.notNull(relId); + Assert.notNull(relId); tagRelService.setTagRel(type.name(), relId, tagIdList); } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index e4cec4d7..86d134eb 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -40,8 +40,8 @@ import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.common.security.UserRole; import org.dromara.visor.common.utils.AesEncryptUtils; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.common.utils.IpUtils; -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.redis.core.utils.RedisUtils; @@ -129,7 +129,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { boolean passRight = this.checkUserPassword(user, request.getPassword(), true); // 发送站内信 this.sendLoginFailedErrorMessage(passRight, user, remoteAddr, location); - Valid.isTrue(passRight, ErrorMessage.USERNAME_PASSWORD_ERROR); + Assert.isTrue(passRight, ErrorMessage.USERNAME_PASSWORD_ERROR); // 用户状态校验 this.checkUserStatus(user); Long id = user.getId(); @@ -249,7 +249,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { .eq(SystemUserDO::getUsername, username) .then() .getOne(); - Valid.notNull(user, ErrorMessage.USERNAME_PASSWORD_ERROR); + Assert.notNull(user, ErrorMessage.USERNAME_PASSWORD_ERROR); return user; } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java index 9acba84a..ef39a671 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.spring.SpringHolder; 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.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.RedisStrings; @@ -69,10 +69,10 @@ public class DataGroupRelServiceImpl implements DataGroupRelService { @Override @Transactional(rollbackFor = Exception.class) public void updateGroupRel(Long groupId, List relIdList) { - Valid.notNull(groupId); + Assert.notNull(groupId); // 查询分组 DataGroupDO group = dataGroupDAO.selectById(groupId); - Valid.notNull(group, ErrorMessage.GROUP_ABSENT); + Assert.notNull(group, ErrorMessage.GROUP_ABSENT); String type = group.getType(); Long userId = group.getUserId(); // 设置日志参数 @@ -119,7 +119,7 @@ public class DataGroupRelServiceImpl implements DataGroupRelService { @Override @Transactional(rollbackFor = Exception.class) public void updateRelGroup(String type, Long userId, List groupIdList, Long relId) { - Valid.notNull(relId); + Assert.notNull(relId); // 删除引用 this.deleteByRelId(type, userId, relId); // 插入引用 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index 7f843390..6af63e03 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -29,8 +29,8 @@ 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.MovePosition; +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.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; @@ -95,11 +95,11 @@ public class DataGroupServiceImpl implements DataGroupService { @Override public Integer renameDataGroup(DataGroupRenameRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); - String name = Valid.notBlank(request.getName()); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); + String name = Assert.notBlank(request.getName()); // 查询 DataGroupDO record = dataGroupDAO.selectById(id); - Valid.notNull(record, ErrorMessage.GROUP_ABSENT); + Assert.notNull(record, ErrorMessage.GROUP_ABSENT); // 转换 DataGroupDO updateRecord = DataGroupDO.builder() .id(id) @@ -122,12 +122,12 @@ public class DataGroupServiceImpl implements DataGroupService { public Integer moveDataGroup(DataGroupMoveRequest request) { Long id = request.getId(); Long targetId = request.getTargetId(); - MovePosition position = Valid.valid(MovePosition::of, request.getPosition()); + MovePosition position = Assert.valid(MovePosition::of, request.getPosition()); // 查询节点是否存在 DataGroupDO moveRecord = dataGroupDAO.selectById(id); DataGroupDO targetRecord = dataGroupDAO.selectById(targetId); - Valid.notNull(moveRecord, ErrorMessage.GROUP_ABSENT); - Valid.notNull(targetRecord, ErrorMessage.GROUP_ABSENT); + Assert.notNull(moveRecord, ErrorMessage.GROUP_ABSENT); + Assert.notNull(targetRecord, ErrorMessage.GROUP_ABSENT); // 更新 String type = moveRecord.getType(); Long targetParentId = targetRecord.getParentId(); @@ -231,7 +231,7 @@ public class DataGroupServiceImpl implements DataGroupService { log.info("DataGroupService-deleteDataGroupById id: {}", id); // 检查数据是否存在 DataGroupDO record = dataGroupDAO.selectById(id); - Valid.notNull(record, ErrorMessage.GROUP_ABSENT); + Assert.notNull(record, ErrorMessage.GROUP_ABSENT); String type = record.getType(); // 查询子级 List deleteIdList = Lists.of(id); @@ -334,7 +334,7 @@ public class DataGroupServiceImpl implements DataGroupService { .eq(DataGroupDO::getName, domain.getName()); // 检查是否存在 boolean present = dataGroupDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java index 11bf9bd9..e730345a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; 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.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.RedisUtils; @@ -181,7 +181,7 @@ public class DataPermissionServiceImpl implements DataPermissionService { @Override public List getUserAuthorizedRelIdList(String type, Long userId) { - DataPermissionTypeEnum dataType = Valid.valid(DataPermissionTypeEnum::of, type); + DataPermissionTypeEnum dataType = Assert.valid(DataPermissionTypeEnum::of, type); String cacheKey = DataPermissionCacheKeyDefine.DATA_PERMISSION_USER.format(type, userId); // 获取缓存 List list = RedisLists.range(cacheKey, Long::valueOf); diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index c8c57bac..49ba95f4 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -33,7 +33,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.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisStrings; @@ -82,7 +82,7 @@ public class DictKeyServiceImpl implements DictKeyService { @Override public Long createDictKey(DictKeyCreateRequest request) { log.info("DictKeyService-createDictKey request: {}", JSON.toJSONString(request)); - Valid.valid(DictValueTypeEnum::of, request.getValueType()); + Assert.valid(DictValueTypeEnum::of, request.getValueType()); // 转换 DictKeyDO record = DictKeyConvert.MAPPER.to(request); // 查询数据是否冲突 @@ -99,12 +99,12 @@ public class DictKeyServiceImpl implements DictKeyService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateDictKeyById(DictKeyUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("DictKeyService-updateDictKeyById id: {}, request: {}", id, JSON.toJSONString(request)); - Valid.valid(DictValueTypeEnum::of, request.getValueType()); + Assert.valid(DictValueTypeEnum::of, request.getValueType()); // 查询 DictKeyDO record = dictKeyDAO.selectById(id); - Valid.notNull(record, ErrorMessage.CONFIG_ABSENT); + Assert.notNull(record, ErrorMessage.CONFIG_ABSENT); // 转换 DictKeyDO updateRecord = DictKeyConvert.MAPPER.to(request); // 查询数据是否冲突 @@ -248,7 +248,7 @@ public class DictKeyServiceImpl implements DictKeyService { .eq(DictKeyDO::getKeyName, domain.getKeyName()); // 检查是否存在 boolean present = dictKeyDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index 7557e510..231341e0 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -32,7 +32,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.constant.FieldConst; -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.Conditions; import org.dromara.visor.framework.redis.core.utils.RedisStrings; @@ -91,7 +91,7 @@ public class DictValueServiceImpl implements DictValueService { DictValueDO record = DictValueConvert.MAPPER.to(request); // 查询 dictKey 是否存在 DictKeyDO dictKey = dictKeyDAO.selectById(request.getKeyId()); - String key = Valid.notNull(dictKey, ErrorMessage.CONFIG_ABSENT).getKeyName(); + String key = Assert.notNull(dictKey, ErrorMessage.CONFIG_ABSENT).getKeyName(); // 查询数据是否冲突 this.checkDictValuePresent(record); // 插入 @@ -109,12 +109,12 @@ public class DictValueServiceImpl implements DictValueService { public Integer updateDictValueById(DictValueUpdateRequest request) { log.info("DictValueService-updateDictValueById id: {}, request: {}", request.getId(), JSON.toJSONString(request)); // 查询 - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); DictValueDO record = dictValueDAO.selectById(id); - Valid.notNull(record, ErrorMessage.CONFIG_ABSENT); + Assert.notNull(record, ErrorMessage.CONFIG_ABSENT); // 查询 dictKey 是否存在 DictKeyDO dictKey = dictKeyDAO.selectById(request.getKeyId()); - String key = Valid.notNull(dictKey, ErrorMessage.CONFIG_ABSENT).getKeyName(); + String key = Assert.notNull(dictKey, ErrorMessage.CONFIG_ABSENT).getKeyName(); // 转换 DictValueDO updateRecord = DictValueConvert.MAPPER.to(request); // 查询数据是否冲突 @@ -138,10 +138,10 @@ public class DictValueServiceImpl implements DictValueService { log.info("DictValueService-updateDictValueById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 DictValueDO record = dictValueDAO.selectById(id); - Valid.notNull(record, ErrorMessage.CONFIG_ABSENT); + Assert.notNull(record, ErrorMessage.CONFIG_ABSENT); // 查询历史值 HistoryValueDO history = historyValueService.getHistoryByRelId(request.getValueId(), id, HistoryValueTypeEnum.DICT.name()); - Valid.notNull(history, ErrorMessage.HISTORY_ABSENT); + Assert.notNull(history, ErrorMessage.HISTORY_ABSENT); JSONObject historyValue = JSON.parseObject(history.getBeforeValue()); String label = (String) historyValue.remove(OperatorLogs.LABEL); String value = (String) historyValue.remove(OperatorLogs.VALUE); @@ -273,7 +273,7 @@ public class DictValueServiceImpl implements DictValueService { log.info("DictValueService-deleteDictValueById id: {}", id); // 检查数据是否存在 DictValueDO record = dictValueDAO.selectById(id); - Valid.notNull(record, ErrorMessage.CONFIG_ABSENT); + Assert.notNull(record, ErrorMessage.CONFIG_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.VALUE, record.getKeyName() + "-" + record.getLabel()); // 删除 @@ -395,7 +395,7 @@ public class DictValueServiceImpl implements DictValueService { .eq(DictValueDO::getValue, domain.getValue()); // 检查是否存在 boolean present = dictValueDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.CONFIG_PRESENT); + Assert.isFalse(present, ErrorMessage.CONFIG_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java index 2614c87e..bd95032d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; 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.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.redis.core.utils.RedisLists; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; import org.dromara.visor.framework.security.core.utils.SecurityUtils; @@ -60,7 +60,7 @@ public class FavoriteServiceImpl implements FavoriteService { @Override public Long addFavorite(FavoriteOperatorRequest request) { - String type = Valid.valid(FavoriteTypeEnum::of, request.getType()).name(); + String type = Assert.valid(FavoriteTypeEnum::of, request.getType()).name(); Long userId = SecurityUtils.getLoginUserId(); // 检查是否存在 FavoriteDO check = favoriteDAO.of() @@ -85,7 +85,7 @@ public class FavoriteServiceImpl implements FavoriteService { @Override public Integer cancelFavorite(FavoriteOperatorRequest request) { - String type = Valid.valid(FavoriteTypeEnum::of, request.getType()).name(); + String type = Assert.valid(FavoriteTypeEnum::of, request.getType()).name(); Long userId = SecurityUtils.getLoginUserId(); Long relId = request.getRelId(); // 删除库 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java index 73677ff7..c4e36116 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.crypto.Signatures; 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.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.SystemUserDAO; import org.dromara.visor.module.infra.entity.domain.SystemUserDO; @@ -87,10 +87,10 @@ public class MineServiceImpl implements MineService { Long userId = SecurityUtils.getLoginUserId(); // 查询用户信息 SystemUserDO record = systemUserDAO.selectById(userId); - Valid.notNull(record, ErrorMessage.USER_ABSENT); + Assert.notNull(record, ErrorMessage.USER_ABSENT); // 对比原始密码 String beforePassword = Signatures.md5(request.getBeforePassword()); - Valid.eq(beforePassword, record.getPassword(), ErrorMessage.BEFORE_PASSWORD_ERROR); + Assert.eq(beforePassword, record.getPassword(), ErrorMessage.BEFORE_PASSWORD_ERROR); // 重置密码 UserResetPasswordRequest reset = new UserResetPasswordRequest(); reset.setId(userId); diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java index 6d495f40..57d153ec 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java @@ -28,7 +28,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.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisStrings; @@ -94,11 +94,11 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateNotifyTemplateById(NotifyTemplateUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("NotifyTemplateService-updateNotifyTemplateById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 NotifyTemplateDO record = notifyTemplateDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 NotifyTemplateDO updateRecord = NotifyTemplateConvert.MAPPER.to(request); updateRecord.setBizType(record.getBizType()); @@ -117,7 +117,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { public NotifyTemplateVO getNotifyTemplateById(Long id) { // 查询 NotifyTemplateDO record = notifyTemplateDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 return NotifyTemplateConvert.MAPPER.to(record); } @@ -187,7 +187,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { log.info("NotifyTemplateService-deleteNotifyTemplateById id: {}", id); // 查询数据 NotifyTemplateDO record = notifyTemplateDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 设置日志参数 OperatorLogs.add(OperatorLogs.NAME, record.getName()); // 删除数据 @@ -226,7 +226,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { .eq(NotifyTemplateDO::getBizType, domain.getBizType()); // 检查是否存在 boolean present = notifyTemplateDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index 51127c51..f9fe6640 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -24,11 +24,11 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Arrays1; -import cn.orionsec.kit.lang.utils.Valid; import com.alibaba.fastjson.JSON; 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.Assert; import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; @@ -117,7 +117,7 @@ public class OperatorLogServiceImpl implements OperatorLogService { @Override public List getLoginHistory(String username, Integer count) { - Valid.inRange(count, 0, 100, ErrorMessage.PARAM_ERROR); + Assert.inRange(count, 0, 100, ErrorMessage.PARAM_ERROR); // 查询 return operatorLogDAO.of() .createWrapper() diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java index ff8c3995..c065d514 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java @@ -29,7 +29,7 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.common.utils.Valid; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.redis.core.utils.RedisStrings; import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.dromara.visor.module.infra.dao.PreferenceDAO; @@ -70,7 +70,7 @@ public class PreferenceServiceImpl implements PreferenceService { Long userId = SecurityUtils.getLoginUserId(); String type = request.getType(); String item = request.getItem(); - Valid.valid(PreferenceTypeEnum::of, type); + Assert.valid(PreferenceTypeEnum::of, type); // 查询 PreferenceDO preference = preferenceDAO.of() .createWrapper() @@ -104,7 +104,7 @@ public class PreferenceServiceImpl implements PreferenceService { Long userId = SecurityUtils.getLoginUserId(); String type = request.getType(); Map config = request.getConfig(); - Valid.valid(PreferenceTypeEnum::of, type); + Assert.valid(PreferenceTypeEnum::of, type); // 查询配置 LambdaQueryWrapper wrapper = preferenceDAO.lambda() .eq(PreferenceDO::getUserId, userId) @@ -148,14 +148,14 @@ public class PreferenceServiceImpl implements PreferenceService { @Override public T getPreferenceByType(String type, List items) { Long userId = SecurityUtils.getLoginUserId(); - PreferenceTypeEnum typeEnum = Valid.valid(PreferenceTypeEnum::of, type); + PreferenceTypeEnum typeEnum = Assert.valid(PreferenceTypeEnum::of, type); // 查询缓存 return this.getPreferenceByCache(userId, typeEnum, items); } @Override public T getDefaultPreferenceByType(String type, List items) { - PreferenceTypeEnum preferenceType = Valid.valid(PreferenceTypeEnum::of, type); + PreferenceTypeEnum preferenceType = Assert.valid(PreferenceTypeEnum::of, type); // 获取默认值 JSONObject config = JSONObject.parseObject(preferenceType.getDefault().serial()); // 解析 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java index e48dd218..bf3ebf1c 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON; 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.mybatis.core.query.Conditions; import org.dromara.visor.module.infra.convert.SystemMenuConvert; @@ -98,9 +98,9 @@ public class SystemMenuServiceImpl implements SystemMenuService { @Override public Integer updateSystemMenuById(SystemMenuUpdateRequest request) { // 查询 - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemMenuDO record = systemMenuDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 SystemMenuDO updateRecord = SystemMenuConvert.MAPPER.to(request); // 验证参数 @@ -126,7 +126,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { public SystemMenuVO getSystemMenuById(Long id) { // 查询 SystemMenuDO record = systemMenuDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 return SystemMenuConvert.MAPPER.to(record); } @@ -204,18 +204,18 @@ public class SystemMenuServiceImpl implements SystemMenuService { Integer status = request.getStatus(); Integer visible = request.getVisible(); if (status != null) { - MenuStatusEnum statusEnum = Valid.valid(MenuStatusEnum::of, status); + MenuStatusEnum statusEnum = Assert.valid(MenuStatusEnum::of, status); // 添加日志参数 OperatorLogs.add(OperatorLogs.LABEL, statusEnum.name()); } if (visible != null) { - MenuVisibleEnum visibleEnum = Valid.valid(MenuVisibleEnum::of, visible); + MenuVisibleEnum visibleEnum = Assert.valid(MenuVisibleEnum::of, visible); // 添加日志参数 OperatorLogs.add(OperatorLogs.LABEL, visibleEnum.name()); } // 查询 SystemMenuDO record = systemMenuDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.NAME, record.getName()); // 从缓存中查询 @@ -247,7 +247,7 @@ public class SystemMenuServiceImpl implements SystemMenuService { public Integer deleteSystemMenu(Long id) { // 查询 SystemMenuDO record = systemMenuDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.NAME, record.getName()); // 从缓存中查询 @@ -311,30 +311,30 @@ public class SystemMenuServiceImpl implements SystemMenuService { */ private void validateRequest(SystemMenuDO domain, Integer menuType) { // 父id不能为当前id - Valid.isFalse(Objects.equals(domain.getParentId(), domain.getId()), ErrorMessage.INVALID_PARENT_MENU); + Assert.isFalse(Objects.equals(domain.getParentId(), domain.getId()), ErrorMessage.INVALID_PARENT_MENU); // 检查菜单类型 - MenuTypeEnum type = Valid.valid(MenuTypeEnum::of, menuType); + MenuTypeEnum type = Assert.valid(MenuTypeEnum::of, menuType); // 验证父菜单参数 if (MenuTypeEnum.PARENT_MENU.equals(type)) { // 父菜单创建的 parentId 为 0 domain.setParentId(Const.ROOT_PARENT_ID); // 验证必填参数 - Valid.valid(SystemMenuConvert.MAPPER.toMenuValidate(domain)); + Assert.valid(SystemMenuConvert.MAPPER.toMenuValidate(domain)); return; } // 验证 parentId 是否存在 - SystemMenuDO parent = Valid.notNull(systemMenuDAO.selectById(domain.getParentId()), ErrorMessage.PARENT_MENU_ABSENT); + SystemMenuDO parent = Assert.notNull(systemMenuDAO.selectById(domain.getParentId()), ErrorMessage.PARENT_MENU_ABSENT); // 验证子菜单/功能参数 if (MenuTypeEnum.SUB_MENU.equals(type)) { // 验证必填参数 - Valid.valid(SystemMenuConvert.MAPPER.toMenuValidate(domain)); + Assert.valid(SystemMenuConvert.MAPPER.toMenuValidate(domain)); // 父级必须为父菜单 - Valid.eq(parent.getType(), MenuTypeEnum.PARENT_MENU.getType(), ErrorMessage.INVALID_PARENT_MENU); + Assert.eq(parent.getType(), MenuTypeEnum.PARENT_MENU.getType(), ErrorMessage.INVALID_PARENT_MENU); } else if (MenuTypeEnum.FUNCTION.equals(type)) { // 验证必填参数 - Valid.valid(SystemMenuConvert.MAPPER.toFunctionValidate(domain)); + Assert.valid(SystemMenuConvert.MAPPER.toFunctionValidate(domain)); // 父级必须不能为自己 - Valid.neq(parent.getType(), MenuTypeEnum.FUNCTION.getType(), ErrorMessage.INVALID_PARENT_MENU); + Assert.neq(parent.getType(), MenuTypeEnum.FUNCTION.getType(), ErrorMessage.INVALID_PARENT_MENU); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java index d08515cf..2d78fb50 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java @@ -27,7 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorCode; 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.mybatis.core.query.Conditions; import org.dromara.visor.module.infra.convert.SystemMenuConvert; @@ -79,7 +79,7 @@ public class SystemRoleMenuServiceImpl implements SystemRoleMenuService { Long roleId = request.getRoleId(); List menuIdList = request.getMenuIdList(); // 检查角色是否存在 - SystemRoleDO role = Valid.notNull(systemRoleDAO.selectById(roleId), ErrorMessage.ROLE_ABSENT); + SystemRoleDO role = Assert.notNull(systemRoleDAO.selectById(roleId), ErrorMessage.ROLE_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.NAME, role.getName()); OperatorLogs.add(OperatorLogs.CODE, role.getCode()); diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index 76639068..ba54487d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON; 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.infra.convert.SystemRoleConvert; import org.dromara.visor.module.infra.dao.SystemRoleDAO; @@ -101,9 +101,9 @@ public class SystemRoleServiceImpl implements SystemRoleService { @Override public Integer updateSystemRoleById(SystemRoleUpdateRequest request) { // 查询 - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemRoleDO record = systemRoleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.ROLE_ABSENT); + Assert.notNull(record, ErrorMessage.ROLE_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.CODE, record.getCode()); // 转换 @@ -122,15 +122,15 @@ public class SystemRoleServiceImpl implements SystemRoleService { @Override public Integer updateRoleStatus(SystemRoleStatusRequest request) { // 查询 - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemRoleDO record = systemRoleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 检查是否为管理员角色 - Valid.isTrue(!RoleDefine.isAdmin(record.getCode()), ErrorMessage.UNABLE_OPERATE_ADMIN_ROLE); + Assert.isTrue(!RoleDefine.isAdmin(record.getCode()), ErrorMessage.UNABLE_OPERATE_ADMIN_ROLE); // 转换 SystemRoleDO updateRecord = SystemRoleConvert.MAPPER.to(request); Integer status = updateRecord.getStatus(); - RoleStatusEnum statusEnum = Valid.valid(RoleStatusEnum::of, status); + RoleStatusEnum statusEnum = Assert.valid(RoleStatusEnum::of, status); // 添加日志参数 OperatorLogs.add(OperatorLogs.CODE, record.getCode()); OperatorLogs.add(OperatorLogs.NAME, record.getName()); @@ -150,7 +150,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { public SystemRoleVO getSystemRoleById(Long id) { // 查询角色 SystemRoleDO record = systemRoleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.ROLE_ABSENT); + Assert.notNull(record, ErrorMessage.ROLE_ABSENT); // 转换 return SystemRoleConvert.MAPPER.to(record); } @@ -188,13 +188,13 @@ public class SystemRoleServiceImpl implements SystemRoleService { public Integer deleteSystemRoleById(Long id) { // 查询角色 SystemRoleDO record = systemRoleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); String code = record.getCode(); // 添加日志参数 OperatorLogs.add(OperatorLogs.CODE, code); OperatorLogs.add(OperatorLogs.NAME, record.getName()); // 检查是否为管理员角色 - Valid.isTrue(!RoleDefine.isAdmin(code), ErrorMessage.UNABLE_OPERATE_ADMIN_ROLE); + Assert.isTrue(!RoleDefine.isAdmin(code), ErrorMessage.UNABLE_OPERATE_ADMIN_ROLE); // 删除角色 int effect = systemRoleDAO.deleteById(id); log.info("SystemRoleService-deleteSystemRole id: {}, effect: {}", id, effect); @@ -228,7 +228,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { .eq(SystemRoleDO::getName, domain.getName()); // 检查是否存在 boolean present = systemRoleDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.NAME_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** @@ -244,7 +244,7 @@ public class SystemRoleServiceImpl implements SystemRoleService { .eq(SystemRoleDO::getCode, domain.getCode()); // 检查是否存在 boolean present = systemRoleDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.CODE_PRESENT); + Assert.isFalse(present, ErrorMessage.CODE_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java index 01a19ef1..07a7c38b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.common.utils.Requests; -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; @@ -100,12 +100,12 @@ public class SystemUserManagementServiceImpl implements SystemUserManagementServ @Override public void offlineUserSession(UserSessionOfflineRequest request) { - Long userId = Valid.notNull(request.getUserId()); + Long userId = Assert.notNull(request.getUserId()); Long timestamp = request.getTimestamp(); log.info("SystemUserManagementService offlineUserSession userId: {}, timestamp: {}", userId, timestamp); // 查询用户 SystemUserDO user = systemUserDAO.selectById(userId); - Valid.notNull(user, ErrorMessage.USER_ABSENT); + Assert.notNull(user, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, user.getUsername()); // 删除刷新缓存 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java index 284237ef..6359c695 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java @@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.common.security.UserRole; -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.RedisStrings; import org.dromara.visor.module.infra.dao.SystemRoleDAO; @@ -95,7 +95,7 @@ public class SystemUserRoleServiceImpl implements SystemUserRoleService { Long userId = request.getId(); // 查询用户 SystemUserDO user = systemUserDAO.selectById(userId); - Valid.notNull(user, ErrorMessage.USER_ABSENT); + Assert.notNull(user, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, user.getUsername()); // 删除用户关联 @@ -116,7 +116,7 @@ public class SystemUserRoleServiceImpl implements SystemUserRoleService { List roleIdList = request.getRoleIdList(); // 查询用户 SystemUserDO user = systemUserDAO.selectById(userId); - Valid.notNull(user, ErrorMessage.USER_ABSENT); + Assert.notNull(user, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, user.getUsername()); // 查询角色 @@ -128,7 +128,7 @@ public class SystemUserRoleServiceImpl implements SystemUserRoleService { .map(SystemRoleDO::getId) .collect(Collectors.toList()); for (Long roleId : roleIdList) { - Valid.in(roleId, userRoleIdLists, ErrorMessage.ROLE_CODE_ABSENT, roleId); + Assert.in(roleId, userRoleIdLists, ErrorMessage.ROLE_CODE_ABSENT, roleId); } } // 删除用户角色关联 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index a5aa2c74..ffdc14c5 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -33,7 +33,7 @@ import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorCode; 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.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.RedisStrings; @@ -138,9 +138,9 @@ public class SystemUserServiceImpl implements SystemUserService { @Override public Integer updateSystemUserById(SystemUserUpdateRequest request) { // 查询 - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); SystemUserDO record = systemUserDAO.selectById(id); - Valid.notNull(record, ErrorMessage.USER_ABSENT); + Assert.notNull(record, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, record.getUsername()); // 转换 @@ -165,10 +165,10 @@ public class SystemUserServiceImpl implements SystemUserService { if (id.equals(SecurityUtils.getLoginUserId())) { throw ErrorCode.UNSUPPOETED.exception(); } - UserStatusEnum status = Valid.valid(UserStatusEnum::of, request.getStatus()); + UserStatusEnum status = Assert.valid(UserStatusEnum::of, request.getStatus()); // 查询用户 SystemUserDO record = systemUserDAO.selectById(id); - Valid.notNull(record, ErrorMessage.USER_ABSENT); + Assert.notNull(record, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, record.getUsername()); OperatorLogs.add(OperatorLogs.STATUS_NAME, status.name()); @@ -194,7 +194,7 @@ public class SystemUserServiceImpl implements SystemUserService { public SystemUserVO getSystemUserById(Long id) { // 查询用户 SystemUserDO record = systemUserDAO.selectById(id); - Valid.notNull(record, ErrorMessage.USER_ABSENT); + Assert.notNull(record, ErrorMessage.USER_ABSENT); // 查询角色 List roles = systemRoleDAO.selectRoleByUserId(id); // 返回 @@ -258,7 +258,7 @@ public class SystemUserServiceImpl implements SystemUserService { } // 查询用户列表 List userList = systemUserDAO.selectBatchIds(idList); - Valid.notEmpty(userList, ErrorMessage.USER_ABSENT); + Assert.notEmpty(userList, ErrorMessage.USER_ABSENT); // 添加日志参数 idList = userList.stream() .map(SystemUserDO::getId) @@ -304,10 +304,10 @@ public class SystemUserServiceImpl implements SystemUserService { @Override public void resetPassword(UserResetPasswordRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); // 查询用户 SystemUserDO record = systemUserDAO.selectById(id); - Valid.notNull(record, ErrorMessage.USER_ABSENT); + Assert.notNull(record, ErrorMessage.USER_ABSENT); // 添加日志参数 OperatorLogs.add(OperatorLogs.USERNAME, record.getUsername()); // 修改密码 @@ -340,7 +340,7 @@ public class SystemUserServiceImpl implements SystemUserService { .eq(SystemUserDO::getUsername, domain.getUsername()); // 检查是否存在 boolean present = systemUserDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.USERNAME_PRESENT); + Assert.isFalse(present, ErrorMessage.USERNAME_PRESENT); } /** @@ -356,7 +356,7 @@ public class SystemUserServiceImpl implements SystemUserService { .eq(SystemUserDO::getNickname, domain.getNickname()); // 检查是否存在 boolean present = systemUserDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.NICKNAME_PRESENT); + Assert.isFalse(present, ErrorMessage.NICKNAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java index af8e9e7b..7946347f 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java @@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON; 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.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.mybatis.core.utils.DomainFillUtils; @@ -81,10 +81,10 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService { log.info("AlarmPolicyRuleService-createAlarmPolicyRule request: {}", JSON.toJSONString(request)); // 检查指标是否存在 MonitorMetricsDO metrics = monitorMetricsDAO.selectById(request.getMetricsId()); - Valid.notNull(metrics, ErrorMessage.METRICS_ABSENT); + Assert.notNull(metrics, ErrorMessage.METRICS_ABSENT); // 检查告警策略是否存在 AlarmPolicyDO alarmPolicy = alarmPolicyDAO.selectById(request.getPolicyId()); - Valid.notNull(alarmPolicy, ErrorMessage.ALARM_POLICY_ABSENT); + Assert.notNull(alarmPolicy, ErrorMessage.ALARM_POLICY_ABSENT); // 转换 AlarmPolicyRuleDO record = AlarmPolicyRuleConvert.MAPPER.to(request); record.setMetricsMeasurement(metrics.getMeasurement()); @@ -102,14 +102,14 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateAlarmPolicyRuleById(AlarmPolicyRuleUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("AlarmPolicyRuleService-updateAlarmPolicyRuleById id: {}, request: {}", id, JSON.toJSONString(request)); // 检查指标是否存在 MonitorMetricsDO metrics = monitorMetricsDAO.selectById(request.getMetricsId()); - Valid.notNull(metrics, ErrorMessage.METRICS_ABSENT); + Assert.notNull(metrics, ErrorMessage.METRICS_ABSENT); // 查询 AlarmPolicyRuleDO record = alarmPolicyRuleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 AlarmPolicyRuleDO updateRecord = AlarmPolicyRuleConvert.MAPPER.to(request); updateRecord.setMetricsMeasurement(metrics.getMeasurement()); @@ -128,7 +128,7 @@ public class AlarmPolicyRuleServiceImpl implements AlarmPolicyRuleService { log.info("AlarmPolicyRuleService-updateAlarmPolicyRuleSwitch id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 AlarmPolicyRuleDO record = alarmPolicyRuleDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 设置日志参数 OperatorLogs.add(OperatorLogs.SWITCH, switchEnum.name()); // 更新 diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java index d3720556..a0b98134 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson.JSON; 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.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; @@ -121,11 +121,11 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { @Override @Transactional(rollbackFor = Exception.class) public Long copyAlarmPolicy(AlarmPolicyCopyRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("AlarmPolicyService-copyAlarmPolicy id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 AlarmPolicyDO record = alarmPolicyDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 创建策略 Long newId = this.createAlarmPolicy(request); // 复制策略规则 @@ -136,11 +136,11 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateAlarmPolicyById(AlarmPolicyUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("AlarmPolicyService-updateAlarmPolicyById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 AlarmPolicyDO record = alarmPolicyDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 AlarmPolicyDO updateRecord = AlarmPolicyConvert.MAPPER.to(request); // 查询数据是否冲突 @@ -161,7 +161,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { public AlarmPolicyVO getAlarmPolicyById(Long id) { // 查询 AlarmPolicyDO record = alarmPolicyDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 查询通知策略 List notifyIdList = alarmPolicyNotifyService.getAlarmPolicyNotify(id); // 转换 @@ -238,7 +238,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { log.info("AlarmPolicyService-deleteAlarmPolicyById id: {}", id); // 查询数据 AlarmPolicyDO record = alarmPolicyDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 删除主表 int effect = alarmPolicyDAO.deleteById(id); // 设置日志参数 @@ -277,7 +277,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { .eq(AlarmPolicyDO::getName, domain.getName()); // 检查是否存在 boolean present = alarmPolicyDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java index 42d73191..0c445078 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java @@ -32,8 +32,8 @@ import com.influxdb.client.write.Point; 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.common.utils.LockerUtils; -import org.dromara.visor.common.utils.Valid; import org.dromara.visor.framework.influxdb.core.utils.InfluxdbUtils; import org.dromara.visor.module.asset.api.HostApi; import org.dromara.visor.module.asset.entity.dto.host.HostDTO; @@ -112,7 +112,7 @@ public class MonitorAgentEndpointServiceImpl implements MonitorAgentEndpointServ Executable exec = () -> { // 查询主机是否存在 HostDTO host = hostApi.selectByAgentKey(agentKey); - Valid.notNull(host, ErrorMessage.HOST_ABSENT); + Assert.notNull(host, ErrorMessage.HOST_ABSENT); // 查询数据 MonitorHostDO monitorHost = monitorHostDAO.selectByAgentKey(agentKey); MonitorHostConfigDTO newConfig = null; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java index 51c41758..f7888f3c 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java @@ -35,7 +35,7 @@ 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.entity.chart.TimeChartSeries; -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.influxdb.core.query.FluxQueryBuilder; import org.dromara.visor.framework.influxdb.core.utils.InfluxdbUtils; @@ -238,15 +238,15 @@ public class MonitorHostServiceImpl implements MonitorHostService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateMonitorHostById(MonitorHostUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); Long policyId = request.getPolicyId(); log.info("MonitorHostService-updateMonitorHostById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询数据 MonitorHostDO monitorHost = monitorHostDAO.selectById(id); - Valid.notNull(monitorHost, ErrorMessage.DATA_ABSENT); + Assert.notNull(monitorHost, ErrorMessage.DATA_ABSENT); // 查询主机信息 HostDTO host = hostApi.selectById(monitorHost.getHostId()); - Valid.notNull(host, ErrorMessage.HOST_ABSENT); + Assert.notNull(host, ErrorMessage.HOST_ABSENT); // 查询用户信息 Optional.ofNullable(request.getOwnerUserId()) .map(systemUserApi::getUsernameById) @@ -255,7 +255,7 @@ public class MonitorHostServiceImpl implements MonitorHostService { OperatorLogs.add(OperatorLogs.NAME, host.getName()); // 查询策略是否存在 if (policyId != null) { - Valid.notNull(alarmPolicyDAO.selectById(policyId), ErrorMessage.ALARM_POLICY_ABSENT); + Assert.notNull(alarmPolicyDAO.selectById(policyId), ErrorMessage.ALARM_POLICY_ABSENT); } // 转换 MonitorHostDO updateRecord = MonitorHostConvert.MAPPER.to(request); @@ -285,10 +285,10 @@ public class MonitorHostServiceImpl implements MonitorHostService { AlarmSwitchEnum alarmSwitch = AlarmSwitchEnum.of(request.getAlarmSwitch()); // 查询数据 List monitorHostList = monitorHostDAO.selectBatchIds(idList); - Valid.notEmpty(monitorHostList, ErrorMessage.DATA_ABSENT); + Assert.notEmpty(monitorHostList, ErrorMessage.DATA_ABSENT); // 查询主机信息 List hostList = hostApi.selectByIdList(Lists.map(monitorHostList, MonitorHostDO::getHostId)); - Valid.notEmpty(hostList, ErrorMessage.HOST_ABSENT); + Assert.notEmpty(hostList, ErrorMessage.HOST_ABSENT); // 设置日志参数 OperatorLogs.add(OperatorLogs.COUNT, hostList.size()); OperatorLogs.add(OperatorLogs.SWITCH, alarmSwitch.name()); @@ -370,8 +370,8 @@ public class MonitorHostServiceImpl implements MonitorHostService { if (range != null) { query.range(range); } else { - Valid.notNull(request.getStart(), ErrorMessage.PARAM_MISSING); - Valid.notNull(request.getEnd(), ErrorMessage.PARAM_MISSING); + Assert.notNull(request.getStart(), ErrorMessage.PARAM_MISSING); + Assert.notNull(request.getEnd(), ErrorMessage.PARAM_MISSING); } // 设置名称 Set names = null; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java index 4b24e55f..49a931c6 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java @@ -27,7 +27,7 @@ import com.alibaba.fastjson.JSON; 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.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; @@ -96,11 +96,11 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { @Override @Transactional(rollbackFor = Exception.class) public Integer updateMonitorMetricsById(MonitorMetricsUpdateRequest request) { - Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING); + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); log.info("MonitorMetricsService-updateMonitorMetricsById id: {}, request: {}", id, JSON.toJSONString(request)); // 查询 MonitorMetricsDO record = monitorMetricsDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 转换 MonitorMetricsDO updateRecord = MonitorMetricsConvert.MAPPER.to(request); updateRecord.setMeasurement(record.getMeasurement()); @@ -164,7 +164,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { log.info("MonitorMetricsService-deleteMonitorMetricsById id: {}", id); // 检查数据是否存在 MonitorMetricsDO record = monitorMetricsDAO.selectById(id); - Valid.notNull(record, ErrorMessage.DATA_ABSENT); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); // 删除 int effect = monitorMetricsDAO.deleteById(id); // 删除规则 @@ -203,7 +203,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { .eq(MonitorMetricsDO::getValue, domain.getValue()); // 检查是否存在 boolean present = monitorMetricsDAO.of(wrapper).present(); - Valid.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java index 0821bad4..f6398b19 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/guacd/GuacdTunnel.java @@ -24,7 +24,6 @@ package org.dromara.visor.module.terminal.handler.guacd; import cn.orionsec.kit.lang.support.Attempt; import cn.orionsec.kit.lang.utils.Objects1; -import cn.orionsec.kit.lang.utils.Valid; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.io.Streams; import lombok.Getter; @@ -36,6 +35,7 @@ import org.apache.guacamole.net.GuacamoleTunnel; import org.apache.guacamole.net.InetGuacamoleSocket; import org.apache.guacamole.protocol.*; import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.Assert; import org.dromara.visor.module.terminal.handler.guacd.constant.GuacdConst; import org.dromara.visor.module.terminal.handler.guacd.constant.GuacdProtocol; @@ -103,8 +103,8 @@ public class GuacdTunnel implements IGuacdTunnel { @Override public void exec() throws GuacdException { - Valid.notNull(socket, "server is null"); - Valid.notNull(streamHandler, "streamHandler is null"); + Assert.notNull(socket, "server is null"); + Assert.notNull(streamHandler, "streamHandler is null"); // 读取 try { GuacamoleReader reader = tunnel.acquireReader(); diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/SftpSession.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/SftpSession.java index 75367f9b..5f4b36d3 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/SftpSession.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/session/SftpSession.java @@ -33,7 +33,7 @@ import cn.orionsec.kit.net.host.sftp.SftpFile; 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.module.terminal.handler.terminal.model.TerminalChannelProps; import org.dromara.visor.module.terminal.handler.terminal.model.config.TerminalSessionSftpConfig; import org.dromara.visor.module.terminal.handler.terminal.model.response.SftpFileVO; @@ -100,14 +100,14 @@ public class SftpSession extends AbstractTerminalSession