diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java index 61ce28053..1fc09a35e 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java @@ -17,7 +17,9 @@ import org.springframework.web.reactive.function.BodyInserters; import reactor.core.publisher.Mono; +import java.util.ArrayList; import java.util.Map; +import java.util.Objects; @RequiredArgsConstructor @RestController @@ -48,7 +50,7 @@ private Mono> forwardToNodeService(String applicationId String withoutLeadingSlash = path.startsWith("/") ? path.substring(1) : path; if(applicationId.equals("none")) { return sessionUserService.getVisitorOrgMemberCache().flatMap(orgMember -> organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> { - Map config = Map.of("npmRegistries", organizationCommonSettings.get("npmRegistries"), "workspaceId", orgMember.getOrgId()); + Map config = Map.of("npmRegistries", Objects.requireNonNullElse(organizationCommonSettings.get("npmRegistries"), new ArrayList<>(0)), "workspaceId", orgMember.getOrgId()); return WebClientBuildHelper.builder() .systemProxy() .build() @@ -66,7 +68,7 @@ private Mono> forwardToNodeService(String applicationId })); } else{ return applicationServiceImpl.findById(applicationId).flatMap(application -> organizationService.getById(application.getOrganizationId())).flatMap(orgMember -> organizationService.getOrgCommonSettings(orgMember.getId()).flatMap(organizationCommonSettings -> { - Map config = Map.of("npmRegistries", organizationCommonSettings.get("npmRegistries"), "workspaceId", orgMember.getId()); + Map config = Map.of("npmRegistries", Objects.requireNonNullElse(organizationCommonSettings.get("npmRegistries"), new ArrayList<>(0)), "workspaceId", orgMember.getId()); return WebClientBuildHelper.builder() .systemProxy() .build()