center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3759 from dataease/pr@dev@timeout

Browse Source 
feat: 系统的默认超时时间设置为100
This commit is contained in:
王嘉豪 2022-11-15 16:54:24 +08:00 committed by GitHub
commit cd2631c44f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
View File

@ -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")

2
frontend/src/lang/en.js
View File

@ -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]',

2
frontend/src/lang/tw.js
View File

@ -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正整數',

2
frontend/src/lang/zh.js
View File

@ -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正整数',

2
frontend/src/utils/request.js
View File

@ -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 = () => {