Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6a20c91

Browse files
Merge branch 'main' into feat/margin-padding
2 parents 370bd21 + 11cf265 commit 6a20c91

File tree

10 files changed

+17
-27
lines changed

10 files changed

+17
-27
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@
136136
<groupId>com.google.guava</groupId>
137137
<artifactId>guava</artifactId>
138138
</exclusion>
139+
<exclusion>
140+
<groupId>org.mongodb</groupId>
141+
<artifactId>mongo-java-driver</artifactId>
142+
</exclusion>
139143
</exclusions>
140144
</dependency>
141145
<dependency>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@
127127
<artifactId>netty-http-authenticator</artifactId>
128128
<version>1.5</version>
129129
</dependency>
130-
<dependency>
131-
<groupId>org.mongodb</groupId>
132-
<artifactId>mongo-java-driver</artifactId>
133-
</dependency>
134130
</dependencies>
135131

136132
<build>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
import java.net.URISyntaxException;
2222
import java.nio.charset.StandardCharsets;
2323
import java.text.ParseException;
24-
import java.util.HashMap;
25-
import java.util.List;
26-
import java.util.Map;
24+
import java.util.*;
2725
import java.util.Map.Entry;
28-
import java.util.Set;
2926
import java.util.concurrent.TimeoutException;
3027
import java.util.function.Consumer;
3128
import java.util.stream.Collectors;
@@ -35,7 +32,6 @@
3532

3633
import org.apache.commons.lang3.ObjectUtils;
3734
import org.apache.commons.lang3.StringUtils;
38-
import org.bson.internal.Base64;
3935
import org.lowcoder.plugin.graphql.constants.ResponseDataType;
4036
import org.lowcoder.plugin.graphql.helpers.AuthHelper;
4137
import org.lowcoder.plugin.graphql.helpers.BufferingFilter;
@@ -427,13 +423,13 @@ private ResponseBodyData parseResponseDataInfo(byte[] body, MediaType contentTyp
427423
MediaType.IMAGE_JPEG.equals(contentType) ||
428424
MediaType.IMAGE_PNG.equals(contentType)) {
429425
return ResponseBodyData.builder()
430-
.body(Base64.encode(body))
426+
.body(Base64.getEncoder().encode(body))
431427
.dataType(ResponseDataType.IMAGE)
432428
.build();
433429
}
434430
if (BINARY_DATA_TYPES.contains(contentType.toString())) {
435431
return ResponseBodyData.builder()
436-
.body(Base64.encode(body))
432+
.body(Base64.getEncoder().encode(body))
437433
.dataType(ResponseDataType.BINARY)
438434
.build();
439435
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@
9696
<artifactId>spring-test</artifactId>
9797
<scope>test</scope>
9898
</dependency>
99-
<dependency>
100-
<groupId>org.mongodb</groupId>
101-
<artifactId>mongo-java-driver</artifactId>
102-
</dependency>
103-
10499
</dependencies>
105100

106101
<build>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.commons.lang3.ObjectUtils;
3030
import org.apache.commons.lang3.StringUtils;
3131
import org.apache.commons.lang3.tuple.Pair;
32-
import org.bson.internal.Base64;
3332
import org.lowcoder.plugin.restapi.constants.ResponseDataType;
3433
import org.lowcoder.plugin.restapi.helpers.AuthHelper;
3534
import org.lowcoder.plugin.restapi.helpers.BufferingFilter;
@@ -398,13 +397,13 @@ private ResponseBodyData parseResponseDataInfo(byte[] body, MediaType contentTyp
398397

399398
if (isPicture(contentType)) {
400399
return ResponseBodyData.builder()
401-
.body(Base64.encode(body))
400+
.body(Base64.getEncoder().encode(body))
402401
.dataType(ResponseDataType.IMAGE)
403402
.build();
404403
}
405404
if (isBinary(contentType)) {
406405
return ResponseBodyData.builder()
407-
.body(Base64.encode(body))
406+
.body(Base64.getEncoder().encode(body))
408407
.dataType(ResponseDataType.BINARY)
409408
.build();
410409
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public enum BizError {
1919
INFRA_REDIS_TIMEOUT(500, 5006),
2020
INFRA_MONGO_TIMEOUT(500, 5007),
2121
INVALID_PERMISSION_OPERATION(500, 5008),
22-
REQUEST_THROTTLED(500, 5009),
22+
REQUEST_THROTTLED(429, 5009),
2323
SERVER_NOT_READY(503, 5010),
2424
REDIRECT(302, 5011),
2525

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.extern.slf4j.Slf4j;
77
import org.lowcoder.sdk.config.dynamic.ConfigCenter;
88
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.beans.factory.annotation.Value;
910
import org.springframework.core.Ordered;
1011
import org.springframework.http.server.reactive.ServerHttpRequest;
1112
import org.springframework.stereotype.Component;
@@ -30,8 +31,10 @@
3031
@Component
3132
public class ThrottlingFilter implements WebFilter, Ordered {
3233

33-
private static final int DEFAULT_RATE_THRESHOLD = 50;
34+
@Value("${default.apiRateLimit:50}")
35+
private int defaultApiRateLimit;
3436

37+
3538
private final Map<String, RateLimiterWrapper> rateLimiterMap = new ConcurrentHashMap<>();
3639
private Supplier<Map<String, Integer>> urlRateLimiter;
3740

@@ -52,7 +55,7 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, @Nonnull WebFilter
5255

5356
RateLimiterWrapper rateLimiter = rateLimiterMap.compute(requestUrl,
5457
(url, currentLimiter) -> {
55-
int targetRate = urlRateLimiter.get().getOrDefault(url, DEFAULT_RATE_THRESHOLD);
58+
int targetRate = urlRateLimiter.get().getOrDefault(url, defaultApiRateLimit);
5659
if (currentLimiter == null) {
5760
return RateLimiterWrapper.create(targetRate);
5861
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ default:
2929
org-group-count: 100
3030
org-app-count: 1000
3131
developer-count: 50
32+
api-rate-limit: 50
3233

3334
common:
3435
cookie-name: LOCAL_LOWCODER_TOKEN

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ default:
2929
org-group-count: 100
3030
org-app-count: 1000
3131
developer-count: 50
32+
api-rate-limit: 50
3233

3334
common:
3435
cookie-name: LOWCODER_CE_SELFHOST_TOKEN

‎server/api-service/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,6 @@
292292
<artifactId>validation-api</artifactId>
293293
<version>2.0.1.Final</version>
294294
</dependency>
295-
<dependency>
296-
<groupId>org.mongodb</groupId>
297-
<artifactId>mongo-java-driver</artifactId>
298-
<version>3.12.8</version>
299-
</dependency>
300295
</dependencies>
301296
</dependencyManagement>
302297

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /