From f656c15dc5c0855a8574f1be7b9922c007061436 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Mon, 9 Dec 2024 11:24:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=85=8D=E7=BD=AE=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-gateway/Dockerfile                            | 15 +++++++++++----
 .../prepare-boot/src/main/resources/bootstrap.yml | 10 ++--------
 pqs-system/system-boot/Dockerfile                 | 15 +++++++++++----
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pqs-gateway/Dockerfile b/pqs-gateway/Dockerfile
index b40ed2ace..833a98ba7 100644
--- a/pqs-gateway/Dockerfile
+++ b/pqs-gateway/Dockerfile
@@ -1,5 +1,12 @@
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-centos7
+MAINTAINER hongawen_13914774158@163.com
+ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
+# 挂载时区的目录
+VOLUME /usr/share/zoneinfo
+# 设置时区为上海
+ENV TZ=Asia/Shanghai
+# 设置时区信息
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ADD target/gateway.jar gateway.jar
-ENTRYPOINT ["java","-jar","/gateway.jar"]
-EXPOSE 10215
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
\ No newline at end of file
+ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /gateway.jar
+EXPOSE 10215
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/resources/bootstrap.yml b/pqs-prepare/prepare-boot/src/main/resources/bootstrap.yml
index 1f8418f35..b20f2cf9d 100644
--- a/pqs-prepare/prepare-boot/src/main/resources/bootstrap.yml
+++ b/pqs-prepare/prepare-boot/src/main/resources/bootstrap.yml
@@ -24,13 +24,9 @@ spring:
         ip: @service.server.url@
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-        username: @nacos.username@
-        password: @nacos.password@
       config:
         server-addr: @nacos.url@
         namespace: @nacos.namespace@
-        username: @nacos.username@
-        password: @nacos.password@
         file-extension: yaml
         shared-configs:
           - data-id: share-config.yaml
@@ -46,17 +42,15 @@ liteflow:
     dataId: prepare_liteflow
     group: DEFAULT_GROUP
     namespace: @nacos.namespace@
-    username: @nacos.username@
-    password: @nacos.password@
   when-max-wait-time: 600000
   print-banner: false
 
 
 #项目日志的配置
 logging:
-  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: error
 
 
 ##mybatis配置信息
diff --git a/pqs-system/system-boot/Dockerfile b/pqs-system/system-boot/Dockerfile
index eed207d30..2c1194041 100644
--- a/pqs-system/system-boot/Dockerfile
+++ b/pqs-system/system-boot/Dockerfile
@@ -1,8 +1,15 @@
 FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-ubi9-minimal
+MAINTAINER hongawen_13914774158@163.com
+ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
+# 挂载时区的目录
+VOLUME /usr/share/zoneinfo
+# 设置时区为上海
+ENV TZ=Asia/Shanghai
+# 设置时区信息
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ADD target/systemboot.jar systemboot.jar
 ENTRYPOINT ["java","-jar","/systemboot.jar"]
+ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /systemboot.jar
 EXPOSE 10207
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
-
-#下面是审计日志备份现场环境缺少字体库
-#RUN apk add --update ttf-dejavu fontconfig && rm -rf /var/cache/apk/*
\ No newline at end of file
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
\ No newline at end of file