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

Fix 82/클라우드 이전 #86

Merged
merged 3 commits into from
Aug 18, 2024
Merged

Fix 82/클라우드 이전 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35d5cdd
[fix] 배포 스크립트 수정 및 jwt 토큰시간 yml로 이동
MinchoGreenT Aug 18, 2024
270219d
Merge branch 'refs/heads/dev' into fix_82/클라우드-이전
MinchoGreenT Aug 18, 2024
0faac13
[fix] S3 컨피그 yml 위치 수정
MinchoGreenT Aug 18, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/dev-cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: cicd for development

on:
push:
branches: [ "dev", "fix_82/클라우드-이전" ]
branches: [ "dev" ]

jobs:
build:
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/modernfarmer/farmusspring/global/common/security/JwtTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ public class JwtTokenProvider {
@Value("${jwt.secret}")
private String secretKey;

@Value("${jwt.expireAccessToken}")
private long accessTokenTime;

private final long accessTokenTime = 60L * 1000 * 10000000;
private final long refreshTokenTime = 180L * 1000 * 1000000000;
@Value("${jwt.expireRefreshToken}")
private long refreshTokenTime;


@PostConstruct
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/modernfarmer/farmusspring/infra/s3/S3Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
@Component
public class S3Config {

@Value("${credentials.access-key}")
@Value("${cloud.aws.credentials.access-key}")
private String accessKey;
@Value("${credentials.secret-key}")
@Value("${cloud.aws.credentials.secret-key}")
private String secretKey;
@Value("${cloud.aws.region.static}")
private String region;
Expand Down
Loading