querytimeout unit to second, limit to max, rename env variable

Author: Thomasr

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/util/QueryTimeoutUtils.java

@@ -19,11 +19,11 @@
 @Component
 public final class QueryTimeoutUtils {
 
-    private static int defaultQueryTimeoutMillis = 10000;
+    private static int defaultQueryTimeout = 10;
 
     @Value("${default.query-timeout}")
-    public void setDefaultQueryTimeoutMillis(int defaultQueryTimeoutMillis) {
-        QueryTimeoutUtils.defaultQueryTimeoutMillis = defaultQueryTimeoutMillis;
+    public void setDefaultQueryTimeoutMillis(int defaultQueryTimeout) {
+        QueryTimeoutUtils.defaultQueryTimeout = defaultQueryTimeout;
     }
 
     public static int parseQueryTimeoutMs(String timeoutStr, Map<String, Object> paramMap, int maxQueryTimeout) {
@@ -33,7 +33,7 @@ public static int parseQueryTimeoutMs(String timeoutStr, Map<String, Object> par
     @VisibleForTesting
     public static int parseQueryTimeoutMs(String timeoutStr, int maxQueryTimeout) {
         if (StringUtils.isBlank(timeoutStr)) {
-            return defaultQueryTimeoutMillis;
+            return Math.min(defaultQueryTimeout * 1000, (int)Duration.ofSeconds(maxQueryTimeout).toMillis());
         }
 
         Pair<String, Integer> unitInfo = getUnitInfo(timeoutStr);

server/api-service/lowcoder-server/src/main/resources/application-debug.yaml

@@ -54,4 +54,4 @@ logging:
     org.lowcoder: debug
 
 default:
-  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT_MILLIS:10000}
+  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT:10s}

server/api-service/lowcoder-server/src/main/resources/application.yaml

@@ -53,7 +53,7 @@ default:
   org-app-count: ${LOWCODER_MAX_APPS_PER_ORG:1000}
   developer-count: ${LOWCODER_MAX_DEVELOPERS:50}
   api-rate-limit: ${LOWCODER_API_RATE_LIMIT:50}
-  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT_MILLIS:10000}
+  query-timeout: ${LOWCODER_DEFAULT_QUERY_TIMEOUT:10}
 
 common:
   cookie-name: LOWCODER_CE_SELFHOST_TOKEN