Skip to content

Commit 7974275

Browse files
sungchaewonsungchaewon
authored
Merge pull request #73 from FixLog/develop
Develop
2 parents 51d5161 + a891c80 commit 7974275

File tree

6 files changed

+72
-77
lines changed

6 files changed

+72
-77
lines changed

‎.github/workflows/cd.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ jobs:
4242
sed -i "s|\${MYSQL_USERNAME}|${{ secrets.MYSQL_USERNAME }}|g" src/main/resources/application.properties
4343
sed -i "s|\${MYSQL_PASSWORD}|${{ secrets.MYSQL_PASSWORD }}|g" src/main/resources/application.properties
4444
sed -i "s|\${JWT_KEY}|${{ secrets.JWT_KEY }}|g" src/main/resources/application.properties
45-
45+
sed -i "s|\${AWS_ACCESS_KEY_ID}|${{ secrets.AWS_ACCESS_KEY_ID }}|g" src/main/resources/application.properties
46+
sed -i "s|\${AWS_SECRET_ACCESS_KEY}|${{ secrets.AWS_SECRET_ACCESS_KEY }}|g" src/main/resources/application.properties
47+
sed -i "s|\${AWS_REGION}|${{ env.AWS_REGION }}|g" src/main/resources/application.properties
48+
sed -i "s|\${AWS_S3_BUCKET}|${{ env.S3_BUCKET_NAME }}|g" src/main/resources/application.properties
49+
4650
- name: Build with Gradle
4751
run: ./gradlew clean build -x test
4852

@@ -59,6 +63,10 @@ jobs:
5963
echo "MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }}" >> .env
6064
echo "MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }}" >> .env
6165
echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> .env
66+
echo "AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}" >> .env
67+
echo "AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}" >> .env
68+
echo "AWS_REGION=${{ env.AWS_REGION }}" >> .env
69+
echo "AWS_S3_BUCKET=${{ env.S3_BUCKET_NAME }}" >> .env
6270
6371
- name: Prepare deployment package
6472
run: |

‎build.gradle‎

Lines changed: 58 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,92 @@
11
plugins {
2-
id 'java'
3-
id 'org.springframework.boot' version '3.2.5'//스웨거로 인해 버전 낮춤
4-
id 'io.spring.dependency-management' version '1.1.7'
5-
}
6-
7-
ext {
8-
queryDslVersion = "5.0.0"
2+
id 'java'
3+
id 'org.springframework.boot' version '3.2.5' // 스웨거로 인해 버전 낮춤
4+
id 'io.spring.dependency-management' version '1.1.7'
95
}
106

117
group = 'com.example'
128
version = '0.0.1-SNAPSHOT'
139

1410
java {
15-
toolchain {
16-
languageVersion = JavaLanguageVersion.of(21)
17-
}
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(21)
13+
}
1814
}
1915

2016
ext {
21-
queryDslVersion = "5.0.0"
17+
queryDslVersion = "5.0.0"
2218
}
2319

2420
configurations {
25-
compileOnly {
26-
extendsFrom annotationProcessor
27-
}
21+
compileOnly {
22+
extendsFrom annotationProcessor
23+
}
2824
}
2925

3026
repositories {
31-
mavenCentral()
32-
33-
// springdoc 2.5.0은 여기서 제공됨
34-
maven { url 'https://repo.spring.io/release' }
27+
mavenCentral()
28+
// springdoc 2.5.0은 여기서 제공됨
29+
maven { url 'https://repo.spring.io/release' }
3530
}
3631

