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/SystemSettingServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java index e40d0e5c..1054c524 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java @@ -29,7 +29,6 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.crypto.Keys; import cn.orionsec.kit.lang.utils.crypto.RSA; import cn.orionsec.kit.spring.SpringHolder; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.AppConst; import org.dromara.visor.common.constant.ConfigKeys; @@ -124,28 +123,12 @@ public class SystemSettingServiceImpl implements SystemSettingService { @Override public void updateSystemSetting(SystemSettingUpdateRequest request) { - String type = request.getType(); - String configKey = request.getConfigKey(); - String value = request.getValue(); - // 删除 - systemSettingDAO.delete(Conditions.eq(SystemSettingDO::getConfigKey, configKey)); - // 插入 - SystemSettingDO insert = SystemSettingDO.builder() - .type(type) - .configKey(configKey) - .value(Strings.def(value)) + SystemSettingUpdateBatchRequest params = SystemSettingUpdateBatchRequest.builder() + .type(request.getType()) + .settings(Maps.of(request.getConfigKey(), request.getValue())) .build(); - systemSettingDAO.insert(insert); // 更新 - SystemSettingDO update = new SystemSettingDO(); - update.setValue(value); - LambdaQueryWrapper wrapper = systemSettingDAO.lambda() - .eq(SystemSettingDO::getConfigKey, configKey); - systemSettingDAO.update(update, wrapper); - // 删除缓存 - RedisUtils.delete(SystemSettingKeyDefine.SETTING); - // 触发修改事件 - SpringHolder.publishEvent(ConfigUpdateEvent.of(configKey, value)); + this.updateSystemSettingBatch(params); } @Override diff --git a/orion-visor-ui/src/router/routes/modules/monitor.ts b/orion-visor-ui/src/router/routes/modules/monitor.ts index fa8c22c2..437d786e 100644 --- a/orion-visor-ui/src/router/routes/modules/monitor.ts +++ b/orion-visor-ui/src/router/routes/modules/monitor.ts @@ -23,7 +23,7 @@ const MONITOR: AppRouteRecordRaw = { component: () => import('@/views/monitor/alarm-policy/index.vue'), }, { - name: 'alarmEvent', + name: 'hostAlarmEvent', path: '/monitor/alarm-event', component: () => import('@/views/monitor/alarm-event/index.vue'), }, diff --git a/orion-visor-ui/src/router/routes/modules/user.ts b/orion-visor-ui/src/router/routes/modules/user.ts index ee068384..c06dea8d 100644 --- a/orion-visor-ui/src/router/routes/modules/user.ts +++ b/orion-visor-ui/src/router/routes/modules/user.ts @@ -7,12 +7,12 @@ const USER: AppRouteRecordRaw = { component: DEFAULT_LAYOUT, children: [ { - name: 'role', + name: 'userRole', path: '/user/role', component: () => import('@/views/user/role/index.vue'), }, { - name: 'user', + name: 'userList', path: '/user/list', component: () => import('@/views/user/user/index.vue'), }, @@ -26,6 +26,16 @@ const USER: AppRouteRecordRaw = { path: '/user/operator-log', component: () => import('@/views/user/operator-log/index.vue'), }, + { + name: 'userSession', + path: '/user/session', + component: () => import('@/views/user/user-session/index.vue'), + }, + { + name: 'lockedUser', + path: '/user/locked', + component: () => import('@/views/user/locked-user/index.vue'), + }, ], }; diff --git a/orion-visor-ui/src/views/asset/host-list/types/const.ts b/orion-visor-ui/src/views/asset/host-list/types/const.ts index 6ff5917e..fdb6c0b1 100644 --- a/orion-visor-ui/src/views/asset/host-list/types/const.ts +++ b/orion-visor-ui/src/views/asset/host-list/types/const.ts @@ -1,18 +1,13 @@ import WindowsIcon from '@/assets/images/icon/os_windows.svg'; import LinuxIcon from '@/assets/images/icon/os_linux.svg'; import DarwinIcon from '@/assets/images/icon/os_darwin.svg'; +import { TagColors } from '@/types/const'; // 表名称 export const TableName = 'host'; // tag 颜色 -export const tagColor = [ - 'arcoblue', - 'green', - 'purple', - 'pinkpurple', - 'magenta' -]; +export const tagColor = TagColors; // 主机类型 export const HostType = { diff --git a/orion-visor-ui/src/views/user/role/index.vue b/orion-visor-ui/src/views/user/role/index.vue index b7a3a3a8..aeec6524 100644 --- a/orion-visor-ui/src/views/user/role/index.vue +++ b/orion-visor-ui/src/views/user/role/index.vue @@ -16,7 +16,7 @@ diff --git a/orion-visor-ui/src/views/user/user/index.vue b/orion-visor-ui/src/views/user/user/index.vue index 9e6dd2b6..16b54f76 100644 --- a/orion-visor-ui/src/views/user/user/index.vue +++ b/orion-visor-ui/src/views/user/user/index.vue @@ -19,7 +19,7 @@