2/25 오픈 테스트

.github/workflows/main_merge.yml

@@ -8,6 +8,57 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: test #임시
+      - name: Checkout source code.   # Repo checkout
+        uses: actions/checkout@v3
+
+      - name: Set application.properties from secrets
+        run: |
+          echo "${{ secrets.MAIN_APPLICATION_PROPERTIES }}" > src/main/resources/application.properties
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew clean build
+
+      - name: remove plain.jar
+        run: rm -rf build/libs/*plain.jar
+
+      # - name: file copy
+      #   uses: actions/upload-artifact@v3
+      #   with:
+      #     name: libs
+      #     path: build/libs
+      - name: Upload to Cloudflare
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-east-1
+          BUCKET_NAME: ${{ secrets.CF_BUCKET_NAME }}
+          ENDPOINT_URL: ${{ secrets.CF_ENDPOINT_URL }}
         run: |
-          echo "test"
+          aws s3 sync build/libs/ s3://$BUCKET_NAME/java/main/ceo \
+            --endpoint-url $ENDPOINT_URL --delete --exact-timestamps
+
+      - name: SSH and deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.MAIN_HOST }}
+          username: ${{ secrets.MAIN_USERNAME }}
+          key: ${{ secrets.MAIN_SSH_KEY }}
+          port: ${{ secrets.TEST_PORT }}
+
+          timeout: 40s  # 30초 기본
+          script: |
+            aws s3 sync s3://readyvery-dev-server/java/main/ceo ./docker/readyvery/jar \
+            --endpoint-url https://29c6e4b55b1ddb8d2b6e69df21141caa.r2.cloudflarestorage.com \
+            --delete --exact-timestamps
+
+            docker-compose build readyvery
+            docker-compose up -d readyvery

.github/workflows/test_pr.yml

@@ -7,6 +7,20 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    services:
+      # Label used to access the service container
+      redis:
+        # Docker Hub image
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 6379:6379
     steps:
       - name: Checkout source code.   # Repo checkout
         uses: actions/checkout@v3

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+
+```

build.gradle

@@ -29,6 +29,7 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
+
     // mysql driver
     runtimeOnly 'com.mysql:mysql-connector-j'
 
@@ -42,9 +43,21 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
+    // redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+    // swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+
+
     //SOLAPI
     implementation 'net.nurigo:sdk:4.2.7'
 
+    //AWS S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
+
 //    //Querydsl 추가
 //    implementation 'com.querydsl:querydsl-core:5.0.0'
 //    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

src/main/java/com/readyvery/readyverydemo/config/CeoApiConfig.java

@@ -0,0 +1,16 @@
+package com.readyvery.readyverydemo.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import lombok.Getter;
+
+@Configuration
+@Getter
+public class CeoApiConfig {
+	@Value("${jwt.refresh.cookie}")
+	private String refreshCookie;
+	@Value("${service.app.admin.key}")
+	private String serviceAppAdminKey;
+
+}

src/main/java/com/readyvery/readyverydemo/config/JwtConfig.java

@@ -0,0 +1,55 @@
+package com.readyvery.readyverydemo.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import com.auth0.jwt.algorithms.Algorithm;
+
+import lombok.Getter;
+
+@Configuration
+@Getter
+public class JwtConfig {
+
+	private final String secretKey;
+	private final Long accessTokenExpirationPeriod;
+	private final Long refreshTokenExpirationPeriod;
+	private final String accessTokenName;
+	private final String refreshTokenName;
+	private final String frontendUrl;
+	private final String cookieDomain;
+	private final Algorithm algorithm;
+
+	public static final String ACCESS_TOKEN_SUBJECT = "AccessToken";
+	public static final String REFRESH_TOKEN_SUBJECT = "RefreshToken";
+	public static final String EMAIL_CLAIM = "email";
+	public static final String USER_NUMBER = "userNumber";
+	public static final String BEARER = "Bearer ";
+	public static final String AUTHORIZATION = "Authorization";
+
+	public JwtConfig(
+		@Value("${jwt.secretKey}") String secretKey,
+		@Value("${jwt.access.expiration}") Long accessTokenExpirationPeriod,
+		@Value("${jwt.refresh.expiration}") Long refreshTokenExpirationPeriod,
+		@Value("${jwt.access.cookie}") String accessTokenName,
+		@Value("${jwt.refresh.cookie}") String refreshTokenName,
+		@Value("${jwt.redirect-uri}") String frontendUrl,
+		@Value("${jwt.refresh.cookie.domain}") String cookieDomain
+	) {
+		this.secretKey = secretKey;
+		this.accessTokenExpirationPeriod = accessTokenExpirationPeriod;
+		this.refreshTokenExpirationPeriod = refreshTokenExpirationPeriod;
+		this.accessTokenName = accessTokenName;
+		this.refreshTokenName = refreshTokenName;
+		this.frontendUrl = frontendUrl;
+		this.cookieDomain = cookieDomain;
+		this.algorithm = initializeAlgorithm(secretKey);
+	}
+
+	private Algorithm initializeAlgorithm(String secretKey) {
+		if (secretKey == null || secretKey.trim().isEmpty()) {
+			throw new IllegalArgumentException("Secret key must not be null or empty");
+		}
+		return Algorithm.HMAC512(secretKey);
+	}
+}

src/main/java/com/readyvery/readyverydemo/config/RedisConfig.java

@@ -0,0 +1,29 @@
+package com.readyvery.readyverydemo.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Configuration
+public class RedisConfig {
+
+	@Value("${spring.data.redis.host}")
+	private String host;
+
+	@Value("${spring.data.redis.port}")
+	private int port;
+
+	@Bean
+	public RedisConnectionFactory redisConnectionFactory() {
+
+		LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(host, port);
+		log.info("RedisConfig.redisConnectionFactory() called" + lettuceConnectionFactory);
+		return lettuceConnectionFactory;
+	}
+
+}

src/main/java/com/readyvery/readyverydemo/config/S3Config.java

@@ -0,0 +1,34 @@
+package com.readyvery.readyverydemo.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
+import lombok.Getter;
+
+@Getter
+@Configuration
+public class S3Config {
+	@Value("${cloud.aws.credentials.access-key}")
+	private String accessKey;
+	@Value("${cloud.aws.credentials.secret-key}")
+	private String secretKey;
+	@Value("${cloud.aws.region.static}")
+	private String region;
+	@Value("${cloud.aws.s3.bucket}")
+	private String bucket;
+
+	@Bean
+	public AmazonS3Client amazonS3Client() {
+		BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+		return (AmazonS3Client)AmazonS3ClientBuilder.standard()
+			.withRegion(region)
+			.withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+			.build();
+	}
+}

src/main/java/com/readyvery/readyverydemo/src/order/config/SolApiConfig.java → src/main/java/com/readyvery/readyverydemo/config/SolApiConfig.java

@@ -1,11 +1,17 @@
-package com.readyvery.readyverydemo.src.order.config;
+package com.readyvery.readyverydemo.config;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import net.nurigo.sdk.NurigoApp;
+import net.nurigo.sdk.message.service.DefaultMessageService;
+
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 @Getter
+@RequiredArgsConstructor
 @Configuration
 public class SolApiConfig {
 	public static final String SOLAPI_URL = "https://api.solapi.com";
@@ -27,4 +33,12 @@ public class SolApiConfig {
 
 	@Value("${solapi.kakao.pfid}")
 	private String kakaoPfid;
+
+	@Value("${solapi.phone_number}")
+	private String phoneNumber;
+
+	@Bean
+	public DefaultMessageService defaultMessageService() {
+		return NurigoApp.INSTANCE.initialize(apiKey, apiSecret, SOLAPI_URL);
+	}
 }