Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] 업무카드 수정 API #200

Merged
merged 2 commits into from
Nov 9, 2023
Merged

[Fix] 업무카드 수정 API #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2dc097
[CHORE] AWS 환경변수 키 값 변경
unanchoi Nov 8, 2023
b24a84d
[FIX] updateCard method 수정
unanchoi Nov 8, 2023
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 src/main/java/site/katchup/katchupserver/api/card/service/Impl/CardServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public void updateCard(Long memberId, Long cardId, CardUpdateRequestDto requestD
screenshotInfo.getScreenshotName()))
.url(screenshotService.findUrl(memberId, screenshotInfo))
.uploadDate(screenshotInfo.getScreenshotUploadDate())
.screenshotName(screenshotInfo.getScreenshotName())
.card(card)
.build();

Expand Down
9 changes: 3 additions & 6 deletions src/main/java/site/katchup/katchupserver/external/s3/AWSConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package site.katchup.katchupserver.external.s3;

import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
import software.amazon.awssdk.auth.credentials.SystemPropertyCredentialsProvider;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;


Expand All @@ -22,9 +19,9 @@ public class AWSConfig {
private final String secretKey;
private final String regionString;

public AWSConfig(@Value("${cloud.aws.credentials.accessKey}") final String accessKey,
@Value("${cloud.aws.credentials.secretKey}") final String secretKey,
@Value("${cloud.aws.region.static}") final String regionString) {
public AWSConfig(@Value("${aws-property.access-key}") final String accessKey,
@Value("${aws-property.secret-key}") final String secretKey,
@Value("${aws-property.aws-region}") final String regionString) {
this.accessKey = accessKey;
this.secretKey = secretKey;
this.regionString = regionString;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/site/katchup/katchupserver/external/s3/S3Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@RequiredArgsConstructor
public class S3Service {

@Value("${cloud.aws.s3.bucket}")
@Value("${aws-property.s3-bucket-name}")
private String bucketName;

private final AWSConfig awsConfig;
Expand Down
Loading