🐛 修复测试.

This commit is contained in:
lijiahang
2024-02-28 14:48:16 +08:00
parent 1a08de36e4
commit ea0c0a0c1e
8 changed files with 21 additions and 8 deletions

View File

@@ -23,11 +23,11 @@ Dashboard 修改)
# 进入仓库目录 # 进入仓库目录
cd orion-ops-pro cd orion-ops-pro
# 修改 docker-compose.yml (建议修改) # 修改 docker-compose.yml (建议修改)
# SECRET_KEY 加密秘钥
# MYSQL_USER mysql 用户名 # MYSQL_USER mysql 用户名
# MYSQL_PASSWORD mysql 用户密码 # MYSQL_PASSWORD mysql 用户密码
# MYSQL_ROOT_PASSWORD mysql root 密码 # MYSQL_ROOT_PASSWORD mysql root 密码
# REDIS_PASSWORD redis 密码 # REDIS_PASSWORD redis 密码
# SECRET_KEY 加密秘钥
# 构建 # 构建
docker compose build docker compose build
``` ```

View File

@@ -9,6 +9,7 @@ import com.orion.lang.utils.Strings;
import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogs;
import com.orion.ops.framework.common.constant.ErrorMessage; import com.orion.ops.framework.common.constant.ErrorMessage;
import com.orion.ops.framework.common.security.PasswordModifier; import com.orion.ops.framework.common.security.PasswordModifier;
import com.orion.ops.framework.common.utils.CryptoUtils;
import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.common.utils.Valid;
import com.orion.ops.framework.redis.core.utils.RedisMaps; import com.orion.ops.framework.redis.core.utils.RedisMaps;
import com.orion.ops.framework.redis.core.utils.barrier.CacheBarriers; import com.orion.ops.framework.redis.core.utils.barrier.CacheBarriers;
@@ -68,6 +69,11 @@ public class HostIdentityServiceImpl implements HostIdentityService {
HostIdentityDO record = HostIdentityConvert.MAPPER.to(request); HostIdentityDO record = HostIdentityConvert.MAPPER.to(request);
// 查询数据是否冲突 // 查询数据是否冲突
this.checkHostIdentityPresent(record); this.checkHostIdentityPresent(record);
// 加密密码
String password = record.getPassword();
if (!Strings.isBlank(password)) {
record.setPassword(CryptoUtils.encryptAsString(password));
}
// 插入 // 插入
int effect = hostIdentityDAO.insert(record); int effect = hostIdentityDAO.insert(record);
log.info("HostIdentityService-createHostIdentity effect: {}", effect); log.info("HostIdentityService-createHostIdentity effect: {}", effect);

View File

@@ -68,6 +68,7 @@ public class SystemRoleServiceImpl implements SystemRoleService {
// 查询编码是否存在 // 查询编码是否存在
this.checkCodePresent(record); this.checkCodePresent(record);
// 插入 // 插入
record.setStatus(RoleStatusEnum.ENABLED.getStatus());
int effect = systemRoleDAO.insert(record); int effect = systemRoleDAO.insert(record);
log.info("SystemRoleService-createSystemRole effect: {}, domain: {}", effect, JSON.toJSONString(record)); log.info("SystemRoleService-createSystemRole effect: {}, domain: {}", effect, JSON.toJSONString(record));
// 设置到缓存 // 设置到缓存

View File

@@ -306,7 +306,7 @@
try { try {
const groups = await cacheStore.loadHostGroups(force); const groups = await cacheStore.loadHostGroups(force);
emits('loading', true); emits('loading', true);
treeData.value = groups; treeData.value = groups || [];
} catch (e) { } catch (e) {
} finally { } finally {
emits('loading', false); emits('loading', false);

View File

@@ -66,6 +66,8 @@ export interface Options {
overviewRulerBorder?: boolean; overviewRulerBorder?: boolean;
// 颜色装饰器 // 颜色装饰器
colorDecorators?: boolean; colorDecorators?: boolean;
// 将溢出小部件显示为 fixed 编辑器较小的话需要设置为 true 否则 suggest 会被覆盖
fixedOverflowWidgets?: boolean;
[key: string]: unknown; [key: string]: unknown;
} }
@@ -94,7 +96,7 @@ export const createDefaultOptions = (): Options => {
scrollBeyondLastLine: false, scrollBeyondLastLine: false,
overviewRulerBorder: false, overviewRulerBorder: false,
colorDecorators: true, colorDecorators: true,
suggest: true, fixedOverflowWidgets: true,
}; };
}; };

View File

@@ -166,8 +166,8 @@
:deep(.arco-tabs-tab) { :deep(.arco-tabs-tab) {
height: 100%; height: 100%;
margin: 0; margin: 0 !important;
padding: 0; padding: 0 !important;
color: var(--color-header-text-1); color: var(--color-header-text-1);
background: var(--color-bg-header-tabs); background: var(--color-bg-header-tabs);
position: relative; position: relative;

View File

@@ -159,7 +159,7 @@
} }
:deep(.arco-upload-list) { :deep(.arco-upload-list) {
max-height: calc(100vh - 388px); max-height: calc(100vh - 386px);
overflow-y: auto; overflow-y: auto;
padding: 0 12px 0 0; padding: 0 12px 0 0;
} }

View File

@@ -13,8 +13,7 @@
:data="transferManager.transferList"> :data="transferManager.transferList">
<!-- 空数据 --> <!-- 空数据 -->
<template #empty> <template #empty>
<a-empty style="flex-direction: column;" <a-empty class="list-empty" description="无传输文件" />
description="无传输文件" />
</template> </template>
<!-- 数据 --> <!-- 数据 -->
<template #item="{ item }"> <template #item="{ item }">
@@ -157,6 +156,11 @@
padding: 0 !important; padding: 0 !important;
} }
.list-empty {
flex-direction: column;
margin-top: 32px;
}
.transfer-item { .transfer-item {
min-height: 36px; min-height: 36px;
padding: 8px 0; padding: 8px 0;