From c7d107d9519c978c6089d6c3a3db7db85aafdbfd Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 11 Sep 2025 21:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=BA=E4=B8=B0=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E8=84=9A=E6=9C=AC=E8=87=AA=E5=8A=A8=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E4=BB=BD?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=9A=84=E8=AE=A2=E5=8D=95=E5=85=A8=E9=A2=9D?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=89=A9=E4=BD=99=E7=9A=84=E6=AC=BE=E9=A1=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopOrderReturnServiceImpl.java      |  2 +-
 pom.xml                                       | 27 ++++---------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index ad356029..2f459d9f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -936,7 +936,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
      * @param shopOrderId 商城订单ID
      * @return Boolean 处理结果，true表示成功，false表示失败
      */
-    @GlobalTransactional(timeoutMills = 30000, name = "sf-express-expired-force-refund")
+    @GlobalTransactional
     @Override
     public Boolean sfExpressExpiredForceRefund(String shopOrderId) {
         logger.info("[顺丰超时自动退款] 开始处理订单: shopOrderId={}", shopOrderId);
diff --git a/pom.xml b/pom.xml
index 02cd8440..5b74913d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,8 +558,10 @@
                         <!--定义基础镜像-->
 <!--                        <baseImage>java:8</baseImage>-->
                         <baseImage>openjdk:8-jre</baseImage>
+<!--                        <baseImage>openjdk:8-jre-slim</baseImage>-->
+
                         <!--定义容器启动命令，注意不能换行-->
-                        <entryPoint>["java", "-jar", "-Xms256m", "-Xmx512m", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=60.0", "-XX:+UseSerialGC", "-XX:MinHeapFreeRatio=40", "-XX:MaxHeapFreeRatio=60", "-XX:+PrintGCDetails", "-XX:+PrintGCDateStamps", "-Xloggc:./gc.log", "-XX:+UseGCLogFileRotation", "-XX:NumberOfGCLogFiles=5", "-XX:GCLogFileSize=10M", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]
+                        <entryPoint>["java", "-Dnacos.naming.cache.dir=/tmp/nacos/naming/", "-jar", "-Xms256m", "-Xmx512m", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=60.0", "-XX:+UseSerialGC", "-XX:MinHeapFreeRatio=40", "-XX:MaxHeapFreeRatio=60", "-XX:+PrintGCDetails", "-XX:+PrintGCDateStamps", "-Xloggc:./gc.log", "-XX:+UseGCLogFileRotation", "-XX:NumberOfGCLogFiles=5", "-XX:GCLogFileSize=10M", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]
                         </entryPoint>
 
                         <!--推送镜像仓库校验安全证书，无安全证书无法推送-->
@@ -567,27 +569,8 @@
 
                          <!-- 添加清理命令来过滤无用文件 -->
                          <runs>
-                             <!-- 原有清理命令 -->
-                                 <run>rm -rf /var/cache/apk/*</run>
-                                 <run>rm -rf /root/.m2</run>
-                                 <run>find / -name "*.log" -type f -delete 2>/dev/null || true</run>
-                                 <run>find / -name "*test*" -type f -delete 2>/dev/null || true</run>
-                                 <run>find / -name "*.md" -type f -delete 2>/dev/null || true</run>
-
-                                 <!-- 新增：清理系统临时文件 -->
-                                 <run>rm -rf /tmp/* /var/tmp/*</run>
-                                 <!-- 新增：删除冗余文档和手册页（适用于Alpine/Debian等） -->
-                                 <run>rm -rf /usr/share/doc/* /usr/share/man/* /usr/share/info/*</run>
-                                 <!-- 新增：清理包管理工具残留（若使用yum/dnf） -->
-                                 <run>rm -rf /var/cache/yum/* /var/cache/dnf/* 2>/dev/null || true</run>
-                                 <!-- 新增：删除构建过程中下载的源码包（如从wget/curl获取的临时文件） -->
-                                 <run>rm -rf /tmp/*.tar.gz /tmp/*.zip /app/*.tar.gz 2>/dev/null || true</run>
-                                 <!-- 新增：移除不必要的系统工具（根据应用依赖选择，如vim、curl等非必需工具） -->
-                                 <run>apk del --purge vim curl wget tar gzip 2>/dev/null || true</run>
-                                 <!-- 新增：清理Java相关临时文件（如JVM日志、编译缓存） -->
-                                 <run>rm -rf /root/.java /tmp/hsperfdata_* 2>/dev/null || true</run>
-                                 <!-- 新增：删除空目录（减少镜像层冗余） -->
-                                 <run>find / -type d -empty -delete 2>/dev/null || true</run>
+                             <!-- 合并所有清理命令到单个RUN指令 -->
+                             <run>rm -rf /var/cache/apk/* &amp;&amp; rm -rf /root/.m2 &amp;&amp; find / -name "*.log" -type f -delete 2&gt;/dev/null || true &amp;&amp; find / -name "*test*" -type f -delete 2&gt;/dev/null || true &amp;&amp; find / -name "*.md" -type f -delete 2&gt;/dev/null || true &amp;&amp; rm -rf /tmp/* /var/tmp/* &amp;&amp; rm -rf /usr/share/doc/* /usr/share/man/* /usr/share/info/* &amp;&amp; rm -rf /var/cache/yum/* /var/cache/dnf/* 2&gt;/dev/null || true &amp;&amp; rm -rf /tmp/*.tar.gz /tmp/*.zip /app/*.tar.gz 2&gt;/dev/null || true &amp;&amp; apk del --purge vim curl wget tar gzip 2&gt;/dev/null || true &amp;&amp; rm -rf /root/.java /tmp/hsperfdata_* 2&gt;/dev/null || true &amp;&amp; find / -type d -empty -delete 2&gt;/dev/null || true</run>
                          </runs>
 
                         <resources>