Mr.qian 5 days ago
parent
commit
7c729d207b

+ 7 - 2
mall-service/src/main/java/com/txz/mall/controller/appcontroller/JPushController.java

@@ -1,6 +1,7 @@
 package com.txz.mall.controller.appcontroller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.txz.mall.core.AuthService;
 import com.txz.mall.core.Result;
@@ -8,7 +9,6 @@ import com.txz.mall.model.UserJPush;
 import com.txz.mall.service.UserJPushService;
 import com.txz.mall.web.ro.JPushBindRO;
 import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +36,7 @@ public class JPushController {
      * 客户端绑定用户
      */
     @PostMapping("bindUser")
-    private Result bindUser(@RequestBody @Validated JPushBindRO ro, HttpServletRequest request) {
+    private Result bindUser(@RequestBody JPushBindRO ro, HttpServletRequest request) {
         Long userId;
         try {
             userId = authService.getTokenUserId(request);
@@ -44,6 +44,11 @@ public class JPushController {
             // 未登录会抛异常,场景登录未登录均可
             userId = null;
         }
+        
+        //极光推送如果挂了,不绑定
+        if (StrUtil.isBlank(ro.getJpushDeviceId())) {
+            return Result.success();
+        }
         UserJPush device;
         // 多端推送场景注掉这儿
         if (ObjectUtil.isNotEmpty(userId)) {

+ 0 - 3
mall-service/src/main/java/com/txz/mall/web/ro/JPushBindRO.java

@@ -2,8 +2,6 @@ package com.txz.mall.web.ro;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author: MTD®️
  * @date: 2025/9/17
@@ -14,7 +12,6 @@ public class JPushBindRO {
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备ID不能为空")
     private String jpushDeviceId;
     
     /**