Merge branch 'main' into feat/margin-padding

Author: FalkWolsky

server/api-service/lowcoder-domain/pom.xml

@@ -136,6 +136,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongo-java-driver</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml

@@ -127,10 +127,6 @@
             <artifactId>netty-http-authenticator</artifactId>
             <version>1.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLExecutor.java

@@ -21,11 +21,8 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -35,7 +32,6 @@
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.bson.internal.Base64;
 import org.lowcoder.plugin.graphql.constants.ResponseDataType;
 import org.lowcoder.plugin.graphql.helpers.AuthHelper;
 import org.lowcoder.plugin.graphql.helpers.BufferingFilter;
@@ -427,13 +423,13 @@ private ResponseBodyData parseResponseDataInfo(byte[] body, MediaType contentTyp
                 MediaType.IMAGE_JPEG.equals(contentType) ||
                 MediaType.IMAGE_PNG.equals(contentType)) {
             return ResponseBodyData.builder()
-                    .body(Base64.encode(body))
+                    .body(Base64.getEncoder().encode(body))
                     .dataType(ResponseDataType.IMAGE)
                     .build();
         }
         if (BINARY_DATA_TYPES.contains(contentType.toString())) {
             return ResponseBodyData.builder()
-                    .body(Base64.encode(body))
+                    .body(Base64.getEncoder().encode(body))
                     .dataType(ResponseDataType.BINARY)
                     .build();
         }

server/api-service/lowcoder-plugins/restApiPlugin/pom.xml

@@ -96,11 +96,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java

@@ -29,7 +29,6 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.bson.internal.Base64;
 import org.lowcoder.plugin.restapi.constants.ResponseDataType;
 import org.lowcoder.plugin.restapi.helpers.AuthHelper;
 import org.lowcoder.plugin.restapi.helpers.BufferingFilter;
@@ -398,13 +397,13 @@ private ResponseBodyData parseResponseDataInfo(byte[] body, MediaType contentTyp
 
         if (isPicture(contentType)) {
             return ResponseBodyData.builder()
-                    .body(Base64.encode(body))
+                    .body(Base64.getEncoder().encode(body))
                     .dataType(ResponseDataType.IMAGE)
                     .build();
         }
         if (isBinary(contentType)) {
             return ResponseBodyData.builder()
-                    .body(Base64.encode(body))
+                    .body(Base64.getEncoder().encode(body))
                     .dataType(ResponseDataType.BINARY)
                     .build();
         }

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java

@@ -19,7 +19,7 @@ public enum BizError {
     INFRA_REDIS_TIMEOUT(500, 5006),
     INFRA_MONGO_TIMEOUT(500, 5007),
     INVALID_PERMISSION_OPERATION(500, 5008),
-    REQUEST_THROTTLED(500, 5009),
+    REQUEST_THROTTLED(429, 5009),
     SERVER_NOT_READY(503, 5010),
     REDIRECT(302, 5011),
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ThrottlingFilter.java

@@ -6,6 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.lowcoder.sdk.config.dynamic.ConfigCenter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.Ordered;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
@@ -30,8 +31,10 @@
 @Component
 public class ThrottlingFilter implements WebFilter, Ordered {
 
-    private static final int DEFAULT_RATE_THRESHOLD = 50;
+	@Value("${default.apiRateLimit:50}")
+    private int defaultApiRateLimit;
 
+    
     private final Map<String, RateLimiterWrapper> rateLimiterMap = new ConcurrentHashMap<>();
     private Supplier<Map<String, Integer>> urlRateLimiter;
 
@@ -52,7 +55,7 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, @Nonnull WebFilter
 
         RateLimiterWrapper rateLimiter = rateLimiterMap.compute(requestUrl,
                 (url, currentLimiter) -> {
-                    int targetRate = urlRateLimiter.get().getOrDefault(url, DEFAULT_RATE_THRESHOLD);
+                    int targetRate = urlRateLimiter.get().getOrDefault(url, defaultApiRateLimit);
                     if (currentLimiter == null) {
                         return RateLimiterWrapper.create(targetRate);
                     }

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

@@ -29,6 +29,7 @@ default:
   org-group-count: 100
   org-app-count: 1000
   developer-count: 50
+  api-rate-limit: 50 
 
 common:
   cookie-name: LOCAL_LOWCODER_TOKEN

server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml

@@ -29,6 +29,7 @@ default:
   org-group-count: 100
   org-app-count: 1000
   developer-count: 50
+  api-rate-limit: 50
 
 common:
   cookie-name: LOWCODER_CE_SELFHOST_TOKEN

server/api-service/pom.xml

@@ -292,11 +292,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>2.0.1.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.mongodb</groupId>
-                <artifactId>mongo-java-driver</artifactId>
-                <version>3.12.8</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>