main to develop

.github/workflows/cd.yml

@@ -33,9 +33,6 @@ jobs:
       AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
       AWS_REGION: ${{ secrets.AWS_REGION }}
 
-      RECOMMEND_CRON : ${{ secrets.RECOMMEND_CRON }}
-      UNBAN_CRON : ${{ secrets.UNBAN_CRON }}
-
       # ECR 환경변수
       ECR_URI: ${{ secrets.ECR_URI }}
 
@@ -106,15 +103,14 @@ jobs:
           echo "REDIS_PORT=${{ secrets.REDIS_PORT }}" >> docker-compose/.env
           echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> docker-compose/.env
           echo "BOTTLER_FCM_BASE64=${{ secrets.BOTTLER_FCM_BASE64 }}" >> docker-compose/.env
-          echo "RECOMMEND_CRON=${{ secrets.RECOMMEND_CRON }}" >> docker-compose/.env
-          echo "UNBAN_CRON=${{ secrets.UNBAN_CRON }}" >> docker-compose/.env
           echo "BUCKET_NAME=${{ secrets.BUCKET_NAME }}" >> docker-compose/.env
           echo "BASE_URL=${{ secrets.BASE_URL }}" >> docker-compose/.env
           echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> docker-compose/.env
           echo "KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}" >> docker-compose/.env
           echo "KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}" >> docker-compose/.env
           echo "KAKAO_REDIRECT_URL=${{ secrets.KAKAO_REDIRECT_URL }}" >> docker-compose/.env
           echo "SLACK_TOKEN=${{ secrets.SLACK_TOKEN }}" >> docker-compose/.env
+          echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> docker-compose/.env
           echo "TAG=${{ github.sha }}" >> docker-compose/.env
 
       - name: docker-compose.yml, .env 파일 EC2로 복사

.github/workflows/ci.yml

@@ -37,9 +37,6 @@ jobs:
       BUCKET_NAME: ${{ secrets.BUCKET_NAME }}
       BASE_URL: ${{ secrets.BASE_URL }}
 
-      RECOMMEND_CRON : ${{ secrets.RECOMMEND_CRON }}
-      UNBAN_CRON : ${{ secrets.UNBAN_CRON }}
-
       # gpt 환경변수
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 

docker-compose/docker-compose.yml

@@ -3,17 +3,19 @@ services:
     image: ${DOCKER_USERNAME}/bottler:${TAG}  # Docker Hub 이미지 사용
     container_name: app-server
     ports:
-      - "8080:8080"  # 컨테이너 포트를 8080으로 노출
-    env_file:        # 환경 변수 파일(.env) 참조
+      - "80:8080"  # 컨테이너 포트를 8080으로 노출
+    env_file: # 환경 변수 파일(.env) 참조
       - .env
     depends_on:
       - redis
     environment:
       - SPRING_REDIS_HOST=redis
       - SPRING_REDIS_PORT=6379
+    restart: always  # 재시작 정책 추가
 
   redis:
     image: redis:latest
     container_name: redis-server
     ports:
       - "6379:6379"
+    restart: always  # 재시작 정책 추가

src/main/java/postman/bottler/config/SecurityConfig.java

@@ -17,16 +17,17 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
 import postman.bottler.user.auth.JwtAccessDeniedHandler;
 import postman.bottler.user.auth.JwtAuthenticationEntryPoint;
 import postman.bottler.user.auth.JwtFilter;
 import postman.bottler.user.auth.JwtTokenProvider;
 
-
 @Configuration
 @RequiredArgsConstructor
 @EnableWebSecurity
 public class SecurityConfig {
+
     private final JwtTokenProvider jwtTokenProvider;
     private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
     private final JwtAccessDeniedHandler jwtAccessDeniedHandler;
@@ -77,18 +78,14 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOriginPatterns(Arrays.asList(
-                "http://localhost:5173",
-                "https://bottler.online"
-        ));
+        configuration.addAllowedOriginPattern("*"); // 모든 도메인 허용
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));
-        configuration.setAllowedHeaders(Collections.singletonList("*"));
-        configuration.setAllowCredentials(true);
+        configuration.setAllowedHeaders(Collections.singletonList("*")); // 모든 헤더 허용
+        configuration.setAllowCredentials(true); // 인증 정보를 포함한 요청 허용
+        configuration.setMaxAge(3600L); // 캐싱 시간 설정
 
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", configuration);
         return source;
     }
-
-
 }

src/main/java/postman/bottler/config/SwaggerConfig.java

@@ -43,4 +43,3 @@ private Info apiInfo() {
                 .version("1.0.0");
     }
 }
-

src/main/resources/application.yml

@@ -4,6 +4,13 @@ spring:
     url: ${DB_URL}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
+    hikari:
+      maximum-pool-size: 10
+      connection-timeout: 30000
+      validation-timeout: 2000
+      minimum-idle: 5
+      idle-timeout: 30000
+      max-lifetime: 1800000
 
   jpa:
     hibernate: