dev to main

.github/workflows/dev-cd.yml

@@ -0,0 +1,103 @@
+
+# 워크플로우의 이름 지정
+name: WINEY-DEV-CD
+
+# 해당 workflow가 언제 실행될 것인지에 대한 트리거를 지정
+on:
+  push:
+    branches: [ dev ] # dev branch로 push 될 때 실행됩니다.
+
+env:
+  S3_BUCKET_NAME: winey-dev
+
+jobs:
+  build:
+    name: Code deployment
+
+    # 실행 환경
+    runs-on: ubuntu-latest
+
+    steps:
+
+    # 1) 워크플로우 실행 전 기본적으로 체크아웃 필요
+    - name: checkout
+      uses: actions/checkout@v3
+
+    # 2) JDK 11버전 설치, 다른 JDK 버전을 사용하다면 수정
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+
+    # 3) 환경변수 파일 생성
+    - name: make application.properties 파일 생성
+      run: |
+        ## create application.yml
+        mkdir -p ./src/main/resources
+
+        # application.yml 파일 생성
+        touch ./application.yml
+
+        # GitHub-Actions 에서 설정한 값을 application.yml 파일에 쓰기
+        echo "${{ secrets.WINEY_DEV_APPLICATION }}" >> ./application.yaml
+
+        # winey-firebase.json 파일 생성
+        touch ./winey-firebase.json
+
+        # Firebase secrets 파일 복사
+        echo "${{ secrets.WINEY_FIREBASE }}" >> ./winey-firebase.json
+
+        # application.yml 파일 확인
+        cat ./application.yml
+      shell: bash
+
+    # 이 워크플로우는 gradle build
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Build with Gradle # 실제 application build 테스트 제외
+      run: ./gradlew build -x test
+
+    # 디렉토리 생성
+    - name: Make Directory
+      run: mkdir -p deploy
+
+    # Jar 파일 복사
+    - name: Copy Jar
+      run: cp ./build/libs/*.jar ./deploy
+
+    # appspec.yml 파일 복사
+    - name: Copy appspec.yml
+      run: cp appspec.yml ./deploy
+
+    # script files 복사
+    - name: Copy script
+      run: cp ./scripts/*.sh ./deploy
+
+    - name: Make zip file
+      run: zip -r ./winey_dev_server.zip ./deploy
+      shell: bash
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_DEV_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_DEV_SECRET_KEY }}
+        aws-region: ap-northeast-2
+
+    - name: Upload to S3
+      run: aws s3 cp --region ap-northeast-2 ./winey_dev_server.zip s3://$S3_BUCKET_NAME/
+
+    # Deploy
+    - name: Deploy
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_DEV_ACCESS_KEY }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_DEV_SECRET_KEY }}
+      run:
+        aws deploy create-deployment 
+        --application-name winey-dev-codedeploy
+        --deployment-group-name winey-dev-codedeploy-group
+        --file-exists-behavior OVERWRITE 
+        --s3-location bucket=winey-dev,bundleType=zip,key=winey_dev_server.zip
+        --region ap-northeast-2

.github/workflows/dev-ci.yml

@@ -0,0 +1,53 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: WINEY DEV CI
+
+on:
+  pull_request:
+    branches: [ "dev" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+
+    - name: make application.properties 파일 생성
+      run: |
+        ## create application.yml
+        mkdir -p ./src/main/resources
+
+        # application.yml 파일 생성
+        touch ./application.yml
+
+        # GitHub-Actions 에서 설정한 값을 application.yml 파일에 쓰기
+        echo "${{ secrets.WINEY_DEV_APPLICATION }}" >> ./application.yml
+
+        # Firebase secrets 파일 복사
+        echo "${{ secrets.WINEY_FIREBASE }}" >> ./winey-firebase.json
+
+        # application.yml 파일 확인
+        cat ./application.yml
+      shell: bash
+
+    # 이 워크플로우는 gradle build
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Build with Gradle # 실제 application build
+      run: ./gradlew build -PactiveProfiles=local

.github/workflows/gradle.yml

@@ -44,7 +44,7 @@ jobs:
     - name: make application.properties 파일 생성
       run: |
         ## create application.yml
-        cd ./src/main/resources
+        mkdir -p ./src/main/resources
 
         # application.yml 파일 생성
         touch ./application.yml

.gitignore

@@ -39,6 +39,7 @@ out/
 
 ### application.yml ###
 application.yaml
+application.yml
 
 ### DS_Store
 .DS_Store

build.gradle

@@ -33,8 +33,8 @@ dependencies {
 
 	// JPA & Database
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'mysql:mysql-connector-java:8.0.32'
-
+//	implementation 'mysql:mysql-connector-java:8.0.32'
+	runtimeOnly 'com.mysql:mysql-connector-j'
 	// S3 AWS
 	implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-aws', version: '2.2.6.RELEASE'
 
@@ -58,6 +58,7 @@ dependencies {
 
 	//FCM
 	implementation group: 'com.google.firebase', name: 'firebase-admin', version: '6.8.1'
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'  // Firebase 서버로 푸시 메시지 전송 시 필요
 
 	//rabbitmq
 	implementation 'org.springframework.boot:spring-boot-starter-amqp'
@@ -66,6 +67,10 @@ dependencies {
 	// ShedLock
 	implementation 'net.javacrumbs.shedlock:shedlock-spring:4.14.0'
 	implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.14.0'
+
+	// ssh
+	implementation 'com.github.mwiede:jsch:0.2.17'
+	annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 }
 
 tasks.named('test') {

scripts/deploy.sh

@@ -40,17 +40,17 @@ if [ -z $IDLE_PID ]
 then
   echo "> 현재 구동중인 애플리케이션이 없으므로 종료하지 않습니다."
 else
-  echo "> kill -15 $IDLE_PID"
-  kill -15 $IDLE_PID
+  echo "> kill -9 $IDLE_PID"
+  kill -9 $IDLE_PID
   sleep 20
 fi
 
 echo "> $IDLE_PROFILE 배포"
 nohup java -jar -Duser.timezone=Asia/Seoul -Dspring.profiles.active=$IDLE_PROFILE $IDLE_APPLICATION_PATH >> /home/ubuntu/app/nohup.out 2>&1 &
 
-echo "> $IDLE_PROFILE 10초 후 Health check 시작"
+echo "> $IDLE_PROFILE 60초 후 Health check 시작"
 echo "> curl -s http://localhost:$IDLE_PORT/health "
-sleep 10
+sleep 60
 
 for retry_count in {1..10}
 do

src/main/java/org/winey/server/common/message/MessageQueueReceiver.java

@@ -6,13 +6,18 @@
 import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 import org.winey.server.domain.notification.Notification;
 import org.winey.server.service.FcmService;
 import org.winey.server.service.message.FcmRequestDto;
 
 import java.io.*;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+
 @Component
 @AllArgsConstructor
 public class MessageQueueReceiver {
@@ -24,7 +29,8 @@ public class MessageQueueReceiver {
             value = @Queue(name = "like-notification"),
             key = "like-noti")
     )
-    public void likeReceiver(byte[] likeNoti){
+    public void likeReceiver(byte[] likeNoti, Channel channel,@Header(AmqpHeaders.DELIVERY_TAG) long tag) throws
+        IOException {
         System.out.println("좋아요 noti receiver");
         ByteArrayInputStream bis = new ByteArrayInputStream(likeNoti);
         ObjectInput in = null;
@@ -34,10 +40,14 @@ public void likeReceiver(byte[] likeNoti){
             System.out.println("여기까진 오는가");
             if (obj instanceof FcmRequestDto){
                 FcmRequestDto notification = (FcmRequestDto) obj;
-                fcmService.sendByToken(notification);
+                String response = String.valueOf(fcmService.sendByToken(notification));
+                if (response.isEmpty()){
+                    throw new IOException();
+                }
             }
         }catch (IOException | ClassNotFoundException e){
             e.printStackTrace();
+            channel.basicNack(tag,false,true);
         }finally {
             try{
                 bis.close();
@@ -62,9 +72,12 @@ public void commentReceiver(byte[] commentNoti){
         try {
             in = new ObjectInputStream(bis);
             Object obj = in.readObject();
-            if (obj instanceof Notification){
+            if (obj instanceof FcmRequestDto){
                 FcmRequestDto notification = (FcmRequestDto) obj;
-                fcmService.sendByToken(notification);
+                String response = String.valueOf(fcmService.sendByToken(notification));
+                if (response.isEmpty()){
+                    throw new IOException();
+                }
             }
         }catch (IOException | ClassNotFoundException e){
             e.printStackTrace();

src/main/java/org/winey/server/config/ssh/SshDataSourceConfig.java

@@ -0,0 +1,37 @@
+package org.winey.server.config.ssh;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+
+import javax.sql.DataSource;
+
+@Slf4j
+@Profile({"local","set1","set2"})
+@Configuration
+@RequiredArgsConstructor
+public class SshDataSourceConfig {
+
+    private final SshTunnelingInitializer initializer;
+
+    @Bean("dataSource")
+    @Primary
+    public DataSource dataSource(DataSourceProperties properties) {
+
+        Integer forwardedPort = initializer.buildSshConnection();  // ssh 연결 및 터널링 설정
+        String url = properties.getUrl().replace("[forwardedPort]", Integer.toString(forwardedPort));
+        log.info(url);
+        return DataSourceBuilder.create()
+                .url(url)
+                .username(properties.getUsername())
+                .password(properties.getPassword())
+                .driverClassName(properties.getDriverClassName())
+                .build();
+    }
+
+}