From 78d257f010beef8428fc80e0b70058401ddc7bd7 Mon Sep 17 00:00:00 2001
From: taekyung <taekyung630@naver.com>
Date: Fri, 10 Oct 2025 17:39:34 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9A=B4=EC=98=81=EC=84=9C=EB=B2=84=20r?=
 =?UTF-8?q?abbitmq=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/prod-server.yml         | 3 ++-
 .github/workflows/test-server-cd.yml      | 3 ++-
 src/main/resources/application-server.yml | 6 ++++++
 src/main/resources/application.yml        | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml
index b3e8d881..d0d7ffd9 100644
--- a/.github/workflows/prod-server.yml
+++ b/.github/workflows/prod-server.yml
@@ -88,7 +88,8 @@ jobs:
               -e SPRING_DATASOURCE_PASSWORD="${{secrets.PROD_DB_PASSWORD}}" \
               -e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \
               -e AWS_S3_PREFIX="${{secrets.PROD_AWS_S3_PREFIX}}" \
-              -e SPRING_RABBITMQ_HOST="${{secrets.PROD_RABBITMQ_HOST}}" \
+              -e SPRING_RABBITMQ_HOST="${{secrets.RABBITMQ_HOST}}" \ 
+              -e SPRING_RABBITMQ_PORT="${{secrets.PROD_RABBITMQ_PORT}}" \
               -e SPRING_RABBITMQ_USERNAME="${{secrets.PROD_RABBITMQ_USERNAME}}" \
               -e SPRING_RABBITMQ_PASSWORD="${{secrets.PROD_RABBITMQ_PASSWORD}}" \
               -e REDIS_HOST="${{secrets.PROD_REDIS_HOST}}" \
diff --git a/.github/workflows/test-server-cd.yml b/.github/workflows/test-server-cd.yml
index 59df8da7..ea2d53b1 100644
--- a/.github/workflows/test-server-cd.yml
+++ b/.github/workflows/test-server-cd.yml
@@ -65,7 +65,8 @@ jobs:
               -e SPRING_DATASOURCE_PASSWORD="${{secrets.TEST_DB_PASSWORD}}" \
               -e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \
               -e AWS_S3_PREFIX="${{secrets.TEST_AWS_S3_PREFIX}}" \
-              -e SPRING_RABBITMQ_HOST="${{secrets.TEST_RABBITMQ_HOST}}" \
+              -e SPRING_RABBITMQ_HOST="${{secrets.RABBITMQ_HOST}}" \
+              -e SPRING_RABBITMQ_PORT="${{secrets.TEST_RABBITMQ_PORT}}" \
               -e SPRING_RABBITMQ_USERNAME="${{secrets.TEST_RABBITMQ_USERNAME}}" \
               -e SPRING_RABBITMQ_PASSWORD="${{secrets.TEST_RABBITMQ_PASSWORD}}" \
               -e REDIS_HOST="${{secrets.TEST_REDIS_HOST}}" \
diff --git a/src/main/resources/application-server.yml b/src/main/resources/application-server.yml
index d4945079..98e809d4 100644
--- a/src/main/resources/application-server.yml
+++ b/src/main/resources/application-server.yml
@@ -33,6 +33,12 @@ spring:
           google:
             redirect-uri: ${GOOGLE_REDIRECT_URI}
 
+  rabbitmq:
+    host: ${SPRING_RABBITMQ_HOST}
+    port: ${SPRING_RABBITMQ_PORT}
+    username: ${SPRING_RABBITMQ_USERNAME}
+    password: ${SPRING_RABBITMQ_PASSWORD}
+
 front:
   redirect_domain: ${FRONT_REDIRECT_DOMAIN}
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 801c394b..054b3e69 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,10 +48,10 @@ spring:
 
   # RabbitMQ 설정
   rabbitmq:
-    host: ${SPRING_RABBITMQ_HOST:localhost}
+    host: localhost
     port: 5672
-    username: ${SPRING_RABBITMQ_USERNAME:guest}
-    password: ${SPRING_RABBITMQ_PASSWORD:guest}
+    username: guest
+    password: guest
     listener:
       simple:
         retry: