From a13c25d294fb7b52f80c604bf0f3e3fe997b89da Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 二月 2026 18:05:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/AliPushController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/AliPushController.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/AliPushController.java
index a0a6617..2a21207 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/AliPushController.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/AliPushController.java
@@ -14,8 +14,6 @@
public class AliPushController {
@Autowired
- private RedisService redisService;
- @Autowired
private AliPushUtil aliPushUtil;
/**
@@ -23,8 +21,8 @@
* @return
*/
@GetMapping("/base/v1/aliPush/test")
- public R<String> test() throws Exception {
- String s = aliPushUtil.pushMessage(1, "13540694412", "测试", "{\"content\":\"测试消息\",\"strategy\":1\"type\":1,\"id\":1}");
+ public R<String> test(){
+ String s = aliPushUtil.pushMessage(1, "13540694412", "测试", "{\"content\":\"测试消息\",\"strategy\":1\"type\":1,\"id\":1}","NOTICE");
return R.ok(s);
}
@@ -34,7 +32,7 @@
*/
@PostMapping("/inner/v1/aliPush/pushMessage")
public R<String> pushMessage(@RequestBody AliPushMessageDTO dto) {
- String result = aliPushUtil.pushMessage(dto.getDeviceType(), dto.getAccount(), dto.getTitle(), dto.getBody());
+ String result = aliPushUtil.pushMessage(dto.getDeviceType(), dto.getAccount(), dto.getTitle(), dto.getBody(),dto.getPushType());
return R.ok(result);
}
--
Gitblit v1.7.1