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-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java
View File

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

26
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java
View File

@@ -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<DataExtraSetDTO> rows, DataExtraTypeEnum type) {
for (DataExtraSetDTO row : rows) {
Valid.valid(row);
Assert.valid(row);
}
List<DataExtraSetRequest> 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<Long, String> 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<Long, String> 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<List<Map<Long, String>>> getExtraItemsValuesByCacheAsync(Long userId, DataExtraTypeEnum type, List<String> 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<Long> keyIdList) {
Valid.notEmpty(keyIdList);
Assert.notEmpty(keyIdList);
return dataExtraDAO.deleteHostKey(keyIdList);
}
@Override
public int deleteHostIdentityExtra(List<Long> identityIdList) {
Valid.notEmpty(identityIdList);
Assert.notEmpty(identityIdList);
return dataExtraDAO.deleteHostIdentity(identityIdList);
}

8
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java
View File

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

12
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java
View File

@@ -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<Long> relIdList) {
Valid.notNull(groupId);
Assert.notNull(groupId);
dataGroupRelService.updateGroupRel(groupId, relIdList);
}
@Override
public void updateRelGroup(DataGroupTypeEnum type, List<Long> 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<Long, List<Long>> groupRelListMap) {
Valid.notEmpty(groupRelListMap);
Assert.notEmpty(groupRelListMap);
dataGroupRelService.addGroupRel(type.name(), Const.SYSTEM_USER_ID, groupRelListMap);
}

4
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java
View File

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

10
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java
View File

@@ -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<Long> 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<Long, List<Long>> groupRelListMap) {
Valid.notEmpty(groupRelListMap);
Assert.notEmpty(groupRelListMap);
dataGroupRelService.addGroupRel(type.name(), userId, groupRelListMap);
}

8
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java
View File

@@ -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<Long> userIdList = dto.getUserIdList();
List<Long> 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);
}

12
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java
View File

@@ -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<Long> 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<List<Long>> 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<Long> relIdList) {
Valid.notNull(type);
Valid.notEmpty(relIdList);
Assert.notNull(type);
Assert.notEmpty(relIdList);
favoriteDAO.deleteFavoriteByRelIdList(type.name(), relIdList);
}

10
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java
View File

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

8
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java
View File

@@ -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<OperatorLogDTO> getOperatorLogPage(OperatorLogQueryDTO request) {
Valid.valid(request);
Assert.valid(request);
// 条件
LambdaQueryWrapper<OperatorLogDO> wrapper = this.buildQueryWrapper(request);
// 查询
@@ -66,7 +66,7 @@ public class OperatorLogApiImpl implements OperatorLogApi {
@Override
public List<OperatorLogDTO> getOperatorLogList(OperatorLogQueryDTO request) {
Valid.valid(request);
Assert.valid(request);
// 条件
LambdaQueryWrapper<OperatorLogDO> 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<OperatorLogDO> wrapper = this.buildQueryWrapper(request);
// 查询

6
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java
View File

@@ -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);
// 创建

6
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java
View File

@@ -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<Long> 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<Long> tagIdList) {
Valid.notNull(relId);
Assert.notNull(relId);
tagRelService.setTagRel(type.name(), relId, tagIdList);
}

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

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

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

@@ -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<Long> 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<Long> groupIdList, Long relId) {
Valid.notNull(relId);
Assert.notNull(relId);
// 删除引用
this.deleteByRelId(type, userId, relId);
// 插入引用

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

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

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

@@ -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<Long> 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<Long> list = RedisLists.range(cacheKey, Long::valueOf);

12
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java
View File

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

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

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

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

@@ -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();
// 删除库

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

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

12
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java
View File

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

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

@@ -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<LoginHistoryVO> 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()

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

@@ -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<String, String> config = request.getConfig();
Valid.valid(PreferenceTypeEnum::of, type);
Assert.valid(PreferenceTypeEnum::of, type);
// 查询配置
LambdaQueryWrapper<PreferenceDO> wrapper = preferenceDAO.lambda()
.eq(PreferenceDO::getUserId, userId)
@@ -148,14 +148,14 @@ public class PreferenceServiceImpl implements PreferenceService {
@Override
public <T> T getPreferenceByType(String type, List<String> 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> T getDefaultPreferenceByType(String type, List<String> items) {
PreferenceTypeEnum preferenceType = Valid.valid(PreferenceTypeEnum::of, type);
PreferenceTypeEnum preferenceType = Assert.valid(PreferenceTypeEnum::of, type);
// 获取默认值
JSONObject config = JSONObject.parseObject(preferenceType.getDefault().serial());
// 解析

32
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.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.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);
}
}

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

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

24
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
View File

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

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

@@ -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());
// 删除刷新缓存

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

@@ -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<Long> 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);
}
}
// 删除用户角色关联

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

@@ -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<SystemRoleDO> roles = systemRoleDAO.selectRoleByUserId(id);
// 返回
@@ -258,7 +258,7 @@ public class SystemUserServiceImpl implements SystemUserService {
}
// 查询用户列表
List<SystemUserDO> 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);
}
/**