Merge branch 'main' into develop

Mile-Writings · Oct 19, 2024 · 9a47d02 · 9a47d02
2 parents cfbcf5f + 096b485
commit 9a47d02
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ "develop" ]
+    branches: [ "develop" , "main" ]
 
 permissions:
   checks: write

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
 FROM amd64/amazoncorretto:17
 WORKDIR /app
 COPY ./module-api/build/libs/module-api-1.0.0-SNAPSHOT.jar /app/MILE.jar
-CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=dev", "MILE.jar"]
+CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=prod", "MILE.jar"]
diff --git a/module-api/src/main/resources/logback-spring.xml b/module-api/src/main/resources/logback-spring.xml
@@ -10,7 +10,7 @@
             <appender-ref ref="ASYNC_DISCORD" />
         </root>
     </springProfile>
-    <springProfile name="dev">
+    <springProfile name="prod">
         <include resource="console-appender.xml"/>
         <include resource="discord-appender.xml"/>
         <root level="INFO">

diff --git a/module-external/src/main/java/com/mile/aws/utils/S3Service.java b/module-external/src/main/java/com/mile/aws/utils/S3Service.java
@@ -27,7 +27,7 @@
 @Component
 public class S3Service {
 
-    private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 1000L * 60 * 60 * 2;  // 만료시간 2시간
+    private static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 120L; 
 
     private final String bucketName;
     private final AwsConfig awsConfig;