Skip to content

Commit 3dee6de

Browse files
committed
Merge branch 'epic/board' into dev
2 parents 6b5ec63 + 60c1dad commit 3dee6de

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/main/java/org/myteam/server/upload/config/S3ConfigLocal.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
@Configuration
1818
public class S3ConfigLocal {
1919

20-
@Value("${MINIO_URL}")
20+
@Value("${minio.url}")
2121
private String minioUrl;
2222

23-
@Value("${MINIO_ROOT_USER}")
23+
@Value("${minio.root-user}")
2424
private String minioRootUser;
2525

26-
@Value("${MINIO_ROOT_PASSWORD}")
26+
@Value("${minio.root-password}")
2727
private String minioRootPassword;
2828

29-
@Value("${MINIO_REGION}")
29+
@Value("${minio.bucket}")
3030
private String region;
3131

3232
public String getMinioUrl() {

src/main/java/org/myteam/server/upload/service/S3PresignedUrlService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@RequiredArgsConstructor
2020
public class S3PresignedUrlService {
2121

22-
@Value("${MINIO_BUCKET}")
22+
@Value("${minio.bucket}")
2323
private String bucket;
2424
private final S3Presigner s3Presigner;
2525
private final S3ConfigLocal s3ConfigLocal;

src/main/resources/application-dev.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,9 @@ slack:
4242
webhook:
4343
url: ${SLACK_WEBHOOK_URL}
4444

45+
minio:
46+
url: ${MINIO_URL}
47+
root-user: ${MINIO_ROOT_USER}
48+
root-password: ${MINIO_ROOT_PASSWORD}
49+
region: ${MINIO_REGION}
50+
bucket: ${MINIO_BUCKET}

0 commit comments

Comments
 (0)