From e43bbf3bfacd5cc0db9ad77aa402005a3672ae1b Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 11 Aug 2025 23:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=90=8C=E8=B4=A6=E5=8F=B7=E5=90=8C=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E5=A4=9A=E4=BA=BA=E7=99=BB=E5=BD=95=EF=BC=8C=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=94=B6=E5=88=B0=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AccountUserBindGeTuiServiceImpl.java |  3 ++-
 .../impl/ShopBaseConfigServiceImpl.java       |  5 +++-
 .../mapper/store/ShopStoreEmployeeMapper.xml  |  1 +
 pom.xml                                       | 26 +++++++++----------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindGeTuiServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindGeTuiServiceImpl.java
index 969b4a69..f2cf75a2 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindGeTuiServiceImpl.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindGeTuiServiceImpl.java
@@ -42,9 +42,10 @@ public class AccountUserBindGeTuiServiceImpl extends BaseServiceImpl<UserDeviceB
             // 获取操作系统类型，默认为1 手机系统类型 ：1-Android；2-iOS；3-微信小程序；
             Integer osType = accountUserBindGeTui.getOsType() != null ? accountUserBindGeTui.getOsType() : 1;
 
-            // 构建查询条件 组合健：用户ID、CID、用户类型、手机系统类型
+            // 构建查询条件 组合健：用户ID、CID、用户类型、手机系统类型 (同一个账号同一个系统需要同时收到推送，所以增加了 cid 条件)
             QueryWrapper<AccountUserBindGeTui> wrapper = new QueryWrapper<AccountUserBindGeTui>()
                     .eq("user_id", accountUserBindGeTui.getUserId())
+                    .eq("cid", accountUserBindGeTui.getCid())
                     .eq("os_type", osType)
                     .eq("user_type", accountUserBindGeTui.getUserType())
                     .eq("status", CommonConstant.Enable)
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseConfigServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseConfigServiceImpl.java
index a7304aab..93e964e6 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseConfigServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseConfigServiceImpl.java
@@ -35,7 +35,7 @@ import java.io.OutputStream;
 @Service
 public class ShopBaseConfigServiceImpl extends BaseServiceImpl<ShopBaseConfigMapper, ShopBaseConfig> implements ShopBaseConfigService {
 
-    private static Logger logger = LoggerFactory.getLogger(ShopBaseConfigServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ShopBaseConfigServiceImpl.class);
 
     @Autowired
     private RedisService redisService;
@@ -108,6 +108,9 @@ public class ShopBaseConfigServiceImpl extends BaseServiceImpl<ShopBaseConfigMap
         // 产生验证码图片的。图片的宽是116，高是36，验证码的长度是4，干扰线的条数是20
         LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(120, 40, 4, 20);
 
+        // 可选：设置自定义字体（如果需要）
+//        lineCaptcha.setFont(new Font("Arial", Font.BOLD, 16));
+
         // 拼接时间戳
         String verify_token = getParameter("verify_token", String.class);
 
diff --git a/mall-shop/src/main/resources/mapper/store/ShopStoreEmployeeMapper.xml b/mall-shop/src/main/resources/mapper/store/ShopStoreEmployeeMapper.xml
index b0ea2c3e..1b42e311 100644
--- a/mall-shop/src/main/resources/mapper/store/ShopStoreEmployeeMapper.xml
+++ b/mall-shop/src/main/resources/mapper/store/ShopStoreEmployeeMapper.xml
@@ -37,6 +37,7 @@
                 and c.order_id = #{orderId}
             </if>
 
+            <!--管理员-->
             <if test="isAdmin!=null and isAdmin==true">
                 and a.employee_is_admin = 1
             </if>
diff --git a/pom.xml b/pom.xml
index 92d385e7..bec9aeb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,7 +548,7 @@
                         <!--定义基础镜像-->
 <!--                        <baseImage>java:8</baseImage>-->
 <!--                        <baseImage>openjdk:8-jre</baseImage>-->
-                        <baseImage>openjdk:8-jre-alpine</baseImage>
+                        <baseImage>openjdk:8-jre</baseImage>
                         <!--定义容器启动命令，注意不能换行-->
                         <entryPoint>["java", "-jar", "-Xms128m", "-Xmx512m", "-XX:MetaspaceSize=128m", "-XX:MaxMetaspaceSize=256m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=60.0", "-XX:+UseSerialGC", "-XX:MinHeapFreeRatio=40", "-XX:MaxHeapFreeRatio=60", "-Dspring.profiles.active=${spring.profile}", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]
                         </entryPoint>
@@ -557,18 +557,18 @@
                         <dockerCertPath>${docker.ca}</dockerCertPath>
 
                          <!-- 添加清理命令来过滤无用文件 -->
-                                <runs>
-                                    <!-- 清理 APK 缓存（Alpine 镜像） -->
-                                    <run>rm -rf /var/cache/apk/*</run>
-                                    <!-- 删除 Maven 构建过程中产生的临时文件 -->
-                                    <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>
-                                </runs>
+                         <runs>
+                             <!-- 清理 APK 缓存（镜像） -->
+                             <run>rm -rf /var/cache/apk/*</run>
+                             <!-- 删除 Maven 构建过程中产生的临时文件 -->
+                             <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>
+                         </runs>
 
                         <resources>
                             <resource>