Merge branch 'develop' into feature/#52-editUserProfile-cw

Author: sungchaewon

.github/workflows/cd.yml

@@ -36,6 +36,13 @@ jobs:
         chmod +x ./gradlew
         chmod +x ./scripts/deploy.sh
 
+    - name: Replace application.properties secrets
+      run: |
+        sed -i "s|\${MYSQL_URL}|${{ secrets.MYSQL_URL }}|g" src/main/resources/application.properties
+        sed -i "s|\${MYSQL_USERNAME}|${{ secrets.MYSQL_USERNAME }}|g" src/main/resources/application.properties
+        sed -i "s|\${MYSQL_PASSWORD}|${{ secrets.MYSQL_PASSWORD }}|g" src/main/resources/application.properties
+        sed -i "s|\${JWT_KEY}|${{ secrets.JWT_KEY }}|g" src/main/resources/application.properties
+
     - name: Build with Gradle
       run: ./gradlew clean build -x test
 
@@ -48,10 +55,10 @@ jobs:
 
     - name: Create .env file from GitHub secrets
       run: |
-        echo "mysql_url=${{ secrets.mysql_url }}" >> .env
-        echo "mysql_username=${{ secrets.mysql_username }}" >> .env
-        echo "mysql_password=${{ secrets.mysql_password }}" >> .env
-        echo "jwt_key=${{ secrets.jwt_key }}" >> .env
+        echo "MYSQL_URL=${{ secrets.MYSQL_URL }}" >> .env
+        echo "MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }}" >> .env
+        echo "MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }}" >> .env
+        echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> .env
 
     - name: Prepare deployment package
       run: |

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

@@ -2,6 +2,7 @@
 
 import com.example.FixLog.repository.MemberRepository;
 import com.example.FixLog.util.JwtUtil;
+import com.example.FixLog.config.JwtAuthenticationFilter;
 import jakarta.servlet.Filter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -10,6 +11,7 @@
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -26,10 +28,12 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
                 .csrf(csrf -> csrf.disable())
+                .cors(Customizer.withDefaults()) // CORS 설정 추가 (WebConfig와 연결됨)
                 .authorizeHttpRequests(auth -> auth
-                        // 비로그인 허용 경로
+                        .requestMatchers(HttpMethod.GET, "/auth/**").permitAll()
+                        .requestMatchers(HttpMethod.POST, "/auth/**").permitAll()
+
                         .requestMatchers(HttpMethod.POST, "/members/signup").permitAll()
-                        .requestMatchers(HttpMethod.POST, "/auth/login").permitAll()
                         .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll()
                         .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll()
                         .requestMatchers(HttpMethod.GET, "/search/**").permitAll()
@@ -39,6 +43,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         // 배포 확인용 임시 허용
                         .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll()
                         // 그 외 모든 요청은 인증 필요
+                        .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll() // 테스트용 허용
+
                         .anyRequest().authenticated()
                 )
                 .headers(headers -> headers.frameOptions(frame -> frame.disable())) // H2 콘솔

src/main/java/com/example/FixLog/config/WebConfig.java

@@ -0,0 +1,19 @@
+package com.example.FixLog.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") // 모든 경로에 대해
+                .allowedOriginPatterns("*") // 모든 도메인 허용 (개발용) → 배포 시 정확한 프론트 주소로 수정 권장
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
+                .allowedHeaders("*")
+                .allowCredentials(true); // 인증정보(쿠키, Authorization) 허용
+    }
+}
+

src/main/resources/application.properties

@@ -17,10 +17,11 @@ spring.application.name=FixLog
 ##### dev #####
 server.port=8083
 
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=${mysql_url}
-#spring.datasource.username=${mysql_username}
-#spring.datasource.password=${mysql_password}
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=${MYSQL_URL}
+spring.datasource.username=${MYSQL_USERNAME}
+spring.datasource.password=${MYSQL_PASSWORD}
+
 
 spring.datasource.url=jdbc:mysql://fixlog-db.c7cau8y2srl7.ap-northeast-2.rds.amazonaws.com:3306/fixlog?serverTimezone=Asia/Seoul
 spring.datasource.username=admin
@@ -37,7 +38,10 @@ cloud.aws.credentials.secret-key=${AWS_SECRET_ACCESS_KEY}
 cloud.aws.region.static=${AWS_REGION}
 cloud.aws.s3.bucket=${AWS_S3_BUCKET}
 
-##### jwt #####
-jwt.secret=${jwt_key}
 
-logging.level.org.springframework.security=DEBUG
+spring.jwt.secret=${JWT_KEY}
+
+# 로그 레벨 설정
+logging.level.root=INFO
+logging.level.com.example.FixLog=DEBUG
+logging.file.name=logs/app.log