From cba0c4130cf01b7ca60201284b157146de3ade4d Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 30 Nov 2023 16:35:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20API=20=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/lang/en.js                                  | 2 +-
 core/frontend/src/lang/tw.js                                  | 2 +-
 core/frontend/src/lang/zh.js                                  | 2 +-
 core/frontend/src/views/system/datasource/DsConfiguration.vue | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 187004dd64..28943c1bd5 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -1944,7 +1944,7 @@ export default {
     please_input_max_pool_size: 'Please enter the maximum number of connections',
     please_input_max_idle_time: 'Please enter the maximum idle (seconds)',
     please_input_acquire_increment: 'Please enter the growth number',
-    please_input_query_timeout: 'Please enter query timeout，no less then zero',
+    please_input_query_timeout: 'Please enter query timeout，Valid range [1 - 300]',
     please_input_connect_timeout: 'Please enter the connection timeout (seconds)',
     no_less_then_0: 'Parameters in advanced settings cannot be less than zero',
     port_no_less_then_0: 'Port cannot be less than zero',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index cf3a0c0a50..c9df7fe82d 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -1936,7 +1936,7 @@ export default {
     please_input_max_pool_size: '請輸入最大連接數',
     please_input_max_idle_time: '請輸入最大空閑(秒)',
     please_input_acquire_increment: '請輸入增長數',
-    please_input_query_timeout: '請輸入查詢超時，不小于零',
+    please_input_query_timeout: '請輸入查詢超時，請填寫1-300正整數',
     please_input_connect_timeout: '請輸輸入連接超時(秒)',
     no_less_then_0: '高級設置中的參數不能小於零',
     port_no_less_then_0: '端口不能小於零',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 9a7081548b..45cf7ff125 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -1936,7 +1936,7 @@ export default {
     please_input_max_pool_size: '请输入最大连接数',
     please_input_max_idle_time: '请输入最大空闲(秒)',
     please_input_acquire_increment: '请输入增长数',
-    please_input_query_timeout: '请输入查询超时,不小于零',
+    please_input_query_timeout: '请输入查询超时,填写1-300正整数',
     please_input_connect_timeout: '请输入连接超时(秒)',
     no_less_then_0: '高级设置中的参数不能小于零',
     port_no_less_then_0: '端口不能小于零',
diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue
index 74c922f4d6..78e27d1705 100644
--- a/core/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -1170,6 +1170,10 @@ export default {
             callback(new Error(i18n.t('datasource.please_input_query_timeout')))
             return
         }
+        if(value <= 0 ||  value > 300){
+            callback(new Error(i18n.t('datasource.please_input_query_timeout')))
+            return
+        }
         callback()
       },
     next() {