Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
jobs:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -25,21 +26,22 @@ jobs:
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build and push
- name: Build and push Docker image (single arch)
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64,linux/arm64
platforms: linux/amd64 # ⚡ 멀티 플랫폼 제거 → 빌드 속도 2~3배 향상
push: true
tags: 867344478016.dkr.ecr.ap-northeast-2.amazonaws.com/enjoy-app:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: SSH into EC2 server and deploy
- name: SSH into EC2 and deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.EC2_HOST }}
Expand All @@ -50,5 +52,4 @@ jobs:
cd /home/ec2-user/back
docker-compose down
docker pull 867344478016.dkr.ecr.ap-northeast-2.amazonaws.com/enjoy-app:latest
docker system prune -f
docker-compose up -d
docker-compose up -d
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ on:
branches: [ main ]

env:
JWT_SECRET: ${{ secrets.JWT_SECRET }}
KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }}
KAKAO_CLIENT_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }}
KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }}
RDS_ENDPOINT: ${{ secrets.RDS_ENDPOINT }}
RDS_PORT: ${{ secrets.RDS_PORT }}
RDS_USERNAME: ${{ secrets.MYSQL_DB_USERNAME }}
Expand Down Expand Up @@ -61,10 +57,13 @@ jobs:
- name: Build and Test with Gradle
env:
SPRING_PROFILES_ACTIVE: ci
MYSQL_DB_USERNAME: ${{ secrets.MYSQL_DB_USERNAME }}
MYSQL_DB_PASSWORD: ${{ secrets.MYSQL_DB_PASSWORD }}
MYSQL_DB_NAME: ${{ secrets.MYSQL_DB_NAME }}
MYSQL_DB_PORT: ${{ secrets.RDS_PORT }}
MYSQL_DB_HOST: ${{ secrets.RDS_ENDPOINT }}
run: |
./gradlew clean
./gradlew compileJava --stacktrace
./gradlew build --info
./gradlew clean build --info

- name: Upload Test Report Artifact
if: failure()
Expand Down
95 changes: 0 additions & 95 deletions src/main/java/com/example/smartair/config/SecurityConfig.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
package com.example.smartair.controller.userController;

import com.example.smartair.dto.userDto.LoginDTO;
import com.example.smartair.dto.userDto.TokenDto;
import com.example.smartair.entity.login.CustomUserDetails;
import com.example.smartair.service.userService.LoginService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

@Tag(name = "로그인", description = "로그인 관련 API")
Expand All @@ -25,7 +11,7 @@
@AllArgsConstructor
public class LoginController {

private final LoginService loginService;




Expand Down
Loading
Loading