Merge branch 'develop' into feature/diary

sapiens2000 · sapiens2000 · commit a5ee16f7d7f8 · 2025-04-01T01:48:35.000+09:00
diff --git a/.github/workflows/ci.cd.prod.yml b/.github/workflows/ci.cd.prod.yml
@@ -7,11 +7,9 @@ on:
     types:
       - closed
   workflow_dispatch: # 수동 실행 가능
-
-
 # 병합됐을 때 
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
     steps:
       # 체크아웃
@@ -36,6 +34,17 @@ jobs:
           java-version: 21
           distribution: 'temurin'
 
+      # application.yml 생성
+      - name: Make application.yml
+        run: |
+          mkdir -p ./src/main/resources
+          cd ./src/main/resources
+          touch ./application.yml
+          touch ./application-secret.yml
+          
+          echo "${{ secrets.APPLICATION }}" | base64 --decode > ./application.yml
+          echo "${{ secrets.SECRET }}" | base64 --decode > ./application-secret.yml
+
       # Gradle cache 설정
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -50,24 +59,27 @@ jobs:
         with:
           arguments: clean build -x test
 
+  deploy:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
 
       # 빌드 결과물을 S3 버킷에 업로드
       - name: Upload to AWS S3
         run: |
           echo "S3 Location: s3://${{ secrets.S3_BUCKET_NAME }}/$GITHUB_SHA.zip"
           aws deploy push \
-            --application-name ${{ secrets.CODE_DEPLOY_APP_NAME }} \
-            --ignore-hidden-files \
-            --s3-location s3://${{ secrets.S3_BUCKET_NAME }}/$GITHUB_SHA.zip \
-            --source .
-
+          --application-name ${{ secrets.CODE_DEPLOY_APP_NAME }} \
+          --ignore-hidden-files \
+          --s3-location s3://${{ secrets.S3_BUCKET_NAME }}/prod/${{ github.sha }}.zip \
+          --source .
       # S3 버킷에 있는 파일을 대상으로 CodeDeploy 실행
-      - name: Deploy to AWS EC2 from S3
+      - name: Deploy to AWS EC2 from S3g
         run: |
           aws deploy create-deployment \
             --application-name ${{ secrets.CODE_DEPLOY_APP_NAME }} \
             --deployment-config-name CodeDeployDefault.AllAtOnce \
             --deployment-group-name ${{ secrets.CODE_DEPLOY_DEPLOYMENT_GROUP_NAME }} \
-            --s3-location bucket=${{ secrets.S3_BUCKET_NAME }},key=$GITHUB_SHA.zip,bundleType=zip
-          
-          
+            --s3-location bucket=${{ secrets.S3_BUCKET_NAME }},key=prod/${{ github.sha }}.zip,bundleType=zip      
diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -1,13 +1,10 @@
-name: log4u-build
+name: log4u-dev-build
 on:
-#  push:
-#    branches:
-#      - develop # dev 브랜치 push
   pull_request:
     branches:
-      - main # main pr
       - develop # develop pr
     types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
 jobs:
   build:
     name: Build and analyze
@@ -16,30 +13,59 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: 'zulu' # Alternative distribution options are available
+
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
+
       - name: Cache SonarCloud packages
         uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
+
+
+      - name: MySQL 컨테이너 실행
+        run: |
+          docker run --name test-mysql \
+            -e MYSQL_ROOT_PASSWORD=root \
+            -e MYSQL_DATABASE=log4u \
+            -e MYSQL_USER=dev \
+            -e MYSQL_PASSWORD=devcos4-team08 \
+            -d \
+            -p 3307:3306 \
+            mysql:8.0.33
+
       - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DB_URL: ${{ secrets.DB_URL }}             # Database URL
-          DB_USERNAME: ${{ secrets.DB_USERNAME }}   # Database username
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}   # Database password
+          DB_URL: jdbc:mysql://localhost:3307/log4u
+          DB_USERNAME: dev
+          DB_PASSWORD: devcos4-team08
+
+        # dev 프로필 사용
         run: |
           chmod +x ./gradlew
-          ./gradlew build jacocoTestReport sonar --info -Dsonar.branch.name=${{ github.ref_name }}
+          ./gradlew build jacocoTestReport sonar --info -Pprofile=dev -Dsonar.branch.name=${{ github.ref_name }}
+
+      - name: Docker MySQL 종료 및 제거
+        run: |
+          docker stop log4u-mysql
+          docker rm log4u-mysql
+
+      - name: Upload Test Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: problems-report
+          path: build/reports/problems/problems-report.html
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ out/
 
 ### VS Code ###
 .vscode/
