diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b38bec6..9f10950 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: Java CI/CD with Gradle on: push: - branches: [ "develop" , "42-be-develop-오류-해결" ] + branches: [ "develop" ] pull_request: branches: [ "develop"] types: [ closed ] diff --git a/src/main/java/com/example/likelion12/controller/CrewController.java b/src/main/java/com/example/likelion12/controller/CrewController.java index 122026c..c5e6423 100644 --- a/src/main/java/com/example/likelion12/controller/CrewController.java +++ b/src/main/java/com/example/likelion12/controller/CrewController.java @@ -4,7 +4,7 @@ import com.example.likelion12.dto.PostCrewRequest; import com.example.likelion12.dto.PostCrewResponse; import com.example.likelion12.service.CrewService; -import com.example.likelion12.util.JwtProvider; +import com.example.likelion12.util.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/likelion12/controller/HomeController.java b/src/main/java/com/example/likelion12/controller/HomeController.java index f77d170..33aee5d 100644 --- a/src/main/java/com/example/likelion12/controller/HomeController.java +++ b/src/main/java/com/example/likelion12/controller/HomeController.java @@ -3,7 +3,7 @@ import com.example.likelion12.common.response.BaseResponse; import com.example.likelion12.dto.HomeResponse; import com.example.likelion12.service.HomeService; -import com.example.likelion12.util.JwtProvider; +import com.example.likelion12.util.*; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/likelion12/controller/SocialringController.java b/src/main/java/com/example/likelion12/controller/SocialringController.java index 81c594a..810a23b 100644 --- a/src/main/java/com/example/likelion12/controller/SocialringController.java +++ b/src/main/java/com/example/likelion12/controller/SocialringController.java @@ -4,7 +4,7 @@ import com.example.likelion12.dto.PostSocialringRequest; import com.example.likelion12.dto.PostSocialringResponse; import com.example.likelion12.service.SocialringService; -import com.example.likelion12.util.JwtProvider; +import com.example.likelion12.util.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/likelion12/service/MemberService.java b/src/main/java/com/example/likelion12/service/MemberService.java index 3cf0cec..dbf00a1 100644 --- a/src/main/java/com/example/likelion12/service/MemberService.java +++ b/src/main/java/com/example/likelion12/service/MemberService.java @@ -10,7 +10,7 @@ import com.example.likelion12.dto.PostSignupResponse; import com.example.likelion12.repository.ExerciseRepository; import com.example.likelion12.repository.MemberRepository; -import com.example.likelion12.util.JwtProvider; +import com.example.likelion12.util.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;