From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001
From: Simple <2424585654@qq.com>
Date: 星期二, 12 十二月 2023 16:58:24 +0800
Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并
---
ruoyi-extend/ruoyi-powerjob-server/Dockerfile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
index e92de89..729bb22 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
+++ b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
@@ -1,4 +1,5 @@
-FROM findepi/graalvm:java17-native
+#FROM findepi/graalvm:java17-native
+FROM openjdk:17.0.2-oraclelinux8
MAINTAINER Lion Li
@@ -6,8 +7,11 @@
WORKDIR /ruoyi/powerjob
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
+
EXPOSE 7700
ADD ./target/ruoyi-powerjob-server.jar ./app.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \
+ -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
--
Gitblit v1.9.3