Merge develop to main branch

.github/workflows/ci-cd.yml

@@ -7,24 +7,8 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  test:
+  build-and-push:
     runs-on: ubuntu-latest
-    permissions:
-      checks: write
-
-    services:
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_ROOT_PASSWORD: dondothat1234
-          MYSQL_DATABASE: dondothat
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping -h localhost"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=5
 
     steps:
       - uses: actions/checkout@v3
@@ -48,70 +32,17 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Wait for MySQL to be ready
-        run: |
-          for i in {30..0}; do
-            if mysqladmin ping -h"127.0.0.1" --silent; then
-              echo "MySQL is ready"
-              break
-            fi
-            echo "Waiting for MySQL... ($i seconds remaining)"
-            sleep 1
-          done
-          if [ "$i" = 0 ]; then
-            echo "MySQL failed to start"
-            exit 1
-          fi
-
-      - name: Verify MySQL connection and create test database
-        run: |
-          mysql -h127.0.0.1 -uroot -pdondothat1234 -e "SELECT VERSION();"  # 수정
-          mysql -h127.0.0.1 -uroot -pdondothat1234 -e "CREATE DATABASE IF NOT EXISTS dondothat CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"  # 수정
-          mysql -h127.0.0.1 -uroot -pdondothat1234 -e "SHOW DATABASES;"  # 수정
-
-      - name: Run tests
+      - name: Install Gradle manually
         run: |