3732
dependencies {
38-
// Spring Boot
39-
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
40-
implementation 'org.springframework.boot:spring-boot-starter-security'
41-
implementation 'org.springframework.boot:spring-boot-starter-web'
42-
implementation 'org.springframework.boot:spring-boot-starter-validation'
43-
44-
// JWT
45-
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
46-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
47-
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
48-
49-
// DB
50-
runtimeOnly 'com.h2database:h2'
51-
runtimeOnly 'com.mysql:mysql-connector-j'
52-
53-
// AWS
54-
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538'
55-
56-
// QueryDSL
57-
implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
58-
annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
59-
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
60-
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
61-
62-
// Swagger (springdoc)
63-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
64-
65-
// Lombok
66-
compileOnly 'org.projectlombok:lombok'
67-
annotationProcessor 'org.projectlombok:lombok'
68-
69-
// Test
70-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
71-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
33+
// Spring Boot
34+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
35+
implementation 'org.springframework.boot:spring-boot-starter-security'
36+
implementation 'org.springframework.boot:spring-boot-starter-web'
37+
implementation 'org.springframework.boot:spring-boot-starter-validation'
38+
39+
// JWT
40+
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
41+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
42+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
43+
44+
// DB
45+
runtimeOnly 'com.h2database:h2'
46+
runtimeOnly 'com.mysql:mysql-connector-j'
47+
48+
// AWS
49+
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538'
50+
51+
// QueryDSL
52+
implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
53+
annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
54+
annotationProcessor "jakarta.annotation:jakarta.annotation-api"
55+
annotationProcessor "jakarta.persistence:jakarta.persistence-api"
56+
57+
// Swagger (springdoc)
58+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
59+
60+
// Lombok
61+
compileOnly 'org.projectlombok:lombok'
62+
annotationProcessor 'org.projectlombok:lombok'
63+
64+
// Test
65+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
66+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
67+
}
7268

69+
// 테스트 설정 (JUnit 플랫폼 사용)
7370
tasks.named('test') {
74-
useJUnitPlatform()
71+
useJUnitPlatform()
7572
}
7673

77-
// WAR 파일 안 만들게 설정
74+
// WAR 파일 비활성화 (jar만 생성)
7875
jar {
79-
enabled = false
76+
enabled = false
8077
}
8178

8279
// QueryDSL 설정
8380
def querydslDir = "src/main/generated"
8481

8582
sourceSets {
86-
main {
87-
java {
88-
srcDirs += querydslDir
89-
}
90-
}
83+
main {
84+
java {
85+
srcDirs += querydslDir
86+
}
87+
}
9188
}
9289

9390
tasks.withType(JavaCompile).configureEach {
94-
options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir)
91+
options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir)
9592
}
96-
97-

‎src/main/java/com/example/FixLog/config/SecurityConfig.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
2929
.csrf(csrf -> csrf.disable())
3030
.cors(Customizer.withDefaults()) // CORS 설정 추가 (WebConfig와 연결됨)
3131
.authorizeHttpRequests(auth -> auth
32+
.requestMatchers(HttpMethod.GET, "/", "/main", "/main/**").permitAll()
3233
.requestMatchers(HttpMethod.GET, "/auth/**").permitAll()
3334
.requestMatchers(HttpMethod.POST, "/auth/**").permitAll()
3435
.requestMatchers(HttpMethod.POST, "/members/signup").permitAll()

‎src/main/java/com/example/FixLog/controller/MypagePostController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getLiked
4444
String email = userDetails.getUsername();
4545
PageResponseDto<MyPostPageResponseDto> result = mypagePostService.getLikedPosts(email, page, sort, size);
4646
return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result));
47-
}
47+
4848

4949

5050
}

‎src/main/java/com/example/FixLog/util/JwtUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Component
1515
public class JwtUtil {
1616

17-
@Value("${jwt.secret}")
17+
@Value("${spring.jwt.secret}")
1818
private String secretKeyString;
1919

2020
private Key secretKey;
@@ -59,4 +59,4 @@ public String getEmailFromToken(String token) {
5959
public Long getUserIdFromToken(String token) {
6060
return getClaims(token).get("userId", Long.class);
6161
}
62-
}
62+
}

‎src/main/resources/application.properties‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
spring.application.name=FixLog
22

3-
43
##### [DEV] #####
54
server.port=8083
65

7-
# DB
8-
9-
server.port=8083
10-
116
# DB (MySQL)
127
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
138
spring.datasource.url=jdbc:mysql://fixlog-db.c7cau8y2srl7.ap-northeast-2.rds.amazonaws.com:3306/fixlog?serverTimezone=Asia/Seoul
@@ -29,14 +24,10 @@ cloud.aws.s3.bucket=${AWS_S3_BUCKET}
2924
# JWT
3025
jwt.secret=${JWT_KEY}
3126

32-
# ?? ??
27+
# Spring Security 디버깅 로그
3328
logging.level.org.springframework.security=DEBUG
3429

35-
36-
37-
3830
##### [PROD] #####
39-
4031
# server.port=8083
4132
#
4233
# spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

0 commit comments

Comments
 (0)