From c27ea60118fda4dd0820a92171615507c33c145b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 15 Nov 2022 16:44:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/controller/sys/SystemParameterController.java | 2 +- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- frontend/src/utils/request.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 dad2258764..63d59752b4 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -58,7 +58,7 @@ public class SystemParameterController { @GetMapping("/requestTimeOut") public Integer RequestTimeOut() { BasicInfo basicInfo = systemParameterService.basicInfo(); - return StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10; + return StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 100; } @RequiresPermissions("sysparam:read") diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index e5e7effdc3..e5054bb993 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -813,7 +813,7 @@ export default { front_time_out: 'Request timeOut(unit: second, Attention: Refresh browser takes effect after saving)', msg_time_out: 'Message retention time(unit: day)', login_type: 'Default login type', - empty_front: 'If empty then default value is 10s', + empty_front: 'If empty then default value is 100s', empty_msg: 'If empty then default value is 30 days', front_error: 'Valid range [0 - 300]', // 修改了提示信息 msg_error: 'Valid range [1 - 365]', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9cded7a035..8e62814fab 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -813,7 +813,7 @@ export default { front_time_out: '請求超時時間(單位:秒, 註意:保存後刷新瀏覽器生效)', msg_time_out: '消息保留時間(單位:天)', login_type: '默認登錄方式', - empty_front: '為空則默認取值10秒', + empty_front: '為空則默認取值100秒', empty_msg: '為空則默認取值30天', front_error: '請填寫0-300正整數', // 修改了提示信息 msg_error: '請填寫1-365正整數', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 09686cb9b5..93f593d2f5 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -812,7 +812,7 @@ export default { front_time_out: '请求超时时间(单位:秒, 注意:保存后刷新浏览器生效)', msg_time_out: '消息保留时间(单位:天)', login_type: '默认登录方式', - empty_front: '为空则默认取10秒', + empty_front: '为空则默认取100秒', empty_msg: '为空则默认取30天', front_error: '请填写0-300正整数', // 修改了提示信息 msg_error: '请填写1-365正整数', diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index d6fb40edeb..c9baf7f7df 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -15,7 +15,7 @@ const DownErrorKey = Config.DownErrorKey import Cookies from 'js-cookie' const getTimeOut = () => { - let time = 10 + let time = 100 const url = process.env.VUE_APP_BASE_API + 'system/requestTimeOut' const xhr = new XMLHttpRequest() xhr.onreadystatechange = () => {