diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6294228..c9e0766 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,7 @@ jobs: Firebase_ID: ${{ secrets.FIREBASE_PROJECT_ID }} GOOGLE_MAP_API_KEY: ${{ secrets.GOOGLE_MAP_API_KEY }} SPRING_DOMAIN: ${{ secrets.SPRING_DOMAIN }} + FILE_UPLOAD_DIR: ./uploads S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} S3_REGION: ${{ secrets.S3_REGION }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index beb4d34..82d3acc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,6 +47,7 @@ jobs: echo "S3_REGION=${{ secrets.S3_REGION }}" >> .env echo "S3_BUCKET=${{ secrets.S3_BUCKET }}" >> .env echo "S3_BASE_URL=${{ secrets.S3_BASE_URL }}" >> .env + echo "FILE_UPLOAD_DIR=/app/uploads" >> .env mkdir -p ./src/main/resources/firebase echo '${{ secrets.FCM_JSON }}' > ./src/main/resources/${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }} diff --git a/runtracker/src/main/java/com/runtracker/global/config/FileUploadConfig.java b/runtracker/src/main/java/com/runtracker/global/config/FileUploadConfig.java index 92272ba..ddbecd6 100644 --- a/runtracker/src/main/java/com/runtracker/global/config/FileUploadConfig.java +++ b/runtracker/src/main/java/com/runtracker/global/config/FileUploadConfig.java @@ -11,19 +11,17 @@ @Configuration public class FileUploadConfig { - @Value("${file.upload-dir:/app/uploads}") + @Value("${file.upload-dir}") private String uploadDir; - @Value("${app.domain:http://localhost:8080}") + @Value("${file.base-url}") private String baseUrl; @PostConstruct public void init() { File uploadDirectory = new File(uploadDir); - if (!uploadDirectory.exists()) { - if (!uploadDirectory.mkdirs()) { - System.out.println("Warning: Failed to create upload directory: " + uploadDir); - } + if (!uploadDirectory.exists() && !uploadDirectory.mkdirs()) { + throw new IllegalStateException("Failed to create upload directory: " + uploadDir); } } } \ No newline at end of file diff --git a/runtracker/src/main/resources/application.yml b/runtracker/src/main/resources/application.yml index e651aec..258337d 100644 --- a/runtracker/src/main/resources/application.yml +++ b/runtracker/src/main/resources/application.yml @@ -76,6 +76,10 @@ google: maps: api-key: ${GOOGLE_MAP_API_KEY} +file: + upload-dir: ${FILE_UPLOAD_DIR} + base-url: ${SPRING_DOMAIN} + aws: access-key: ${S3_ACCESS_KEY} secret-key: ${S3_SECRET_KEY}