From 1e26683be615f8d692bcb2c68ef607d569bac389 Mon Sep 17 00:00:00 2001 From: projectmiluju Date: Sat, 2 Aug 2025 22:53:27 +0900 Subject: [PATCH] =?UTF-8?q?fix(Sandbox):=20=EC=83=8C=EB=93=9C=EB=B0=95?= =?UTF-8?q?=EC=8A=A4=20url=20=EB=B0=B0=ED=8F=AC=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 1 + .../repository/service/RepositoryRunService.java | 5 ++++- .../sandbox/controller/SandboxLogController.java | 6 +++++- .../deepwebide_be/sandbox/service/SandboxService.java | 2 +- src/main/resources/application-prod.yml | 6 +++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6ba40eb2..4f45aaa3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -57,5 +57,6 @@ jobs: export SENTRY_DSN="${{ secrets.SENTRY_DSN }}" export GIT_CLIENT_ID="${{ secrets.GIT_CLIENT_ID }}" export GIT_CLIENT_SECRET="${{ secrets.GIT_CLIENT_SECRET }}" + export SANDBOX_URL="${{ secrets.SANDBOX_URL }}" cd ~/app bash deploy.sh \ No newline at end of file diff --git a/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java b/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java index d551690b..268811fe 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java +++ b/src/main/java/com/deepdirect/deepwebide_be/repository/service/RepositoryRunService.java @@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,9 +48,11 @@ public class RepositoryRunService { private final FileNodeRepository fileNodeRepository; private final FileContentRepository fileContentRepository; private final RunningContainerRepository runningContainerRepository; - private final String sandboxBaseUrl = "http://localhost:9090"; private final RestTemplate restTemplate; + @Value("${sandbox.api.base-url}") + private String sandboxBaseUrl; + @Transactional public RepositoryExecuteResponse executeRepository(Long repositoryId, Long userId) { log.info("Starting repository execution - repositoryId: {}, userId: {}", repositoryId, userId); diff --git a/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java b/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java index d9ff10fd..98c6521d 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java +++ b/src/main/java/com/deepdirect/deepwebide_be/sandbox/controller/SandboxLogController.java @@ -1,6 +1,7 @@ package com.deepdirect.deepwebide_be.sandbox.controller; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -16,10 +17,13 @@ public class SandboxLogController { private final RestTemplate restTemplate = new RestTemplate(); + @Value("${sandbox.api.base-url}") + private String sandboxBaseUrl; + @GetMapping("/logs/{uuid}") public ResponseEntity getContainerLogs(@PathVariable String uuid) { String containerId = "sandbox-" + uuid; - String sandboxUrl = "http://localhost:9090/api/sandbox/logs/" + containerId; + String sandboxUrl = sandboxBaseUrl + "/api/sandbox/logs/" + containerId; try { ResponseEntity response = restTemplate.getForEntity(sandboxUrl, String.class); diff --git a/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java b/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java index 6cd94052..86205e70 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java +++ b/src/main/java/com/deepdirect/deepwebide_be/sandbox/service/SandboxService.java @@ -20,7 +20,7 @@ public class SandboxService { private final RestTemplate restTemplate; - @Value("${sandbox.api.base-url:http://localhost:9090}") + @Value("${sandbox.api.base-url}") private String sandboxBaseUrl; public SandboxExecutionResponse requestExecution(SandboxExecutionRequest request) { diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 53f438bc..ac018024 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -104,4 +104,8 @@ logging: io: sentry: INFO com: - deepdirect: DEBUG \ No newline at end of file + deepdirect: DEBUG + +sandbox: + api: + base-url: ${SANDBOX_URL} \ No newline at end of file