Merge pull request #227 from Team-Capple/release-v0.1.0

[RELEASE] 케플 버전 2 배포
Team-Capple · Oct 6, 2024 · 732d9c6 · 732d9c6
2 parents 32403f8 + 5a294a6
commit 732d9c6
Show file tree

Hide file tree

Showing 151 changed files with 5,530 additions and 545 deletions.
diff --git a/.github/workflows/cicd-production.yml b/.github/workflows/cicd-production.yml
@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v**'
+      - '!v**-**'
 
 env:
   REGISTRY: ghcr.io
@@ -36,13 +37,16 @@ jobs:
         run: |
           echo "REPOSITORY=$(echo $REPOSITORY | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
 
+      - name: Get Version
+        run: echo "VERSION=$(git tag --points-at)" >> ${GITHUB_ENV}
+
       - name: Set Spring Image Environment Variable
         run: |
-          echo "SPRING_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}-prod:${{ github.sha }}" >> ${GITHUB_ENV}
+          echo "SPRING_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}-prod:${{ env.VERSION }}" >> ${GITHUB_ENV}
 
       - name: Write Version
         run: |
-          echo "server-version: Prod" >> config/application.yml
+          echo -e "\nserver-version: ${{ env.VERSION }}" >> config/application-prod.yml
 
       - name: Build Image
         run: docker build --no-cache -t ${{ env.SPRING_IMAGE }} -f Dockerfile-deploy .
@@ -78,4 +82,4 @@ jobs:
             sudo docker container rm spring
             sudo docker image rm ${{ env.SPRING_IMAGE }}
             sudo docker-compose --env-file=config/env/prod.env -f docker-compose.prod.yml -p backend up -d
-            sudo docker image prune -af
+            sudo docker image prune -af
diff --git a/.github/workflows/cicd-release.yml b/.github/workflows/cicd-release.yml
@@ -2,8 +2,8 @@ name: Release Deploy
 
 on:
   push:
-    branches:
-      - 'release-**'
+    tags:
+      - 'v**-**'
 
 env:
   REGISTRY: ghcr.io
@@ -38,15 +38,15 @@ jobs:
 
       - name: Get Version
         run: |
-          echo "VERSION=$( echo ${{ github.ref_name }} | cut -c 9- )" >> ${GITHUB_ENV}
+          echo "VERSION=$( git tag --points-at )" >> ${GITHUB_ENV}
 
       - name: Set Spring Image Environment Variable
         run: |
           echo "SPRING_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}-release:${{ env.VERSION }}" >> ${GITHUB_ENV}
 
       - name: Write Version
         run: |
-          echo "server-version: ${{ env.VERSION }}" >> config/application.yml
+          echo -e "\nserver-version: ${{ env.VERSION }}" >> config/application-release.yml
 
       - name: Build Image
         run: docker build --no-cache -t ${{ env.SPRING_IMAGE }} -f Dockerfile-deploy .
@@ -83,48 +83,3 @@ jobs:
             sudo docker image rm ${{ env.SPRING_IMAGE }}
             sudo docker-compose --env-file=config/env/release.env -f docker-compose.release.yml -p backend up -d
             sudo docker image prune -af