-          set -x
-          ./gradlew --version
-          java -classpath gradle/wrapper/gradle-wrapper.jar org.gradle.wrapper.GradleWrapperMain tasks
-          java -classpath gradle/wrapper/gradle-wrapper.jar org.gradle.wrapper.GradleWrapperMain test
-        env:
-          SPRING_PROFILES_ACTIVE: test
-
-      - name: Generate test report
-        uses: dorny/test-reporter@v1
-        if: success() || failure()
-        with:
-          name: Gradle Tests
-          path: build/test-results/test/*.xml
-          reporter: java-junit
-          fail-on-error: true
-
-  build-and-push:
-    needs: test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          wget -q https://services.gradle.org/distributions/gradle-8.8-bin.zip
+          unzip -q gradle-8.8-bin.zip
+          export PATH=$PATH:$(pwd)/gradle-8.8/bin
+          gradle --version
 
       - name: Build with Gradle
-        run: java -classpath gradle/wrapper/gradle-wrapper.jar org.gradle.wrapper.GradleWrapperMain build -x test
+        run: |
+          export PATH=$PATH:$(pwd)/gradle-8.8/bin
+          gradle build -x test
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -133,42 +64,129 @@ jobs:
           cache-to: type=gha,mode=max
 
   deploy:
-    needs: [test, build-and-push]
+    needs: [build-and-push]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop') && github.event_name == 'push'
 
     steps:
-      - name: Deploy with Docker Compose
+      - uses: actions/checkout@v3
+
+      - name: Deploy with Docker Compose and Nginx
         uses: appleboy/ssh-action@v1.0.0
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
           timeout: 300s
           script: |
-            # Docker Compose 파일 생성 (Spring Legacy + Tomcat)
-            cat > docker-compose.yml << 'EOF'
+            # 환경 변수 설정
+            export GOOGLE_CLIENT_ID="${{ secrets.GOOGLE_CLIENT_ID }}"
+            export GOOGLE_CLIENT_SECRET="${{ secrets.GOOGLE_CLIENT_SECRET }}"
+            export NAVER_CLIENT_ID="${{ secrets.NAVER_CLIENT_ID }}"
+            export NAVER_CLIENT_SECRET="${{ secrets.NAVER_CLIENT_SECRET }}"
+            export BASE_URL="${{ secrets.BASE_URL }}"
+            export JWT_SECRET="${{ secrets.JWT_SECRET }}"
+            export AES_SECRET_KEY="${{ secrets.AES_SECRET_KEY }}"
+            export CODEF_CLIENT_ID="${{ secrets.CODEF_CLIENT_ID }}"
+            export CODEF_CLIENT_SECRET="${{ secrets.CODEF_CLIENT_SECRET }}"
+            export CODEF_PUBLIC_KEY="${{ secrets.CODEF_PUBLIC_KEY }}"
+            export API_KEY="${{ secrets.API_KEY }}"
+            export FSS_API_KEY="${{ secrets.FSS_API_KEY }}"
+            export FSS_API_URL="${{ secrets.FSS_API_URL }}"
+            export LLM_SERVER_URL="${{ secrets.LLM_SERVER_URL }}"
+
+            # SSL 인증서 디렉토리 생성 (없다면)
+            mkdir -p ssl
+
+            # SSL 인증서 생성 (없다면)
+            if [ ! -f ssl/server.key ] || [ ! -f ssl/server.crt ]; then
+              cd ssl
+              openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+                -keyout server.key -out server.crt \
+                -subj "/C=KR/ST=Seoul/L=Seoul/O=DonDoThat/CN=54.208.50.238"
+              cd ..
+            fi
+
+            # Docker Compose 파일 생성
+            cat > docker-compose.yml << EOF
             version: "3.8"
 
             services:
+              nginx:
+                image: nginx:alpine
+                container_name: nginx-proxy
+                ports:
+                  - "80:80"
+                  - "443:443"
+                volumes:
+                  - ./nginx.conf:/etc/nginx/nginx.conf
+                  - ./ssl:/etc/nginx/ssl
+                depends_on:
+                  - dondothat-server
+                  - llm-server
+                networks:
+                  - dondothat-network
+                restart: always
+
+              redis-server:
+                image: redis:7-alpine
+                container_name: redis-server
+                restart: always
+                expose:
+                  - "6379"
+                networks:
+                  - dondothat-network
+
+              llm-server:
+                image: ec2-user-llm-server
+                container_name: llm-server
+                expose:
+                  - "8000"
+                environment:
+                  - API_KEY=${{ secrets.API_KEY }}
+                networks:
+                  - dondothat-network
+                restart: unless-stopped
+
               dondothat-server:
                 image: ghcr.io/${{ github.repository_owner }}/dondothat:latest
                 container_name: dondothat-server
-                ports:
-                  - "8080:8080"
+                expose:
+                  - "8080"
                 environment:
                   - SPRING_PROFILES_ACTIVE=prod
                   - DB_HOST=mysql-server
                   - DB_USERNAME=root
                   - DB_PASSWORD=dondothat1234
                   - DB_NAME=dondothat
+                  - REDIS_HOST=redis-server
+                  - SPRING_MAIL_HOST=${{ secrets.SMTP_HOST }}
+                  - SPRING_MAIL_PORT=${{ secrets.SMTP_PORT }}
+                  - SPRING_MAIL_USERNAME=${{ secrets.SMTP_USERNAME }}
+                  - SPRING_MAIL_PASSWORD=${{ secrets.SMTP_PASSWORD }}
+                  - SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${{ secrets.SMTP_AUTH }}
+                  - SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${{ secrets.SMTP_STARTTLS_ENABLE }}
+                  - GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID
+                  - GOOGLE_CLIENT_SECRET=$GOOGLE_CLIENT_SECRET
+                  - NAVER_CLIENT_ID=$NAVER_CLIENT_ID
+                  - NAVER_CLIENT_SECRET=$NAVER_CLIENT_SECRET
+                  - BASE_URL=$BASE_URL
+                  - JWT_SECRET=$JWT_SECRET
+                  - AES_SECRET_KEY=$AES_SECRET_KEY
+                  - CODEF_CLIENT_ID=$CODEF_CLIENT_ID
+                  - CODEF_CLIENT_SECRET=$CODEF_CLIENT_SECRET
+                  - CODEF_PUBLIC_KEY=$CODEF_PUBLIC_KEY
+                  - FSS_API_KEY=${{ secrets.FSS_API_KEY }}
+                  - FSS_API_URL=${{ secrets.FSS_API_URL }}
+                  - LLM_SERVER_URL=${{ secrets.LLM_SERVER_URL }}
                 depends_on:
-                  - mysql
+                  - mysql-server
+                  - redis-server
                 networks:
                   - dondothat-network
                 restart: unless-stopped
 
-              mysql:
+              mysql-server:
                 image: mysql:8.0
                 container_name: mysql-server
                 environment:
@@ -192,6 +210,8 @@ jobs:
 
             # 최신 이미지 pull
             docker pull ghcr.io/${{ github.repository_owner }}/dondothat:latest
+            docker pull redis:7-alpine
+            docker pull nginx:alpine
 
             # 서비스 재시작
             /usr/local/bin/docker-compose down || true
@@ -200,4 +220,15 @@ jobs:
             # 상태 확인
             sleep 15
             /usr/local/bin/docker-compose ps
-            /usr/local/bin/docker-compose logs --tail=10 dondothat-server
+            /usr/local/bin/docker-compose logs --tail=10 nginx
+            /usr/local/bin/docker-compose logs --tail=10 dondothat-server
+
+      - name: Copy Nginx config to EC2
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: "nginx/nginx.conf"
+          target: "."
+          strip_components: 1

build.gradle

@@ -24,11 +24,10 @@ test {
     }
 }
 
-sourceCompatibility = '17'
-targetCompatibility = '17'
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
+java {
+    sourceCompatibility = '17'
+    targetCompatibility = '17'
+    [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 }
 
 dependencies {
@@ -39,8 +38,40 @@ dependencies {
     implementation "org.springframework:spring-tx:${springVersion}"
     implementation "org.springframework:spring-jdbc:${springVersion}"
 
+    // Spring Security
+    implementation "org.springframework.security:spring-security-core:5.8.12"
+    implementation "org.springframework.security:spring-security-web:5.8.12"
+    implementation "org.springframework.security:spring-security-config:5.8.12"
+
+    // OAuth2 Client
+    implementation 'org.springframework.security:spring-security-oauth2-client:5.8.12'
+    implementation 'org.springframework.security:spring-security-oauth2-core:5.8.12'
+    implementation 'org.springframework.security:spring-security-oauth2-jose:5.8.12'
+
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // HTTP Client
+    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
+
     // Web Socket
     implementation "org.springframework:spring-websocket:${springVersion}"
+    implementation "org.springframework:spring-messaging:${springVersion}"
+
+    // Email 관련 의존성
+    implementation 'org.springframework:spring-context-support:5.3.37'
+    implementation 'javax.mail:javax.mail-api:1.6.2'
+    implementation 'com.sun.mail:javax.mail:1.6.2'
+
+    // Bean Validation (JSR-380)
+    implementation 'javax.validation:validation-api:2.0.1.Final'
+    implementation 'org.hibernate.validator:hibernate-validator:6.0.13.Final'
+    implementation 'org.glassfish:javax.el:3.0.1-b08'
+
+    // @PostConstruct
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
     // AOP
     implementation 'org.aspectj:aspectjrt:1.9.20'
@@ -51,48 +82,48 @@ dependencies {
     implementation('javax.servlet:javax.servlet-api:4.0.1')
     compileOnly 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
     implementation 'javax.servlet:jstl:1.2'
-    compileOnly('jakarta.servlet:jakarta.servlet-api:6.1.0')
 
     // Logging
     implementation 'org.apache.logging.log4j:log4j-api:2.18.0'
     implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
     implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
     implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:1.16'
 
-//    implementation 'org.apache.logging.log4j:log4j-api:2.0.1'
-//    implementation 'org.apache.logging.log4j:log4j-core:2.0.1'
-
     // XML 내 한글 처리
     implementation 'xerces:xercesImpl:2.12.2'
 
     // Jackson
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.4'
+//    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.4'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 
     // Database
     implementation 'com.mysql:mysql-connector-j:8.1.0'
     implementation 'com.zaxxer:HikariCP:2.7.4'
     implementation 'org.mybatis:mybatis:3.4.6'
     implementation 'org.mybatis:mybatis-spring:1.3.2'
 
+    // Redis
+    implementation 'org.springframework.data:spring-data-redis:2.7.18'
+    implementation 'io.lettuce:lettuce-core:6.2.7.RELEASE'
+
     // Lombok
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
     // 테스트
     testImplementation "org.springframework:spring-test:${springVersion}"
+    testImplementation "org.springframework:spring-websocket:${springVersion}"
+    testImplementation "org.springframework:spring-messaging:${springVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
     testImplementation 'com.mysql:mysql-connector-j:8.1.0'
     testImplementation 'org.mockito:mockito-core:5.12.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.12.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.hamcrest:hamcrest-core:2.2'
+    testImplementation 'org.hamcrest:hamcrest-library:2.2'
     testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
     testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-}
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-        exceptionFormat "full"
-    }
 }