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

🔨 修改配置.

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

4
orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java
View File

@@ -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<Message extends PushMessage> implements IP
*/
protected void validateMessage(Message message) {
// 验证消息
Valid.valid(message);
Assert.valid(message);
}
/**

4
orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java
View File

@@ -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<DingPushMessage> {
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());
}
}

4
orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java
View File

@@ -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<FeiShuPushMessage> {
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());
}
}

4
orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java
View File

@@ -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<WeComPushMessage> {
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());
}
}

4
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java
View File

@@ -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);

6
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java
View File

@@ -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 <T, E> LambdaQueryWrapper<T> eq(SFunction<T, E> mapping, E e) {
Valid.notNull(e, ErrorMessage.INVALID_PARAM);
Assert.notNull(e, ErrorMessage.INVALID_PARAM);
return new LambdaQueryWrapper<T>().eq(mapping, e);
}
@@ -95,7 +95,7 @@ public class Conditions {
* @return wrapper
*/
public static <T, E> LambdaQueryWrapper<T> in(SFunction<T, E> mapping, Collection<E> es) {
Valid.notEmpty(es, ErrorMessage.INVALID_PARAM);
Assert.notEmpty(es, ErrorMessage.INVALID_PARAM);
return new LambdaQueryWrapper<T>().in(mapping, es);
}

32
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java
View File

@@ -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<T> {
*/
@SuppressWarnings("unchecked")
public static <T extends BaseDO> DataQuery<T> create(Class<T> entityClass) {
TableInfo table = Valid.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class");
TableInfo table = Assert.notNull(TableInfoHelper.getTableInfo(entityClass), "notfound mapper class");
Class<BaseMapper<T>> mapperClass = (Class<BaseMapper<T>>) Classes.loadClass(table.getCurrentNamespace());
return new DataQuery<T>(SpringHolder.getBean(mapperClass));
}
public static <T> DataQuery<T> of(BaseMapper<T> dao) {
Valid.notNull(dao, "dao is null");
Assert.notNull(dao, "dao is null");
return new DataQuery<>(dao);
}
public static <T> DataQuery<T> of(BaseMapper<T> dao, Wrapper<T> wrapper) {
Valid.notNull(dao, "dao is null");
Assert.notNull(dao, "dao is null");
return new DataQuery<>(dao, wrapper);
}
public DataQuery<T> 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<T> {
}
public DataQuery<T> wrapper(Wrapper<T> 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<T> {
// -------------------- id --------------------
public T get(Serializable id) {
Valid.notNull(id, "id is null");
Assert.notNull(id, "id is null");
return dao.selectById(id);
}
public <R> R get(Serializable id, Function<T, R> 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<T> 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<T> {
}
public <R> R get(Function<T, R> 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<T> {
}
public <R> List<R> list(Function<T, R> 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<T> {
}
public <R> DataGrid<R> dataGrid(Wrapper<T> countWrapper, Function<T, R> 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<R> pager = new Pager<>(page);
pager.setTotal(count.intValue());

12
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
View File

@@ -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

22
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm
View File

@@ -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<Long> 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);

4
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java
View File

@@ -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);
}

4
orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java
View File

@@ -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> {
}
// 解密参数
String decrypt = RsaParamDecryptUtils.decrypt(value);
return Valid.notNull(decrypt, ErrorMessage.DECRYPT_ERROR);
return Assert.notNull(decrypt, ErrorMessage.DECRYPT_ERROR);
}
}