Fix error

Thomas · Thomas · commit e2ebc841f938 · 2024-06-17T20:11:47.000-04:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java
@@ -15,7 +15,7 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza
     Mono<Organization> findFirstByStateMatches(OrganizationState state);
 
     Flux<Organization> findByIdInAndState(Collection<String> id, OrganizationState state);
-    Flux<Organization> findByIdGinAndState(Collection<String> gid, OrganizationState state);
+    Flux<Organization> findByGidInAndState(Collection<String> gid, OrganizationState state);
 
     Mono<Organization> findByIdAndState(String id, OrganizationState state);
     Mono<Organization> findByGidAndState(String gid, OrganizationState state);
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -185,7 +185,7 @@ public Mono<OrganizationCommonSettings> getOrgCommonSettings(String orgId) {
     @Override
     public Flux<Organization> getByIds(Collection<String> ids) {
         if(!ids.isEmpty() && FieldName.isGID(ids.stream().findFirst().get()))
-            return repository.findByIdGinAndState(ids, ACTIVE);
+            return repository.findByGidInAndState(ids, ACTIVE);
         return repository.findByIdInAndState(ids, ACTIVE);
     }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ApiEventFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ApiEventFilter.java
@@ -19,6 +19,7 @@
 import reactor.core.scheduler.Schedulers;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 
 import static org.lowcoder.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER;
 import static org.lowcoder.sdk.constants.GlobalContext.VISITOR_TOKEN;
@@ -53,7 +54,8 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
     private void emitEvent(ServerHttpRequest request, String token, OrgMember orgMember) {
         MultiValueMap<String, String> headers = writableHttpHeaders(request.getHeaders());
         headers.remove("Cookie");
-        String ipAddress = headers.remove("X-Real-IP").stream().findFirst().get();
+        Optional<String> ipAddressOptional = headers.remove("X-Real-IP").stream().findFirst();
+        String ipAddress = ipAddressOptional.orElse("");
 
         APICallEvent event = APICallEvent.builder()
                 .userId(orgMember.getUserId())

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public Mono<OrganizationCommonSettings> getOrgCommonSettings(String orgId) {`
`185`	`185`	`@Override`
`186`	`186`	`public Flux<Organization> getByIds(Collection<String> ids) {`
`187`	`187`	`if(!ids.isEmpty() && FieldName.isGID(ids.stream().findFirst().get()))`
`188`		`- return repository.findByIdGinAndState(ids, ACTIVE);`
	`188`	`+ return repository.findByGidInAndState(ids, ACTIVE);`
`189`	`189`	`return repository.findByIdInAndState(ids, ACTIVE);`
`190`	`190`	`}`
`191`	`191`