diff --git a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java index 858d0fa71f..cb54ff938d 100644 --- a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java @@ -110,6 +110,8 @@ public interface ParamConstants { enum BASIC implements ParamConstants { FRONT_TIME_OUT("basic.frontTimeOut"), MSG_TIME_OUT("basic.msgTimeOut"), + + LOG_TIME_OUT("basic.logTimeOut"), DS_CHECK_INTERVAL("basic.dsCheckInterval"), DS_CHECK_INTERVAL_TYPE("basic.dsCheckIntervalType"), DEFAULT_LOGIN_TYPE("basic.loginType"), diff --git a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java index 40e49a008c..8edcc6bde5 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java @@ -13,6 +13,8 @@ public class BasicInfo extends LoginLimitInfo implements Serializable { private String frontTimeOut; @ApiModelProperty("消息保留时间") private String msgTimeOut; + @ApiModelProperty("日志保留时间") + private String logTimeOut; @ApiModelProperty("显示首页") private String openHomePage; @ApiModelProperty("默认登录方式") diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index e3ff651273..8efa2a9671 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -75,6 +75,9 @@ public class SystemParameterService { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.MSG_TIME_OUT.getValue())) { result.setMsgTimeOut(param.getParamValue()); } + if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.LOG_TIME_OUT.getValue())) { + result.setLogTimeOut(param.getParamValue()); + } if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.DEFAULT_LOGIN_TYPE.getValue())) { String paramValue = param.getParamValue(); result.setLoginType(StringUtils.isNotBlank(paramValue) ? Integer.parseInt(paramValue) : 0); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8d9cfbfa66..36464b9ecb 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -866,6 +866,7 @@ export default { no_more_than: 'Size no more than', request_timeout: 'Request timeout', message_retention_time: 'Message retention time', + log_retention_time: 'Log retention time', ds_check_time: 'Data source detection interval', test_mail_recipient: 'Used only as a test mail recipient', to_enable_tsl: 'If the SMTP port is 587, you usually need to enable TSL', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 1a5a2fb66a..d29875e9de 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -866,6 +866,7 @@ export default { no_more_than: '大小不超過', request_timeout: '請求超時時間', message_retention_time: '消息保留時間', + log_retention_time: '日誌保留時間', ds_check_time: '數據源檢測時間間隔', test_mail_recipient: '僅用來作為測試郵件收件人', to_enable_tsl: '如果SMTP埠是587,通常需要啟用TSL', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index b4539f569e..4ed1cbc09c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -865,6 +865,7 @@ export default { no_more_than: '大小不超过', request_timeout: '请求超时时间', message_retention_time: '消息保留时间', + log_retention_time: '日志保留时间', ds_check_time: '数据源检测时间间隔', test_mail_recipient: '仅用来作为测试邮件收件人', to_enable_tsl: '如果SMTP端口是587,通常需要启用TSL', diff --git a/frontend/src/views/system/sysParam/BasicSetting.vue b/frontend/src/views/system/sysParam/BasicSetting.vue index 29bbd1353f..23b46c7b55 100644 --- a/frontend/src/views/system/sysParam/BasicSetting.vue +++ b/frontend/src/views/system/sysParam/BasicSetting.vue @@ -69,6 +69,18 @@ >{{ $t('components.day') }} + + + +