From 1ad7761556023c5a7e6d270161c74861edd8112f 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 11:52:29 +0800
Subject: [PATCH] 'commit'

---
 dsGw/Dockerfile  | 15 ++++++++-------
 dsGw/pom.xml     | 18 +++++++++++++++---
 dsRes/Dockerfile | 15 ++++++++-------
 dsRes/pom.xml    | 47 ++++++++++++++++-------------------------------
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/dsGw/Dockerfile b/dsGw/Dockerfile
index bf25b67b..bbf30a65 100644
--- a/dsGw/Dockerfile
+++ b/dsGw/Dockerfile
@@ -6,18 +6,19 @@ WORKDIR /root
 # ENV TZ这样的用法通常是用来设置时区环境变量，TZ代表Time Zone
 ENV TZ=Asia/Shanghai
 
-# 让容器内部正常显示中文
-ENV LANG C.UTF-8
+# 声明变量
+ENV file_name="dsGw-jar-with-dependencies.jar"
 
+# 让容器内部正常显示中文
+ENV LANG=C.UTF-8
 
-# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下
-COPY ./lib /root/lib
-COPY ./target /root/target
+# 将jar包复制到容器的/root目录下
+COPY $file_name /root/$file_name
 
 #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。
 ENV JAVA_OPTS="-Xms1024m -Xmx2048m"
 
 # 标识为生产环境
-ENV WORKING_ENV="pro"
+ENV WORKING_ENV="dev"
 
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.gw.GwApplication" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar $file_name" ]
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index 2733f4e0..ffda6c76 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -147,9 +147,9 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/resources/package.xml</descriptor>   <!-- 配置文件路径 -->
-                    </descriptors>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
                     <archive>
                         <manifest>
                             <mainClass>com.dsideal.base.BaseApplication</mainClass>
@@ -166,6 +166,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 禁用默认的 jar 打包插件，防止生成额外的 jar 文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile
index 752b201e..9d50a491 100644
--- a/dsRes/Dockerfile
+++ b/dsRes/Dockerfile
@@ -6,18 +6,19 @@ WORKDIR /root
 # ENV TZ这样的用法通常是用来设置时区环境变量，TZ代表Time Zone
 ENV TZ=Asia/Shanghai
 
-# 让容器内部正常显示中文
-ENV LANG C.UTF-8
+# 声明变量
+ENV file_name="dsRes-jar-with-dependencies.jar"
 
+# 让容器内部正常显示中文
+ENV LANG=C.UTF-8
 
-# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下
-COPY ./lib /root/lib
-COPY ./target /root/target
+# 将jar包复制到容器的/root目录下
+COPY $file_name /root/$file_name
 
 #设置这个环境变量后，您可以在Docker容器中启动Java应用程序时使用这些参数。
 ENV JAVA_OPTS="-Xms1024m -Xmx2048m"
 
 # 标识为生产环境
-ENV WORKING_ENV="pro"
+ENV WORKING_ENV="dev"
 
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.resource.ResApplication" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar $file_name" ]
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index 5472a8e9..8e476fa8 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -59,12 +59,6 @@
             <artifactId>japidocs</artifactId>
             <version>1.4.4</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.11.0</version>
-        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -92,11 +86,6 @@
             <artifactId>jackson-core</artifactId>
             <version>2.17.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.17.2</version>
-        </dependency>
         <!--引用json库-->
         <dependency>
             <groupId>net.sf.json-lib</groupId>
@@ -191,13 +180,6 @@
             <version>2.20.0</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -244,11 +226,7 @@
             <artifactId>jjwt</artifactId>
             <version>0.7.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -259,11 +237,6 @@
             <artifactId>jaxb-core</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
     </dependencies>
     <build>
         <!--不加此项，文件名中就会多出一个版本号-->
@@ -294,9 +267,9 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/resources/package.xml</descriptor>   <!-- 配置文件路径 -->
-                    </descriptors>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
                     <archive>
                         <manifest>
                             <mainClass>com.dsideal.base.BaseApplication</mainClass>
@@ -313,6 +286,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 禁用默认的 jar 打包插件，防止生成额外的 jar 文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file