Git Submodule을 사용하여 AWS EC2에 위치한 설정을 관리하도록 변경

.github/workflows/backend_cd.yml

@@ -8,8 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on:
-      - ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - name: 체크아웃
         uses: actions/checkout@v4
@@ -30,46 +29,70 @@ jobs:
       - name: Artifact 업로드
         uses: actions/upload-artifact@v4
         with:
-          name: code-zap-jar
+          name: code-zap
           path: backend/build/libs/*.jar
 
   deploy_develop:
-    needs: build
     if: ${{ github.ref == 'refs/heads/dev/be' }}
+    needs: build
+    environment: Develop
     runs-on:
-      - self-hosted
-      - spring
       - develop
+      - spring
     steps:
+      - name: 체크아웃
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          token: ${{ secrets.PRIVATE_REPO_ACCESS }}
+
+      - name: Compose 설정 복사
+        run: ${{ secrets.RUN_COPY_COMPOSE }}
+
+      - name: Compose 환경변수 주입
+        working-directory: ${{ secrets.PROJECT_PATH }}
+        run: ${{ secrets.ENV_VARIABLES }}
+
       - name: Artifact 다운로드
         uses: actions/download-artifact@v4
         with:
-          name: code-zap-jar
-          path: ${{ secrets.SPRING_DIRECTORY }}
-      - name: 배포 스크립트 실행
-        run: |
-          cd ${{ secrets.SPRING_DIRECTORY }}
-          mv code-zap*.jar ${{ secrets.JAR_NAME }}
-          docker compose restart
+          name: code-zap
+          path: ${{ secrets.SPRING_PATH }}
+
+      - name: 배포
+        working-directory: ${{ secrets.PROJECT_PATH }}
+        run: ${{ secrets.RUN_SERVER }}
 
   deploy_production:
-    needs: build
     if: ${{ github.ref == 'refs/heads/main' }}
+    needs: build
+    environment: Production
     strategy:
       matrix:
-        environment: [prod_a, prod_b]
+        runners: [ prod_a, prod_b ]
     runs-on:
-      - self-hosted
       - spring
-      - ${{ matrix.environment }}
+      - ${{ matrix.runners }}
     steps:
+      - name: 체크아웃
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          token: ${{ secrets.PRIVATE_REPO_ACCESS }}
+
+      - name: Compose 설정 복사
+        run: ${{ secrets.RUN_COPY_COMPOSE }}
+
+      - name: Compose 환경변수 주입
+        working-directory: ${{ secrets.PROJECT_PATH }}
+        run: ${{ secrets.ENV_VARIABLES }}
+
       - name: Artifact 다운로드
         uses: actions/download-artifact@v4
         with:
-          name: code-zap-jar
-          path: ${{ secrets.SPRING_DIRECTORY }}
-      - name: 배포 스크립트 실행
-        run: |
-          cd ${{ secrets.SPRING_DIRECTORY }}
-          mv code-zap*.jar ${{ secrets.JAR_NAME }}
-          docker compose restart
+          name: code-zap
+          path: ${{ secrets.SPRING_PATH }}
+
+      - name: 배포
+        working-directory: ${{ secrets.PROJECT_PATH }}
+        run: ${{ secrets.RUN_SERVER }}

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "backend/submodules/private"]
+	path = backend/submodules/private
+	url = https://github.com/codezap2024/2024-code-zap-private.git
+  	branch = main

backend/src/main/java/codezap/global/logger/RequestResponseLogger.java

@@ -1,7 +1,6 @@
 package codezap.global.logger;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 
 import jakarta.servlet.FilterChain;
@@ -32,18 +31,14 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         filterChain.doFilter(requestWrapper, responseWrapper);
         long duration = System.currentTimeMillis() - startTime;
 
-        log.info("[Request] {} {}, 헤더 값: {} \n 요청 바디: {}", request.getMethod(), request.getRequestURI(),
-                getHeaderAndValue(requestWrapper), getBodyAsUtf8String(requestWrapper.getContentAsByteArray()));
-        log.info("[Response] Status: {}, Duration: {}ms, 헤더 값: {} \n 응답 바디: {}", response.getStatus(), duration,
-                getHeaderAndValue(responseWrapper), getBodyAsUtf8String(responseWrapper.getContentAsByteArray()));
+        log.info("[Request] {} {}, 헤더 값: {} \n", request.getMethod(), request.getRequestURI(),
+                getHeaderAndValue(requestWrapper));
+        log.info("[Response] Status: {}, Duration: {}ms, 헤더 값: {} \n", response.getStatus(), duration,
+                getHeaderAndValue(responseWrapper));
 
         responseWrapper.copyBodyToResponse();
     }
 
-    private String getBodyAsUtf8String(byte[] bytes) {
-        return new String(bytes, StandardCharsets.UTF_8);
-    }
-
     private String getHeaderAndValue(ContentCachingRequestWrapper requestWrapper) {
         StringBuilder headerAndValue = new StringBuilder();
         requestWrapper.getHeaderNames().asIterator().forEachRemaining(headerName -> {
@@ -64,6 +59,6 @@ private String getHeaderAndValue(ContentCachingResponseWrapper requestWrapper) {
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) {
         String path = request.getRequestURI();
-        return path.contains("/swagger") || path.contains("/v3/api-docs") || path.contains("/actuator/prometheus");
+        return path.contains("/swagger") || path.contains("/v3/api-docs") || path.contains("/actuator");
     }
 }

backend/src/main/resources/application-actuator.yml

@@ -0,0 +1,13 @@
+spring:
+  config:
+    activate:
+      on-profile: actuator
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health,info,metrics,prometheus
+  endpoint:
+    health:
+      show-details: always

backend/src/main/resources/application-cors.yml

@@ -0,0 +1,3 @@
+cors:
+  allowed-origins: ${ALLOWED_ORIGINS}
+  allowed-origins-patterns: ${ALLOWED_ORIGINS_PATTERNS}

backend/src/main/resources/application-db.yml

@@ -0,0 +1,31 @@
+spring:
+  config:
+    activate:
+      on-profile: db
+  datasource:
+    write:
+      jdbc-url: ${MYSQL_WRITER_URL}
+      username: ${MYSQL_USER}
+      password: ${MYSQL_PASSWORD}
+      driver-class-name: com.mysql.cj.jdbc.Driver
+    read:
+      jdbc-url: ${MYSQL_READER_URL}
+      username: ${MYSQL_USER}
+      password: ${MYSQL_PASSWORD}
+      driver-class-name: com.mysql.cj.jdbc.Driver
+  flyway:
+    enabled: true
+    baseline-on-migrate: true
+    baseline-version: 2
+    locations: classpath:db/migration
+    url: ${MYSQL_WRITER_URL}
+    username: ${MYSQL_USER}
+    password: ${MYSQL_PASSWORD}
+  jpa:
+    # open-in-view: false
+    hibernate:
+      ddl-auto: validate
+    properties:
+      hibernate:
+        dialect: codezap.template.repository.FullTextSearchMySQLDialect
+  data.web.pageable.one-indexed-parameters: true

backend/src/main/resources/application-local.yml

@@ -1,4 +1,7 @@
 spring:
+  config:
+    activate:
+      on-profile: local
   output:
     ansi:
       enabled: always

backend/src/main/resources/application-swagger.yml

@@ -0,0 +1,8 @@
+springdoc:
+  default-consumes-media-type: application/json
+  default-produces-media-type: application/json
+  swagger-ui:
+    path: /swagger-ui.html
+    enabled: true
+    supportedSubmitMethods: get
+    display-request-duration: false

backend/src/main/resources/application.yml

@@ -1,4 +1,6 @@
 spring:
   profiles:
-    active:
-      - local
+    group:
+      default: local
+      dev: db, actautor, swagger, cors
+      prod: db, actautor, swagger, cors