From 9bc86269c0c43e2fffd0dd35686ff4fc42584ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 16 Oct 2024 09:41:05 +0800
Subject: [PATCH] 'commit'

---
 dsBase/Dockerfile         | 8 +++-----
 dsGw/生成依赖jar.bat  | 1 +
 dsPay/生成依赖jar.bat | 8 ++++++++
 dsRes/Dockerfile          | 5 ++---
 dsRes/生成依赖jar.bat | 1 +
 5 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 dsPay/生成依赖jar.bat

diff --git a/dsBase/Dockerfile b/dsBase/Dockerfile
index 72152675..1fc8b71c 100644
--- a/dsBase/Dockerfile
+++ b/dsBase/Dockerfile
@@ -9,14 +9,12 @@ ENV TZ=Asia/Shanghai
 # 让容器内部正常显示中文
 ENV LANG C.UTF-8
 
-# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下
-COPY ./lib /root/lib
-COPY ./target /root/target
+COPY ./dsBase /root/dsBase
 
 #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。
-ENV JAVA_OPTS="-Xms512m -Xmx1024m"
+ENV JAVA_OPTS="-Xms1024m -Xmx2048m"
 
 # 标识为生产环境
 ENV WORKING_ENV="pro"
 
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.base.BaseApplication" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/dsBase/lib/* -jar dsBase.jar" ]
diff --git a/dsGw/生成依赖jar.bat b/dsGw/生成依赖jar.bat
index 1ef4abc5..4ecb7b0d 100644
--- a/dsGw/生成依赖jar.bat
+++ b/dsGw/生成依赖jar.bat
@@ -5,3 +5,4 @@ cd ..
 mvn -f pom.xml  dependency:copy-dependencies -DoutputDirectory=lib
 
 @echo 黄海完成了！
+pause
diff --git a/dsPay/生成依赖jar.bat b/dsPay/生成依赖jar.bat
new file mode 100644
index 00000000..4ecb7b0d
--- /dev/null
+++ b/dsPay/生成依赖jar.bat
@@ -0,0 +1,8 @@
+mkdir lib
+cd lib
+del *.jar /q
+cd ..
+mvn -f pom.xml  dependency:copy-dependencies -DoutputDirectory=lib
+
+@echo 黄海完成了！
+pause
diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile
index abf4212c..48ca7c07 100644
--- a/dsRes/Dockerfile
+++ b/dsRes/Dockerfile
@@ -11,8 +11,7 @@ ENV LANG C.UTF-8
 
 
 # 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下
-COPY ./lib /root/lib
-COPY ./target /root/target
+COPY ./dsBase /root/dsBase
 
 #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。
 ENV JAVA_OPTS="-Xms512m -Xmx1024m"
@@ -20,4 +19,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx1024m"
 # 标识为生产环境
 ENV WORKING_ENV="pro"
 
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.resource.ResApplication" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/dsBase/lib/* -jar dsBase.jar" ]
diff --git a/dsRes/生成依赖jar.bat b/dsRes/生成依赖jar.bat
index 1ef4abc5..4ecb7b0d 100644
--- a/dsRes/生成依赖jar.bat
+++ b/dsRes/生成依赖jar.bat
@@ -5,3 +5,4 @@ cd ..
 mvn -f pom.xml  dependency:copy-dependencies -DoutputDirectory=lib
 
 @echo 黄海完成了！
+pause