diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 7245772b8b..589f1fd453 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -67,6 +67,12 @@ public class SystemParameterController { @RequiresPermissions("sysparam:read") @PostMapping("/edit/basic") public void editBasic(@RequestBody List systemParameter) { + int timeout = Integer.parseInt(systemParameter.stream().filter( + parameter -> parameter.getParamKey().equals("basic.frontTimeOut") + ).findFirst().get().getParamValue()); + if (timeout < 0 || timeout > 300) { + throw new NumberFormatException("Timeout Range Error!"); + } systemParameterService.editBasic(systemParameter); } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 3f136efd42..d6bd11fad5 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -640,7 +640,7 @@ export default { login_type: 'Default login type', empty_front: 'If empty then default value is 10s', empty_msg: 'If empty then default value is 30 days', - front_error: 'Valid ranger [0 - 100]', + front_error: 'Valid ranger [0 - 300]', msg_error: 'Valid ranger [1 - 365]', SMTP_port: 'SMTP Port', SMTP_account: 'SMTP Account', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9ffd87b0d8..f84284fc55 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -642,7 +642,7 @@ export default { login_type: '默認登錄方式', empty_front: '為空則默認取值10秒', empty_msg: '為空則默認取值30天', - front_error: '請填寫0-100正整數', + front_error: '請填寫0-300正整數', msg_error: '請填寫1-365正整數', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP賬戶', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e464804e7e..214dd8e45d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -643,7 +643,7 @@ export default { login_type: '默认登录方式', empty_front: '为空则默认取10秒', empty_msg: '为空则默认取30天', - front_error: '请填写0-100正整数', + front_error: '请填写0-300正整数', msg_error: '请填写1-365正整数', SMTP_port: 'SMTP端口', SMTP_account: 'SMTP账户', diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index 57b7066349..0da6667bb4 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -86,7 +86,7 @@ export default { rules: { frontTimeOut: [ { - pattern: '^([0-9]{1,2}|100)$', + pattern: '^([0-9]|\\b[1-9]\\d\\b|\\b[1-2]\\d\\d\\b|\\b300\\b)$', message: this.$t('system_parameter_setting.front_error'), trigger: 'blur' }