From 81b9bacb9669956ee42e2445cc03d542e28f8bb8 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 21 Jan 2025 10:05:36 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visor/common/constant/ConfigKeys.java | 109 +++++++++++++++++- .../asset/define/config/AppLogConfig.java | 26 ++--- orion-visor-ui/src/api/system/setting.ts | 7 +- .../system/setting/components/log-setting.vue | 39 +++++-- 4 files changed, 154 insertions(+), 27 deletions(-) diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java index 3ef9c0ad..b34b659d 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java @@ -31,14 +31,119 @@ package org.dromara.visor.common.constant; */ public interface ConfigKeys { + /** + * SFTP 文件预览大小 + */ + String SFTP_PREVIEW_SIZE = "sftp_previewSize"; + + /** + * SFTP 重复文件备份 + */ + String SFTP_UPLOAD_PRESENT_BACKUP = "sftp_uploadPresentBackup"; + + /** + * SFTP 备份文件名称 + */ + String SFTP_UPLOAD_BACKUP_FILE_NAME = "sftp_uploadBackupFileName"; + /** * 加密公钥 */ - String ENCRYPT_PUBLIC_KEY = "encrypt.publicKey"; + String ENCRYPT_PUBLIC_KEY = "encrypt_publicKey"; /** * 加密私钥 */ - String ENCRYPT_PRIVATE_KEY = "encrypt.privateKey"; + String ENCRYPT_PRIVATE_KEY = "encrypt_privateKey"; + + /** + * 日志前端显示行数 + */ + String LOG_WEB_SCROLL_LINES = "log_webScrollLines"; + + /** + * 日志加载偏移行 + */ + String LOG_TRACKER_LOAD_LINES = "log_trackerLoadLines"; + + /** + * 日志加载间隔毫秒 + */ + String LOG_TRACKER_LOAD_INTERVAL = "log_trackerLoadInterval"; + + /** + * 是否生成详细的执行日志 + */ + String LOG_EXEC_DETAIL_LOG = "log_execDetailLog"; + + /** + * 凭证有效期分 + */ + String LOGIN_LOGIN_SESSION_TIME = "login_loginSessionTime"; + + /** + * 允许多端登录 + */ + String LOGIN_ALLOW_MULTI_DEVICE = "login_allowMultiDevice"; + + /** + * 允许凭证续签 + */ + String LOGIN_ALLOW_REFRESH = "login_allowRefresh"; + + /** + * 凭证续签最大次数 + */ + String LOGIN_MAX_REFRESH_COUNT = "login_maxRefreshCount"; + + /** + * 凭证续签间隔分 + */ + String LOGIN_REFRESH_INTERVAL = "login_refreshInterval"; + + /** + * 登录失败锁定 + */ + String LOGIN_LOGIN_FAILED_LOCK = "login_loginFailedLock"; + + /** + * 登录失败锁定阈值分 + */ + String LOGIN_LOGIN_FAILED_LOCK_THRESHOLD = "login_loginFailedLockThreshold"; + + /** + * 登录失败锁定时间分 + */ + String LOGIN_LOGIN_FAILED_LOCK_TIME = "login_loginFailedLockTime"; + + /** + * 登录失败发信 + */ + String LOGIN_LOGIN_FAILED_SEND = "login_loginFailedSend"; + + /** + * 登录失败发信阈值 + */ + String LOGIN_LOGIN_FAILED_SEND_THRESHOLD = "login_loginFailedSendThreshold"; + + /** + * 是否开启自动清理命令记录 + */ + String AUTO_CLEAR_EXEC_LOG_ENABLED = "autoClear_execLogEnabled"; + + /** + * 自动清理命令记录保留天数 + */ + String AUTO_CLEAR_EXEC_LOG_KEEP_DAYS = "autoClear_execLogKeepDays"; + + /** + * 是否开启自动清理终端连接记录 + */ + String AUTO_CLEAR_TERMINAL_LOG_ENABLED = "autoClear_terminalLogEnabled"; + + /** + * 自动清理终端连接记录保留天数 + */ + String AUTO_CLEAR_TERMINAL_LOG_KEEP_DAYS = "autoClear_terminalLogKeepDays"; } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppLogConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppLogConfig.java index a9795650..cb0437f0 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppLogConfig.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppLogConfig.java @@ -40,34 +40,34 @@ public class AppLogConfig { /** * 日志加载偏移行 */ - private final ConfigRef trackerOffset; + private final ConfigRef trackerLoadLines; /** * 日志加载间隔毫秒 */ - private final ConfigRef trackerDelay; + private final ConfigRef trackerLoadInterval; /** - * 是否拼接 ansi 执行状态日志 + * 是否生成详细的执行日志 */ - private final ConfigRef execAppendAnsi; + private final ConfigRef execDetailLog; public AppLogConfig(ConfigStore configStore) { - this.trackerOffset = configStore.int32(ConfigKeys.LOG_TRACKER_OFFSET); - this.trackerDelay = configStore.int32(ConfigKeys.LOG_TRACKER_DELAY); - this.execAppendAnsi = configStore.bool(ConfigKeys.LOG_EXEC_APPEND_ANSI); + this.trackerLoadLines = configStore.int32(ConfigKeys.LOG_TRACKER_LOAD_LINES); + this.trackerLoadInterval = configStore.int32(ConfigKeys.LOG_TRACKER_LOAD_INTERVAL); + this.execDetailLog = configStore.bool(ConfigKeys.LOG_EXEC_DETAIL_LOG); } - public Integer getTrackerOffset() { - return trackerOffset.value; + public Integer getTrackerLoadLines() { + return trackerLoadLines.value; } - public Integer getTrackerDelay() { - return trackerDelay.value; + public Integer getTrackerLoadInterval() { + return trackerLoadInterval.value; } - public Boolean getExecAppendAnsi() { - return execAppendAnsi.value; + public Boolean getExecDetailLog() { + return execDetailLog.value; } } diff --git a/orion-visor-ui/src/api/system/setting.ts b/orion-visor-ui/src/api/system/setting.ts index 4fcaac5e..ca55626a 100644 --- a/orion-visor-ui/src/api/system/setting.ts +++ b/orion-visor-ui/src/api/system/setting.ts @@ -78,9 +78,10 @@ export interface EncryptSetting { * 日志设置 */ export interface LogSetting { - log_trackerOffset: number; - log_trackerDelay: number; - log_execAppendAnsi: string; + log_webScrollLines: number; + log_trackerLoadLines: number; + log_trackerLoadInterval: number; + log_execDetailLog: string; } /** diff --git a/orion-visor-ui/src/views/system/setting/components/log-setting.vue b/orion-visor-ui/src/views/system/setting/components/log-setting.vue index 90337ab0..b24bce73 100644 --- a/orion-visor-ui/src/views/system/setting/components/log-setting.vue +++ b/orion-visor-ui/src/views/system/setting/components/log-setting.vue @@ -9,26 +9,46 @@ label-align="right" :auto-label-width="true"> - - + + + + + + + - - - -