사용자 개인 템플릿 페이지 탐색 기능 구현

.github/workflows/backend_cd.yml

@@ -3,53 +3,73 @@ name: Backend CD
 on:
   push:
     branches:
+      - main
       - dev/be
 
 jobs:
   build:
-    runs-on: [self-hosted, develop, spring]
+    runs-on:
+      - ubuntu-latest
     steps:
-      - name: 브랜치명을 통해 개발 환경 알아내기
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash find-env-by-branch.sh
-
       - name: 체크아웃
         uses: actions/checkout@v4
 
+      - name: JDK 설치
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
       - name: gradle 캐싱
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: bootJar로 jar 파일 생성
-        run: |
-          ./gradlew bootJar
-          mv build/libs/*.jar ${{ secrets.WORK_DIRECTORY }}/${{ env.ENVIRONMENT }}
-        working-directory: ./backend
+        run: ./gradlew bootJar
+        working-directory: backend
 
-      - name: 클린업
-        if: always()
-        run: rm -rf ../2024-code-zap/*
+      - name: Artifact 업로드
+        uses: actions/upload-artifact@v4
+        with:
+          name: code-zap-jar
+          path: backend/build/libs/*.jar
 
-  deploy:
+  deploy_develop:
     needs: build
-    runs-on: [self-hosted, develop, spring]
+    if: ${{ github.ref == 'refs/heads/dev/be' }}
+    runs-on:
+      - self-hosted
+      - spring
+      - develop
     steps:
-      - name: 브랜치명을 통해 개발 환경 알아내기
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash find-env-by-branch.sh
-
-      - name: 실행 프로세스 확인
-        run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash check-old-pids.sh
-
+      - name: Artifact 다운로드
+        uses: actions/download-artifact@v4
+        with:
+          name: code-zap-jar
+          path: ${{ secrets.SPRING_DIRECTORY }}
       - name: 배포 스크립트 실행
         run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          RUNNER_TRACKING_ID="" && bash start.sh ${{ env.ENVIRONMENT }}
+          cd ${{ secrets.SPRING_DIRECTORY }}
+          mv code-zap*.jar ${{ secrets.JAR_NAME }}
+          docker compose restart
 
-      - name: 실행 프로세스 확인으로 배포 검증
+  deploy_production:
+    needs: build
+    if: ${{ github.ref == 'refs/heads/main' }}
+    strategy:
+      matrix:
+        environment: [prod_a, prod_b]
+    runs-on:
+      - self-hosted
+      - spring
+      - ${{ matrix.environment }}
+    steps:
+      - name: Artifact 다운로드
+        uses: actions/download-artifact@v4
+        with:
+          name: code-zap-jar
+          path: ${{ secrets.SPRING_DIRECTORY }}
+      - name: 배포 스크립트 실행
         run: |
-          cd ${{ secrets.SCRIPT_DIRECTORY }}
-          bash verify-deploy.sh
+          cd ${{ secrets.SPRING_DIRECTORY }}
+          mv code-zap*.jar ${{ secrets.JAR_NAME }}
+          docker compose restart

.github/workflows/backend_ci.yml

@@ -27,6 +27,9 @@ jobs:
         working-directory: ./backend/src/main/resources
         run: echo "${{ secrets.APPLICATION_DB_YAML }}" > application-db.yml
 
+      - name: gradle 캐싱
+        uses: gradle/actions/setup-gradle@v4
+
       - name: JDK 17 설정
         uses: actions/setup-java@v4
         with:

backend/.gitignore

@@ -21,3 +21,7 @@ out/
 
 ### YAML ###
 application-db.yml
+
+### compose ###
+docker/app/*.jar
+docker/.env

backend/docker/app/application.yml

@@ -0,0 +1,24 @@
+spring:
+  config:
+    activate:
+      on-profile: local
+  datasource:
+    url: jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?serverTimezone=Asia/Seoul
+    username: root
+    password: ${MYSQL_ROOT_PASSWORD}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  flyway:
+    enabled: false
+  jpa:
+    hibernate:
+      ddl-auto: create-drop
+    properties:
+      hibernate:
+        format_sql: true
+        show_sql: true
+  output:
+    ansi:
+      enabled: always
+
+#cors:
+#  allowed-origins: http://localhost:3000

backend/docker/compose.yml

@@ -0,0 +1,35 @@
+name: code-zap
+
+services:
+  mysql:
+    image: mysql:8.4.2
+    expose:
+      - ${MYSQL_PORT}
+    ports:
+      - ${HOST_PORT}:${MYSQL_PORT}
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      TZ: Asia/Seoul
+    volumes:
+      - code-zap:/var/lib/mysql
+
+  spring:
+    image: amazoncorretto:17
+    ports:
+      - "8080:8080"
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      TZ: Asia/Seoul
+    volumes:
+      - ./app:/app
+    entrypoint: [
+      "java", "-jar",
+      "-Dspring.config.location=/app/application.yml",
+      "-Dspring.profiles.active=local",
+      "/app/zap.jar"
+    ]
+
+volumes:
+  code-zap:

backend/docker/run.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+abs_path=$(readlink -f "$0");
+abs_dir=$(dirname "$abs_path");
+
+backend_path=$(realpath "$abs_path/../..")
+
+cd "$backend_path" || exit
+
+./gradlew clean
+./gradlew bootJar
+
+jar_path="$backend_path/build/libs"
+jar_filename=$(ls -tr "$jar_path"/*.jar | grep ".*\.jar")
+
+mkdir "$abs_dir/app"
+mv "$jar_filename" "$abs_dir/app/zap.jar"
+
+cd "$abs_dir" || exit
+docker compose up -d

backend/src/main/java/codezap/CodeZapApplication.java

@@ -5,9 +5,7 @@
 
 @SpringBootApplication
 public class CodeZapApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(CodeZapApplication.class, args);
     }
-
 }

backend/src/main/java/codezap/auth/configuration/AuthArgumentResolver.java

@@ -3,14 +3,15 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
+import org.springframework.lang.NonNull;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 import codezap.auth.manager.CredentialManager;
 import codezap.auth.provider.CredentialProvider;
-import codezap.member.dto.MemberDto;
+import codezap.member.domain.Member;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -25,14 +26,14 @@ public boolean supportsParameter(MethodParameter parameter) {
     }
 
     @Override
-    public MemberDto resolveArgument(
-            MethodParameter parameter,
+    public Member resolveArgument(
+            @NonNull MethodParameter parameter,
             ModelAndViewContainer mavContainer,
             NativeWebRequest webRequest,
             WebDataBinderFactory binderFactory
     ) {
         HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
         String credential = credentialManager.getCredential(request);
-        return MemberDto.from(credentialProvider.extractMember(credential));
+        return credentialProvider.extractMember(credential);
     }
 }

backend/src/main/java/codezap/auth/dto/response/LoginResponse.java

@@ -3,7 +3,7 @@
 import codezap.member.domain.Member;
 
 public record LoginResponse(
-        long memberId,
+        Long memberId,
         String name
 ) {
     public static LoginResponse from(Member member) {

backend/src/main/java/codezap/auth/encryption/PasswordEncryptor.java

@@ -0,0 +1,5 @@
+package codezap.auth.encryption;
+
+public interface PasswordEncryptor {
+    String encrypt(String plainPassword, String salt);
+}

backend/src/main/java/codezap/auth/encryption/RandomSaltGenerator.java

@@ -0,0 +1,18 @@
+package codezap.auth.encryption;
+
+import java.security.SecureRandom;
+import java.util.Base64;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class RandomSaltGenerator implements SaltGenerator {
+
+    @Override
+    public String generate() {
+        SecureRandom byteGenerator = new SecureRandom();
+        byte[] saltByte = new byte[32];
+        byteGenerator.nextBytes(saltByte);
+        return Base64.getEncoder().encodeToString(saltByte);
+    }
+}

backend/src/main/java/codezap/auth/encryption/SHA2PasswordEncryptor.java

@@ -0,0 +1,30 @@
+package codezap.auth.encryption;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+import codezap.global.exception.CodeZapException;
+
+@Component
+public class SHA2PasswordEncryptor implements PasswordEncryptor {
+    private final MessageDigest digest;
+
+    public SHA2PasswordEncryptor() {
+        try {
+            digest = MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            throw new CodeZapException(HttpStatus.INTERNAL_SERVER_ERROR, "암호화 알고리즘이 잘못 명시되었습니다.");
+        }
+    }
+
+    @Override
+    public String encrypt(String plainPassword, String salt) {
+        String passwordWithSalt = plainPassword + salt;
+        byte[] encryptByte = digest.digest(passwordWithSalt.getBytes());
+        return Base64.getEncoder().encodeToString(encryptByte);
+    }
+}