backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：推送同账号同系统 多人登录，都可以收到推送

Browse Source
This commit is contained in:
Jack 2025-08-11 23:06:11 +08:00
parent 94f95d1dcd
commit e43bbf3bfa
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindGeTuiServiceImpl.java
View File

@ -42,9 +42,10 @@ public class AccountUserBindGeTuiServiceImpl extends BaseServiceImpl<UserDeviceB
// 获取操作系统类型，默认为1 手机系统类型 ：1-Android；2-iOS；3-微信小程序； // 获取操作系统类型，默认为1 手机系统类型 ：1-Android；2-iOS；3-微信小程序；
Integer osType = accountUserBindGeTui.getOsType() != null ? accountUserBindGeTui.getOsType() : 1; Integer osType = accountUserBindGeTui.getOsType() != null ? accountUserBindGeTui.getOsType() : 1;
// 构建查询条件 组合健：用户ID、CID、用户类型、手机系统类型 // 构建查询条件 组合健：用户ID、CID、用户类型、手机系统类型 (同一个账号同一个系统需要同时收到推送，所以增加了 cid 条件)
QueryWrapper<AccountUserBindGeTui> wrapper = new QueryWrapper<AccountUserBindGeTui>() QueryWrapper<AccountUserBindGeTui> wrapper = new QueryWrapper<AccountUserBindGeTui>()
.eq("user_id", accountUserBindGeTui.getUserId()) .eq("user_id", accountUserBindGeTui.getUserId())
.eq("cid", accountUserBindGeTui.getCid())
.eq("os_type", osType) .eq("os_type", osType)
.eq("user_type", accountUserBindGeTui.getUserType()) .eq("user_type", accountUserBindGeTui.getUserType())
.eq("status", CommonConstant.Enable) .eq("status", CommonConstant.Enable)

5
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseConfigServiceImpl.java
View File

@ -35,7 +35,7 @@ import java.io.OutputStream;
@Service @Service
public class ShopBaseConfigServiceImpl extends BaseServiceImpl<ShopBaseConfigMapper, ShopBaseConfig> implements ShopBaseConfigService { 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 @Autowired
private RedisService redisService; private RedisService redisService;
@ -108,6 +108,9 @@ public class ShopBaseConfigServiceImpl extends BaseServiceImpl<ShopBaseConfigMap
// 产生验证码图片的。图片的宽是116，高是36，验证码的长度是4，干扰线的条数是20 // 产生验证码图片的。图片的宽是116，高是36，验证码的长度是4，干扰线的条数是20
LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(120, 40, 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); String verify_token = getParameter("verify_token", String.class);

1
mall-shop/src/main/resources/mapper/store/ShopStoreEmployeeMapper.xml
View File

@ -37,6 +37,7 @@
and c.order_id = #{orderId} and c.order_id = #{orderId}
</if> </if>
<!--管理员-->
<if test="isAdmin!=null and isAdmin==true"> <if test="isAdmin!=null and isAdmin==true">
and a.employee_is_admin = 1 and a.employee_is_admin = 1
</if> </if>

26
pom.xml
View File

@ -548,7 +548,7 @@
<!--定义基础镜像--> <!--定义基础镜像-->
<!-- <baseImage>java:8</baseImage>--> <!-- <baseImage>java:8</baseImage>-->
<!-- <baseImage>openjdk:8-jre</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>["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> </entryPoint>
@ -557,18 +557,18 @@
<dockerCertPath>${docker.ca}</dockerCertPath> <dockerCertPath>${docker.ca}</dockerCertPath>
<!-- 添加清理命令来过滤无用文件 --> <!-- 添加清理命令来过滤无用文件 -->
<runs> <runs>
<!-- 清理 APK 缓存（Alpine 镜像） --> <!-- 清理 APK 缓存（镜像） -->
<run>rm -rf /var/cache/apk/*</run> <run>rm -rf /var/cache/apk/*</run>
<!-- 删除 Maven 构建过程中产生的临时文件 --> <!-- 删除 Maven 构建过程中产生的临时文件 -->
<run>rm -rf /root/.m2</run> <run>rm -rf /root/.m2</run>
<!-- 删除可能存在的日志文件 --> <!-- 删除可能存在的日志文件 -->
<run>find / -name "*.log" -type f -delete 2>/dev/null || true</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 "*test*" -type f -delete 2>/dev/null || true</run>
<!-- 删除文档文件 --> <!-- 删除文档文件 -->
<run>find / -name "*.md" -type f -delete 2>/dev/null || true</run> <run>find / -name "*.md" -type f -delete 2>/dev/null || true</run>
</runs> </runs>
<resources> <resources>
<resource> <resource>