From 99ce30085b52eb8274233ec1a13044bae07b04ed Mon Sep 17 00:00:00 2001
From: mclub4 <mclub4@kookmin.ac.kr>
Date: Sun, 5 May 2024 21:19:52 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20api=20=EB=AC=B8=EC=84=9C=20=EC=A0=91?=
 =?UTF-8?q?=EA=B7=BC=20=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml                  |  3 ++-
 .../backgateway/config/GatewayConfig.java     |  2 ++
 back/nginx/Dockerfile                         |  2 +-
 back/nginx/default.conf.template              | 21 ++++---------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 001f22fc4a..f83573bb36 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,6 +20,7 @@ jobs:
         run: |
           echo DB_ENDPOINT=${{ secrets.DB_ENDPOINT }} >> .env
           echo DB_NAME=${{ secrets.DB_NAME }} >> .env
+          echo DB_PORT=${{ secrets.DB_PORT }} >> .env
           echo MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }} >> .env
           echo MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }} >> .env
           echo JWT_SECRET=${{ secrets.JWT_SECRET }} >> .env
@@ -35,7 +36,7 @@ jobs:
           echo S3_ACCESS_KEY=${{ secrets.S3_ACCESS_KEY }} >> .env
           echo S3_SECRET_KEY=${{ secrets.S3_SECRET_KEY }} >> .env
           echo SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }} >> .env
-          echo SEVER_NAME=${{ secrets.SERVER_NAME }} >> .env
+          echo SERVER_NAME=${{ secrets.SERVER_NAME }} >> .env
           echo SERVER_URL=${{ secrets.SERVER_URL }} >> .env
           echo CHATBOT_URL=${{ secrets.CHATBOT_URL }} >> .env
 
diff --git a/back-gateway/src/main/java/com/gateway/backgateway/config/GatewayConfig.java b/back-gateway/src/main/java/com/gateway/backgateway/config/GatewayConfig.java
index c33682323d..121e96d90d 100644
--- a/back-gateway/src/main/java/com/gateway/backgateway/config/GatewayConfig.java
+++ b/back-gateway/src/main/java/com/gateway/backgateway/config/GatewayConfig.java
@@ -16,6 +16,8 @@ public class GatewayConfig {
     public RouteLocator gatewayRoutes(RouteLocatorBuilder builder,
                                       AuthorizationHeaderFilter authFilter) {
         return builder.routes()
+                .route("chatbot",r -> r.path("/docs", "/openapi.json")
+                        .uri(chatbotUrl))
                 .route("chatbot",r -> r.path("/api/chatbot/**")
                         .filters(f->f.filter(authFilter.apply(config -> {config.setRequiredRole("role_user");})))
                         .uri(chatbotUrl))
diff --git a/back/nginx/Dockerfile b/back/nginx/Dockerfile
index 0cea13e144..af622f1c49 100644
--- a/back/nginx/Dockerfile
+++ b/back/nginx/Dockerfile
@@ -1,3 +1,3 @@
 FROM nginx
-COPY test.conf.template /etc/nginx/conf.d/default.conf.template
+COPY default.conf.template /etc/nginx/conf.d/default.conf.template
 ENTRYPOINT ["/bin/bash", "-c", "envsubst '${SERVER_NAME}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"]
diff --git a/back/nginx/default.conf.template b/back/nginx/default.conf.template
index 087980892d..4a87ac928f 100644
--- a/back/nginx/default.conf.template
+++ b/back/nginx/default.conf.template
@@ -1,9 +1,5 @@
-upstream spring_backend {
-    server spring:8080;
-}
-
-upstream ruby_backend {
-    server ruby:3000;
+upstream spring_gateway {
+    server spring_gateway:8081;
 }
 
 server {
@@ -35,17 +31,8 @@ server {
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
-     location /api {
-        proxy_pass http://spring_backend;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-Host $server_name;
-        proxy_set_header X-Forwarded-Proto $scheme;
-     }
-
-     location /api/chat {
-        proxy_pass http://ruby_backend;
+     location / {
+        proxy_pass http://spring_gateway;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Real-IP $remote_addr;