Skip to content

Commit 11cf265

Browse files
authored
Merge pull request #276 from lowcoder-org/fix-api-server-launch-failure
Fix Lowcoder Api Server Launch Failure
2 parents 4f46fd6 + e42f9f1 commit 11cf265

File tree

6 files changed

+9
-24
lines changed

6 files changed

+9
-24
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/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)