Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
4 changes: 4 additions & 0 deletions runtracker/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down