diff --git a/Server/application/api/controller/MessageController.php b/Server/application/api/controller/MessageController.php index 12d732c1..c4bd545b 100644 --- a/Server/application/api/controller/MessageController.php +++ b/Server/application/api/controller/MessageController.php @@ -349,7 +349,7 @@ class MessageController extends BaseController * 保存消息记录到数据库 * @param array $item 消息记录数据 */ - private function saveMessage($item) + public function saveMessage($item) { // 检查消息是否已存在 $exists = WechatMessageModel::where('id', $item['id']) ->find(); @@ -457,7 +457,7 @@ class MessageController extends BaseController * @param array $item 消息记录数据 * @return bool 是否保存成功 */ - private function saveChatroomMessage($item) + public function saveChatroomMessage($item) { // 检查消息是否已存在 $exists = WechatMessageModel::where('id', $item['id'])->find(); diff --git a/Server/application/chukebao/controller/DataProcessing.php b/Server/application/chukebao/controller/DataProcessing.php index 04344a74..d6970702 100644 --- a/Server/application/chukebao/controller/DataProcessing.php +++ b/Server/application/chukebao/controller/DataProcessing.php @@ -4,6 +4,8 @@ namespace app\chukebao\controller; use library\ResponseHelper; use app\api\model\WechatFriendModel; +use app\api\controller\MessageController; + class DataProcessing extends BaseController { @@ -20,11 +22,17 @@ class DataProcessing extends BaseController $labels = $this->request->param('labels', []); //微信群 $wechatChatroomId = $this->request->param('wechatChatroomId', ''); + + //新消息 + $friendMessage = $this->request->param('friendMessage', ''); + $chatroomMessage = $this->request->param('chatroomMessage', ''); + $typeData = [ 'CmdModifyFriendRemark', //好友修改备注 {newRemark、wechatAccountId、wechatFriendId} 'CmdModifyFriendLabel', //好友修改标签 {labels、wechatAccountId、wechatFriendId} 'CmdAllotFriend', //转让好友 {labels、wechatAccountId、wechatFriendId} 'CmdChatroomOperate', //修改群信息 {chatroomName(群名)、announce(公告)、extra(公告)、wechatAccountId、wechatChatroomId} + 'CmdNewMessage', //接收消息 ]; if (empty($type) || empty($wechatAccountId)) { @@ -76,6 +84,26 @@ class DataProcessing extends BaseController $friend->save(); $msg = '好友转移成功'; break; + case 'CmdNewMessage': + if(empty($friendMessage) || empty($chatroomMessage)){ + return ResponseHelper::error('参数缺失'); + } + + if(is_array($friendMessage) || is_array($chatroomMessage)){ + return ResponseHelper::error('参数缺失'); + } + + $messageController = new MessageController(); + if (!empty($friendMessage)){ + $res = $messageController->saveMessage($friendMessage); + }else{ + $res = $messageController->saveChatroomMessage($friendMessage); + } + if (!empty($res)){ + $msg = '消息记录成功'; + }else{ + $msg = '消息记录失败'; + } } return ResponseHelper::success('',$msg); } diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php index 726625a6..0ddac5b7 100644 --- a/Server/application/cunkebao/controller/ContentLibraryController.php +++ b/Server/application/cunkebao/controller/ContentLibraryController.php @@ -247,6 +247,7 @@ class ContentLibraryController extends Controller $friendsInfo = Db::name('wechat_friendship')->alias('wf') ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar') ->join('wechat_account wa', 'wf.wechatId = wa.wechatId') + ->order('wa.id DESC') ->whereIn('wf.id', $friendIds) ->select(); }