From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index ccd8e89..f6babfb 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -36,7 +36,7 @@
@Autowired
private IMessageService iMessageService;
- @Autowired
+ @Resource
private UmsAdminMapper umsAdminMapper;
@ApiOperation(value = "鍙戦�佹秷鎭�")
@@ -47,17 +47,19 @@
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
//璁剧疆鍒涘缓浜�
message.setCreateUser(user.getUserId());
- return CommonResult.success(iMessageService.sendMessage(message));
+ iMessageService.sendMessage(message);
+ return CommonResult.success("send success");
}
@ApiOperation(value = "鍙戦�佹秷鎭�氳繃鎵嬫満鍙风爜")
@RequestMapping(value = "/send_message_phone", method = RequestMethod.POST)
- public CommonResult sendMessageByPhoneNumber( @RequestBody Message message) {
+ public CommonResult sendMessageByPhoneNumber(@RequestBody Message message) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
//璁剧疆鍒涘缓浜�
message.setCreateUser(user.getUserId());
- return CommonResult.success(iMessageService.sendMessageByPhone(message));
+ iMessageService.sendMessageByPhone(message);
+ return CommonResult.success("send success");
}
--
Gitblit v1.8.0