설정관련 수정

docker 환경설정

Dockerfile.dev

@@ -4,10 +4,33 @@ ARG JAR_FILE=build/libs/CaliverseAdminAPI-dev.jar
 
 COPY ${JAR_FILE} admintool.jar
 ENTRYPOINT ["java", \
-    "-Xms2g", \
+    "-Xms1g", \
-    "-Xmx8g", \
+    "-Xmx2g", \
-    "-XX:+UseG1GC", \
+
-    "-XX:MaxGCPauseMillis=200", \
+    # GC 설정 (G1GC 최적화)
+   "-XX:+UseG1GC", \
+   "-XX:MaxGCPauseMillis=100", \
+   "-XX:G1HeapRegionSize=8m", \
+   "-XX:InitiatingHeapOccupancyPercent=20", \
+
+    # OutOfMemoryError 대응
+    "-XX:+HeapDumpOnOutOfMemoryError", \
+    "-XX:HeapDumpPath=/logs/heapdump-%t.hprof", \
+    "-XX:+ExitOnOutOfMemoryError", \
+
+    # GC 로깅 (문제 분석용)
+    "-Xlog:gc*:logs/gc.log:time,tags", \
+    "-XX:+UseStringDeduplication", \
+
+    # 메모리 최적화
+    "-XX:+UseCompressedOops", \
+    "-XX:+UseCompressedClassPointers", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:MaxMetaspaceSize=256m", \
+
+    # 네트워크 최적화
+    "-Djava.net.preferIPv4Stack=true", \
+
     "-Djava.io.tmpdir=/tmp", \
     "-Dfile.encoding=UTF-8", \
     "-Djava.awt.headless=true", \

Dockerfile.live

@@ -4,12 +4,37 @@ ARG JAR_FILE=build/libs/CaliverseAdminAPI-live.jar
 
 COPY ${JAR_FILE} admintool.jar
 ENTRYPOINT ["java", \
-    "-Xms2g", \
+    # 메모리 설정
-    "-Xmx8g", \
+    "-Xms1g", \
+    "-Xmx4g", \
+
+    # GC 설정 (G1GC 최적화)
     "-XX:+UseG1GC", \
-    "-XX:MaxGCPauseMillis=200", \
+    "-XX:MaxGCPauseMillis=100", \
+    "-XX:G1HeapRegionSize=8m", \
+    "-XX:InitiatingHeapOccupancyPercent=20", \
+
+    # OutOfMemoryError 대응
+    "-XX:+HeapDumpOnOutOfMemoryError", \
+    "-XX:HeapDumpPath=/logs/heapdump-%t.hprof", \
+    "-XX:+ExitOnOutOfMemoryError", \
+
+    # GC 로깅 (문제 분석용)
+    "-Xlog:gc*:logs/gc.log:time,tags", \
+    "-XX:+UseStringDeduplication", \
+
+    # 메모리 최적화
+    "-XX:+UseCompressedOops", \
+    "-XX:+UseCompressedClassPointers", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:MaxMetaspaceSize=256m", \
+
+    # 네트워크 최적화
+    "-Djava.net.preferIPv4Stack=true", \
+
     "-Djava.io.tmpdir=/tmp", \
     "-Dfile.encoding=UTF-8", \
     "-Djava.awt.headless=true", \
+
     "-Dspring.profiles.active=live", \
     "-jar", "/admintool.jar"]

Dockerfile.qa

@@ -4,10 +4,33 @@ ARG JAR_FILE=build/libs/CaliverseAdminAPI-qa.jar
 
 COPY ${JAR_FILE} admintool.jar
 ENTRYPOINT ["java", \
-    "-Xms2g", \
+    "-Xms1g", \
-    "-Xmx4g", \
+    "-Xmx2g", \
+
+    # GC 설정 (G1GC 최적화)
     "-XX:+UseG1GC", \
-    "-XX:MaxGCPauseMillis=200", \
+    "-XX:MaxGCPauseMillis=100", \
+    "-XX:G1HeapRegionSize=8m", \
+    "-XX:InitiatingHeapOccupancyPercent=20", \
+
+    # OutOfMemoryError 대응
+    "-XX:+HeapDumpOnOutOfMemoryError", \
+    "-XX:HeapDumpPath=/logs/heapdump-%t.hprof", \
+    "-XX:+ExitOnOutOfMemoryError", \
+
+    # GC 로깅 (문제 분석용)
+    "-Xlog:gc*:logs/gc.log:time,tags", \
+    "-XX:+UseStringDeduplication", \
+
+    # 메모리 최적화
+    "-XX:+UseCompressedOops", \
+    "-XX:+UseCompressedClassPointers", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:MaxMetaspaceSize=256m", \
+
+    # 네트워크 최적화
+    "-Djava.net.preferIPv4Stack=true", \
+
     "-Djava.io.tmpdir=/tmp", \
     "-Dfile.encoding=UTF-8", \
     "-Djava.awt.headless=true", \

Dockerfile.stage

@@ -4,12 +4,36 @@ ARG JAR_FILE=build/libs/CaliverseAdminAPI-stage.jar
 
 COPY ${JAR_FILE} admintool.jar
 ENTRYPOINT ["java", \
-    "-Xms2g", \
+    "-Xms1g", \
-    "-Xmx8g", \
+    "-Xmx4g", \
+
+    # GC 설정 (G1GC 최적화)
     "-XX:+UseG1GC", \
-    "-XX:MaxGCPauseMillis=200", \
+    "-XX:MaxGCPauseMillis=100", \
+    "-XX:G1HeapRegionSize=8m", \
+    "-XX:InitiatingHeapOccupancyPercent=20", \
+
+    # OutOfMemoryError 대응
+    "-XX:+HeapDumpOnOutOfMemoryError", \
+    "-XX:HeapDumpPath=/logs/heapdump-%t.hprof", \
+    "-XX:+ExitOnOutOfMemoryError", \
+
+    # GC 로깅 (문제 분석용)
+    "-Xlog:gc*:logs/gc.log:time,tags", \
+    "-XX:+UseStringDeduplication", \
+
+    # 메모리 최적화
+     "-XX:+UseCompressedOops", \
+    "-XX:+UseCompressedClassPointers", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:MaxMetaspaceSize=256m", \
+
+    # 네트워크 최적화
+    "-Djava.net.preferIPv4Stack=true", \
+
     "-Djava.io.tmpdir=/tmp", \
     "-Dfile.encoding=UTF-8", \
     "-Djava.awt.headless=true", \
+
     "-Dspring.profiles.active=stage", \
     "-jar", "/admintool.jar"]

Jenkinsfile.live

@@ -135,6 +135,12 @@ pipeline {
                                             --name ${DOCKER_NAME} \
                                             --restart=always \
                                             --log-opt max-size=10m \
+                                            --memory=6g \
+                                            --memory-swap=6g \
+                                            --cpus="1.8" \
+                                            --cpu-shares=1024 \
+                                            --oom-kill-disable=false \
+                                            --oom-score-adj=100 \
                                             -e TZ=\${TZ:-Asia/Seoul} \
                                             -v ./admintool/log:/logs \
                                             -v ./admintool/upload:/upload \

Jenkinsfile.stage

@@ -135,6 +135,12 @@ pipeline {
                                             --name ${DOCKER_NAME} \
                                             --restart=always \
                                             --log-opt max-size=10m \
+                                            --memory=6g \
+                                            --memory-swap=6g \
+                                            --cpus="1.8" \
+                                            --cpu-shares=1024 \
+                                            --oom-kill-disable=false \
+                                            --oom-score-adj=100 \
                                             -e TZ=\${TZ:-Asia/Seoul} \
                                             -v ./admintool/log:/logs \
                                             -v ./admintool/upload:/upload \

src/main/resources/config/application.yml

@@ -1,12 +1,13 @@
+server:
+  tomcat:
+    max-http-form-post-size: 50MB
+    max-swallow-size: 50MB
+
 spring:
   servlet:
     multipart:
       max-file-size: 5MB
       max-request-size: 10MB
-  ## deploy
-#  profiles:
-#    active: stage
-
 
   jwt:
     secret_key: '81b659967735aea6e4cb0467d04ea12c4a6432b415254f59825055680f59a9823fec5a15e9adbd246b1365ef1522580477691bc5cb56a9364143e7d9385d9912'

src/main/resources/config/dev/application.yml

@@ -112,8 +112,9 @@ amazon:
     secretkey: G82Bq5tCUTvSPe9InGayH8kONbtEnLxMrgzrAbCn
     region: us-west-2
   s3:
-    bucket-name: metaverse-myhomeugc-test
+    bucket-name: metaverse-admintool
-    enabled: false
+    cloud-front: https://d1yr1qrnuiu29u.cloudfront.net/
+    enabled: true
 
 
 

src/main/resources/config/live/application.yml

@@ -111,8 +111,9 @@ amazon:
     secretkey: G82Bq5tCUTvSPe9InGayH8kONbtEnLxMrgzrAbCn
     region: us-west-2
   s3:
-    bucket-name: metaverse-myhomeugc-live
+    bucket-name: metaverse-admintool
-    enabled: false
+    cloud-front: https://d1yr1qrnuiu29u.cloudfront.net/
+    enabled: true
 
 
 

src/main/resources/config/local/application.yml

@@ -114,7 +114,8 @@ amazon:
 #    secretkey: G82Bq5tCUTvSPe9InGayH8kONbtEnLxMrgzrAbCn
 #    region: us-west-2
   s3:
-    bucket-name: metaverse-myhomeugc-test
+    bucket-name: metaverse-admintool
+    cloud-front: https://d1yr1qrnuiu29u.cloudfront.net/
     enabled: true
 
 
@@ -145,15 +146,15 @@ rabbitmq:
 # Mongodb
 ################################################################################################################################################################################################
 mongodb:
-#  host: 10.20.20.8:27017
+  host: 10.20.20.8:27017
-#  business-log:
+  business-log:
-#    username: ""
+    username: ""
-#    password: ""
+    password: ""
-#    db: LogDB
+    db: LogDB
-#  indicator:
+  indicator:
-#    username: ""
+    username: ""
-#    password: ""
+    password: ""
-#    db: IndicatorDB
+    db: IndicatorDB
 #local
 #  host: localhost:27017
 #  business-log:
@@ -165,15 +166,15 @@ mongodb:
 #    password: ""
 #    db: IndicatorDB
 #live
-  host: metaverse-live.7d0do.mongodb.net
+#  host: metaverse-live.7d0do.mongodb.net
-  business-log:
+#  business-log:
-    username: metaverseliverw
+#    username: metaverseliverw
-    password: K1spqwBbHrP2ZSMX
+#    password: K1spqwBbHrP2ZSMX
-    db: BusinessLog-Db-Live
+#    db: BusinessLog-Db-Live
-  indicator:
+#  indicator:
-    username: metaverseliverw
+#    username: metaverseliverw
-    password: K1spqwBbHrP2ZSMX
+#    password: K1spqwBbHrP2ZSMX
-    db: BackOffice-Db-Live
+#    db: BackOffice-Db-Live
 
 
 ################################################################################################################################################################################################

src/main/resources/config/qa/application.yml

@@ -113,8 +113,9 @@ amazon:
     secretkey: G82Bq5tCUTvSPe9InGayH8kONbtEnLxMrgzrAbCn
     region: us-west-2
   s3:
-    bucket-name: metaverse-myhomeugc-qa
+    bucket-name: metaverse-admintool
-    enabled: false
+    cloud-front: https://d1yr1qrnuiu29u.cloudfront.net/
+    enabled: true
 
 
 

src/main/resources/config/stage/application.yml

@@ -111,8 +111,9 @@ amazon:
     secretkey: G82Bq5tCUTvSPe9InGayH8kONbtEnLxMrgzrAbCn
     region: us-west-2
   s3:
-    bucket-name: metaverse-myhomeugc-stage
+    bucket-name: metaverse-admintool
-    enabled: false
+    cloud-front: https://d1yr1qrnuiu29u.cloudfront.net/
+    enabled: true