+/src/main/resources/application-secret.yml
diff --git a/README.md b/README.md
@@ -0,0 +1,22 @@
+## 개발 환경 설정
+
+* 루트 디렉토리(WEB3_4_Log4U_BE)에서 다음 명령 실행
+
+
+* 개발용 MYSQL 빌드
+
+```
+# 이미지 빌드
+cd docker
+docker build -t log4u-mysql .
+
+# 최초 실행 1(볼륨 존재)
+docker run -d --name log4u-mysql -p 3307:3306 -v {file}:/var/lib/mysql log4u-mysql
+
+# 최초 실행 2(볼륨 없이)
+docker run -d --name log4u-mysql -p 3307:3306  log4u-mysql
+
+# 이미 존재할 경우 
+docker start log4u-mysql
+
+```
diff --git a/appspec.yml b/appspec.yml
@@ -3,7 +3,7 @@ os: linux
 
 files:
   - source: /
-    destination: /home/ubuntu/build
+    destination: /home/ubuntu/app
     overwrite: yes
 
 permissions:
@@ -18,11 +18,6 @@ hooks:
       timeout: 2000
       runas: ubuntu
 
-  AfterInstall:
-    - location: scripts/docker-start.sh
-      timeout: 2000
-      runas: ubuntu
-
   ApplicationStart:
     - location: scripts/deploy.sh
       timeout: 2000
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -0,0 +1,18 @@
+# MYSQL
+FROM mysql:8.0.33
+
+# 변수 설정
+ENV TZ=Asia/Seoul \
+    MYSQL_ROOT_PASSWORD=root \
+    MYSQL_USER=dev \
+    MYSQL_PASSWORD=devcos4-team08 \
+    MYSQL_DATABASE=log4u
+
+# 데이터 파일을 컨테이너에 연결
+VOLUME ["/var/lib/mysql"]
+
+# MySQL 3306 포트
+EXPOSE 3306
+
+# MYSQL 실행
+CMD ["mysqld"]
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PROJECT_ROOT="/home/ubuntu/build"
+PROJECT_ROOT="/home/ubuntu/app"
 JAR_FILE="$PROJECT_ROOT/spring-log4u.jar"
 
 APP_LOG="$PROJECT_ROOT/application.log"
@@ -11,7 +11,7 @@ TIME_NOW=$(date +%c)
 
 # build 파일 복사
 echo "$TIME_NOW > $JAR_FILE 파일 복사" >> $DEPLOY_LOG
-cp $PROJECT_ROOT/build/libs/*.jar $JAR_FILE
+cp $PROJECT_ROOT/build/libs/Log4U-0.0.1-SNAPSHOT.jar $JAR_FILE
 
 # jar 파일 실행
 echo "$TIME_NOW > $JAR_FILE 파일 실행" >> $DEPLOY_LOG
diff --git a/scripts/stop.sh b/scripts/stop.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PROJECT_ROOT="/home/ubuntu/build"
+PROJECT_ROOT="/home/ubuntu/app"
 JAR_FILE="$PROJECT_ROOT/spring-log4u.jar"
 
 DEPLOY_LOG="$PROJECT_ROOT/deploy.log"
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -0,0 +1,16 @@
+logging:
+  level:
+    org:
+      springframework: debug
+
+spring:
+  jpa:
+    database-platform: org.hibernate.dialect.MySQLDialect
+    hibernate:
+      ddl-auto: create
+
+  datasource:
+    url: jdbc:mysql://localhost:3307/log4u
+    username: dev
+    password: devcos4-team08
+    driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -0,0 +1,52 @@
+logging:
+  level:
+    org:
+      springframework: debug
+
+spring:
+  profiles:
+    include: secret
+
+  datasource:
+    url: ${aws-mysql.url}
+    username: ${aws-mysql.username}
+    password: ${aws-mysql.password}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  jpa:
+    database-platform: org.hibernate.dialect.MySQLDialect
+    hibernate:
+      ddl-auto: create
+
+
+  security:
+    oauth2:
+      client:
+        registration:
+          naver:
+            client-name: naver
+            client-id: ${naver.client-id}
+            client-secret: ${naver.client-secret}
+            redirect-uri: ${naver.redirect-uri}
+            authorization-grant-type: authorization_code
+            scope:
+              - name
+              - email
+              - nickname
+
+          google:
+            client-name: google
+            client-id: ${google.client-id}
+            client-secret: ${google.client-secret}
+            redirect-uri: ${google.redirect-uri}
+            authorization-grant-type: authorization_code
+            scope:
+              - profile
+              - email
+
+        provider:
+          naver:
+            authorization-uri: https://nid.naver.com/oauth2.0/authorize
+            token-uri: https://nid.naver.com/oauth2.0/token
+            user-info-uri: https://openapi.naver.com/v1/nid/me
+            user-name-attribute: response
diff --git a/src/test/java/com/example/log4u/Log4UApplicationTests.java b/src/test/java/com/example/log4u/Log4UApplicationTests.java
@@ -1,13 +1,12 @@
 package com.example.log4u;
 
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
 class Log4UApplicationTests {
 
-    @Test
-    void contextLoads() {
-    }
+	// @Test
+	// void contextLoads() {
+	// }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,4 @@ out/`
`35`	`35`
`36`	`36`	`### VS Code ###`
`37`	`37`	`.vscode/`
	`38`	`+/src/main/resources/application-secret.yml`