diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 38129eb..d0b55a9 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,11 +2,11 @@ REPOSITORY=/home/ec2-user/app cd $REPOSITORY APP_NAME=kimgreen -#JAR_NAME=$(ls $REPOSITORY/build/libs/ | grep '.jar' | head -n 1) -JAR_NAME=/home/ec2-user/app/build/libs/backend-0.0.1-SNAPSHOT.jar +JAR_NAME=$(ls $REPOSITORY/build/libs/ | grep '.jar' | head -n 1) +#JAR_NAME=/home/ec2-user/app/build/libs/backend-0.0.1-SNAPSHOT.jar JAR_PATH=$REPOSITORY/build/libs/$JAR_NAME -CURRENT_PID=$(pgrep -f $APP_NAME) +CURRENT_PID=$(pgrep -f java) if [ -z $CURRENT_PID ] #2 then diff --git a/src/main/java/com/kimgreen/backend/domain/notification/repository/FCMTokenRepository.java b/src/main/java/com/kimgreen/backend/domain/notification/repository/FCMTokenRepository.java index d778384..814efd9 100644 --- a/src/main/java/com/kimgreen/backend/domain/notification/repository/FCMTokenRepository.java +++ b/src/main/java/com/kimgreen/backend/domain/notification/repository/FCMTokenRepository.java @@ -2,7 +2,9 @@ import com.kimgreen.backend.domain.notification.entity.FCMToken; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +@Repository public interface FCMTokenRepository extends JpaRepository { public FCMToken findByReceiverId(String email); public boolean existsByReceiverId(String email); diff --git a/src/main/java/com/kimgreen/backend/domain/notification/repository/NotificationRepository.java b/src/main/java/com/kimgreen/backend/domain/notification/repository/NotificationRepository.java index 3c2fd5f..686e15e 100644 --- a/src/main/java/com/kimgreen/backend/domain/notification/repository/NotificationRepository.java +++ b/src/main/java/com/kimgreen/backend/domain/notification/repository/NotificationRepository.java @@ -5,7 +5,9 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +@Repository public interface NotificationRepository extends JpaRepository { Page findAllByMember(Member member, Pageable pageable); } diff --git a/src/main/java/com/kimgreen/backend/domain/notification/service/FCMService.java b/src/main/java/com/kimgreen/backend/domain/notification/service/FCMService.java index 666f6c5..cfc6104 100644 --- a/src/main/java/com/kimgreen/backend/domain/notification/service/FCMService.java +++ b/src/main/java/com/kimgreen/backend/domain/notification/service/FCMService.java @@ -36,7 +36,7 @@ public class FCMService { @Value("${fcm.key.scope}") private String fireBaseScope; - @Value(("{fcm.url}")) + @Value(("${fcm.url}")) private String FCM_URL; private final FCMTokenRepository fcmTokenRepository;