diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 4a4f19d..846cd02 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -46,6 +46,11 @@ jobs: - name: Build WAR file run: ./gradlew clean build -x test + - name: Add runner user to docker group + run: | + sudo usermod -aG docker $USER + newgrp docker + - name: DockerHub Login & Push env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -79,8 +84,8 @@ jobs: username: ubuntu key: ${{ secrets.EC2_PRIVATE_KEY }} script: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom - docker-compose down - docker-compose up -d - docker image prune -f + sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom + sudo docker-compose down + sudo docker-compose up -d + sudo docker image prune -f diff --git a/src/main/java/org/scoula/View/home/controller/HomeController.java b/src/main/java/org/scoula/View/home/controller/HomeController.java index cb714e9..117927b 100644 --- a/src/main/java/org/scoula/View/home/controller/HomeController.java +++ b/src/main/java/org/scoula/View/home/controller/HomeController.java @@ -40,4 +40,10 @@ public ResponseEntity getHome(Authentication authentication) { String email = authentication.getName(); return ResponseEntity.ok(homeService.getHomeData(email)); } + + @ApiOperation(value = "테스트 엔드포인트", notes = "배포 테스트용 간단한 GET 엔드포인트입니다.") + @GetMapping("/test") + public ResponseEntity test(){ + return ResponseEntity.ok("Hello from JejuGom Server! Deployment test successful."); + } } diff --git a/src/main/java/org/scoula/product/service/ProductServiceImpl.java b/src/main/java/org/scoula/product/service/ProductServiceImpl.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/scoula/security/config/SecurityConfig.java b/src/main/java/org/scoula/security/config/SecurityConfig.java index 0f81cc4..062bfec 100644 --- a/src/main/java/org/scoula/security/config/SecurityConfig.java +++ b/src/main/java/org/scoula/security/config/SecurityConfig.java @@ -43,7 +43,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(HttpSecurity http) throws Exception { // 필터 순서 설정: 인코딩 필터 -> JWT 인증 필터 -> Spring Security 기본 필터 - http.addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class) + http.cors() // CORS 필터 추가 + .and() + .addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); // stateless REST API 설정을 위해 기본 보안 기능 비활성화 @@ -67,6 +69,7 @@ public void configure(HttpSecurity http) throws Exception { "/", "/favicon.ico", "/api/home", + "/api/home/test", "/auth/kakao", "/auth/kakao/callback", "/api/retirement",