From e7126d92ceff0839517990338ca499a384b41d36 Mon Sep 17 00:00:00 2001 From: jihyeon baek Date: Tue, 25 Jun 2024 14:49:13 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20ci-cd=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .deploy/deploy.sh | 21 ------------------- .../controller/api/AnniversaryApi.java | 2 +- src/main/resources/application.yml | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 .deploy/deploy.sh diff --git a/.deploy/deploy.sh b/.deploy/deploy.sh deleted file mode 100644 index b072f5e..0000000 --- a/.deploy/deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# 현재 실행 중인 JAR 프로세스를 찾고 종료합니다. -CURRENT_PID=$(pgrep -f .jar) -echo "$CURRENT_PID" -if [ -z $CURRENT_PID ]; then - echo "no process" -else - echo "kill $CURRENT_PID" - kill -9 $CURRENT_PID - sleep 3 -fi - -# 새로운 JAR 파일의 경로를 설정하고 실행 권한을 부여합니다. -JAR_PATH="/home/ec2-user/cicd/*.jar" -echo "jar path : $JAR_PATH" -chmod +x $JAR_PATH - -# 새로운 JAR 파일을 백그라운드에서 실행합니다. -nohup java -jar $JAR_PATH > /dev/null 2> /dev/null < /dev/null & -echo "jar file deploy success" diff --git a/src/main/java/com/example/fiurinee/domain/anniversary/controller/api/AnniversaryApi.java b/src/main/java/com/example/fiurinee/domain/anniversary/controller/api/AnniversaryApi.java index 49a9b2d..0e47cd8 100644 --- a/src/main/java/com/example/fiurinee/domain/anniversary/controller/api/AnniversaryApi.java +++ b/src/main/java/com/example/fiurinee/domain/anniversary/controller/api/AnniversaryApi.java @@ -37,7 +37,7 @@ public interface AnniversaryApi { ResponseEntity addAnniversary(@Parameter(name = "id", description = "멤버아이디")@PathVariable Long id, @RequestBody AnniversaryRequestDTO request); @Operation( - summary = "기념일 수정", + summary = "기념일 수정입니닷", description = "사용자의 기념일을 수정합니다.", security = @SecurityRequirement(name = "bearerAuth") ) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5b59825..2c7c67c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -33,7 +33,7 @@ spring: client-id: ${KAKAO_CLIENT_ID} client-secret: ${KAKAO_CLIENT_SECRET} client-authentication-method: client_secret_post - redirect-uri: http://localhost:8080/oauth2/authorization/kakao + redirect-uri: http://localhost:8080/login/oauth2/code/kakao authorization-grant-type: authorization_code client-name: kakao scope: