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

feat: 修改主机额外配置.

Browse Source
This commit is contained in:
lijiahang
2023-12-25 19:03:24 +08:00
parent b2a697f6ba
commit f7cbd7b507
34 changed files with 321 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataPermissionServiceImpl.java
View File

@@ -149,14 +149,17 @@ public class DataPermissionServiceImpl implements DataPermissionService {
List<Long> list = RedisLists.range(cacheKey, Long::valueOf);
if (list.isEmpty()) {
LambdaQueryWrapper<DataPermissionDO> wrapper = dataPermissionDAO.lambda()
.eq(DataPermissionDO::getType, type)
.eq(DataPermissionDO::getUserId, userId);
// 查询用户角色
.eq(DataPermissionDO::getType, type);
if (dataType.isToRole()) {
// 查询用户角色
List<Long> roleIdList = systemUserRoleDAO.selectRoleIdByUserId(userId);
if (!roleIdList.isEmpty()) {
wrapper.or().in(DataPermissionDO::getRoleId, roleIdList);
}
wrapper.and(s -> s.eq(DataPermissionDO::getUserId, userId)
.or()
.in(!roleIdList.isEmpty(), DataPermissionDO::getRoleId, roleIdList)
);
} else {
// 单用户
wrapper.eq(DataPermissionDO::getUserId, userId);
}
// 查询数据库
list = dataPermissionDAO.of()

12
orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml
View File

@@ -26,7 +26,11 @@
UPDATE data_extra
SET value = JSON_REPLACE(value,
"$.keyId", NULL,
"$.authType", IF(JSON_EXTRACT(value, "$.authType") = 'KEY', 'DEFAULT', JSON_EXTRACT(value, "$.authType")))
"$.authType", IF(
JSON_EXTRACT(value, "$.authType") = 'CUSTOM_KEY',
'DEFAULT',
JSON_EXTRACT(value, "$.authType")
))
WHERE deleted = 0
AND type = 'HOST'
AND item = 'ssh'
@@ -37,7 +41,11 @@
UPDATE data_extra
SET value = JSON_REPLACE(value,
"$.identityId", NULL,
"$.authType", IF(JSON_EXTRACT(value, "$.authType") = 'IDENTITY', 'DEFAULT', JSON_EXTRACT(value, "$.authType")))
"$.authType", IF(
JSON_EXTRACT(value, "$.authType") = 'CUSTOM_IDENTITY',
'DEFAULT',
JSON_EXTRACT(value, "$.authType")
))
WHERE deleted = 0
AND type = 'HOST'
AND item = 'ssh'