-
-  releaseExport:
-    name: Export Release Jar
-    runs-on: ubuntu-latest
-    needs: releaseDeploy
-    steps:
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.GITHUB_ACTOR }}
-          password: ${{ secrets.TOKEN_GITHUB }}
-
-      - name: lowercase the image tag & repository
-        run: |
-          echo "REPOSITORY=$(echo $REPOSITORY | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
-
-      - name: Get Version
-        run: |
-          echo "VERSION=$( echo ${{ github.ref_name }} | cut -c 9- )" >> ${GITHUB_ENV}
-
-      - name: Set Spring Image Environment Variable
-        run: |
-          echo "SPRING_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}-release:${{ env.VERSION }}" >> ${GITHUB_ENV}
-
-      - name: Run Container
-        run: docker run -d --name container-capple ${{ env.SPRING_IMAGE }}
-
-      - name: Extract .jar File From Container
-        run: docker cp container-capple:/app/app.jar .
-
-      - name: Stop Container
-        run: docker rm -f container-capple
-
-      - name: Rename Jar
-        run: mv app.jar capple-${{ env.VERSION }}.jar
-
-      - name: Extract .jar File
-        uses: actions/upload-artifact@v4
-        with:
-          name: capple-${{ env.VERSION }}
-          path: ./*.jar
-          compression-level: 9
-          retention-days: 1
-          overwrite: true
diff --git a/build.gradle b/build.gradle
@@ -59,6 +59,17 @@ dependencies {
 //	thymeleaf
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
+
+//  https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
+	implementation 'com.google.code.findbugs:jsr305:3.0.2'
+//	webflux
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.68.Final:osx-aarch_64'
+//	actuator
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'io.micrometer:micrometer-registry-prometheus'
+//	open csv
+	implementation 'com.opencsv:opencsv:5.5.1'
 }
 
 dependencyManagement {

diff --git a/config b/config
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -6,5 +6,7 @@ services:
     image: ${SPRING_IMAGE}
     ports:
       - ${SPRING_OUTER_PORT}:${SPRING_INNER_PORT}
+    volumes:
+      - ${LOCAL_SPRING_LOG_PATH}:/app/logs
     environment:
       - SPRING_PROFILES_ACTIVE=prod
diff --git a/docker-compose.release.yml b/docker-compose.release.yml
@@ -6,5 +6,7 @@ services:
     image: ${SPRING_IMAGE}
     ports:
       - ${SPRING_OUTER_PORT}:${SPRING_INNER_PORT}
+    volumes:
+      - ${LOCAL_SPRING_LOG_PATH}:/app/logs
     environment:
       - SPRING_PROFILES_ACTIVE=release
diff --git a/src/main/java/com/server/capple/CappleApplication.java b/src/main/java/com/server/capple/CappleApplication.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.time.ZoneId;
@@ -16,6 +18,8 @@
 @EnableFeignClients
 @EnableConfigurationProperties
 @EnableScheduling
+@EnableCaching
+@EnableAsync
 public class CappleApplication {
 
 	public static void main(String[] args) {

diff --git a/src/main/java/com/server/capple/config/RedisConfig.java b/src/main/java/com/server/capple/config/RedisConfig.java
@@ -1,14 +1,21 @@
 package com.server.capple.config;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.time.Duration;
+
 @Configuration
 public class RedisConfig {
 
@@ -25,6 +32,7 @@ public RedisConnectionFactory redisConnectionFactory() {
         connectionFactory.setDatabase(database);
         return connectionFactory;
     }
+
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
@@ -35,4 +43,31 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisC
 
         return redisTemplate;
     }
+
+    @Bean
+    @Primary
+    public CacheManager noExpireCacheManager(RedisConnectionFactory redisConnectionFactory) {
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
+        return RedisCacheManager.RedisCacheManagerBuilder.fromConnectionFactory(redisConnectionFactory).cacheDefaults(redisCacheConfiguration).build();
+    }
+
+    @Bean
+    public CacheManager oneDayExpireCacheManager(RedisConnectionFactory redisConnectionFactory) {
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()))
+            .entryTtl(Duration.ofDays(1));
+        return RedisCacheManager.RedisCacheManagerBuilder.fromConnectionFactory(redisConnectionFactory).cacheDefaults(redisCacheConfiguration).build();
+    }
+
+    @Bean
+    public CacheManager apnsJwtCacheManager(RedisConnectionFactory redisCloudConnectionFactory) {
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()))
+            .entryTtl(Duration.ofMinutes(30));
+        return RedisCacheManager.RedisCacheManagerBuilder.fromConnectionFactory(redisCloudConnectionFactory).cacheDefaults(redisCacheConfiguration).build();
+    }
 }
diff --git a/src/main/java/com/server/capple/config/SwaggerConfig.java b/src/main/java/com/server/capple/config/SwaggerConfig.java
@@ -28,7 +28,11 @@ public OpenAPI openAPI() {
         Info info = new Info()
                 .title("Capple API Document")
                 .version(version)
-                .description("Capple API 명세서입니다.");
+                .description(
+                    version.charAt(0) == 'v' ?
+                    String.format("Capple API 명세서입니다.<br>[%s 변경사항](https://github.com/Team-Capple/Capple-Server/releases/tag/%s)",version, version)
+                    : "Capple API 명세서입니다."
+                );
         return new OpenAPI()
                 .components(new Components().addSecuritySchemes("bearerAuth", securityScheme))
                 .security(Arrays.asList(securityRequirement))

diff --git a/src/main/java/com/server/capple/config/apns/config/ApnsClientConfig.java b/src/main/java/com/server/capple/config/apns/config/ApnsClientConfig.java
@@ -0,0 +1,44 @@
+package com.server.capple.config.apns.config;
+
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.timeout.WriteTimeoutHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import reactor.netty.http.HttpProtocol;
+import reactor.netty.http.client.HttpClient;
+import reactor.netty.resources.ConnectionProvider;
+
+import javax.net.ssl.SSLException;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+public class ApnsClientConfig {
+    @Bean("apnsSslContext")
+    public SslContext getApnsSslContext() throws SSLException {
+        return SslContextBuilder.forClient().protocols("TLSv1.2").build(); // SSL 설정
+    }
+
+    @Bean("apnsConnectionProvider")
+    public ConnectionProvider getApnsConnectionProvider() {
+        return ConnectionProvider.builder("apns")
+            .maxConnections(10) // 최대 커낵션 수
+            .pendingAcquireMaxCount(-1) // 재시도 횟수 (-1 : 무한대)
+            .pendingAcquireTimeout(java.time.Duration.ofSeconds(10)) // 커넥션 풀에 사용 가능한 커넥션 없을 때의 대기 시간
+            .maxIdleTime(java.time.Duration.ofSeconds(5)) // 최대 유휴 시간
+            .maxLifeTime(java.time.Duration.ofSeconds(300)) // 최대 생명 시간
+            .lifo() // 후입선출
+            .build();
+    }
+
+    @Bean("apnsH2HttpClient")
+    public HttpClient getApnsH2HttpClient(ConnectionProvider apnsConnectionProvider, SslContext apnsSslContext) {
+        return HttpClient.create(apnsConnectionProvider) // reactor HttpClient 생성
+            .keepAlive(true) // keep-alive 활성화
+            .protocol(HttpProtocol.H2) // HTTP/2 활성화
+            .doOnConnected(connection -> connection.addHandlerLast(new WriteTimeoutHandler(10, TimeUnit.SECONDS))) // 쓰기 타임 아웃
+            .responseTimeout(Duration.ofSeconds(10)) // 응답 타임 아웃
+            .secure(sslSpec -> sslSpec.sslContext(apnsSslContext)); // SSL 활성화
+    }
+}