From 78e28a99dc224b18f2bced6afff56e49b0e27129 Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 20 Aug 2025 13:46:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?ws=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/ResourceService.php | 1 + app/common/utils/WsEvents.php | 221 ++++++++++++++++++ app/common/utils/WsResponse.php | 47 ++++ composer.json | 3 +- composer.lock | 89 ++++++- config/plugin/webman/gateway-worker/app.php | 4 + .../plugin/webman/gateway-worker/process.php | 39 ++++ plugin/webman/gateway/Events.php | 38 +++ 8 files changed, 440 insertions(+), 2 deletions(-) create mode 100644 app/common/utils/WsEvents.php create mode 100644 app/common/utils/WsResponse.php create mode 100644 config/plugin/webman/gateway-worker/app.php create mode 100644 config/plugin/webman/gateway-worker/process.php create mode 100644 plugin/webman/gateway/Events.php diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index ad3f85b..c1654a5 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -53,6 +53,7 @@ class ResourceService $config['order']['id'] = 'asc'; break; case 'menuTreeList': + $config['where']['system_id'] = ['in', [0, $p['system_id']]]; $config['where']['status'] = 1; $config['order']['sort'] = 'asc'; $config['order']['id'] = 'asc'; diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php new file mode 100644 index 0000000..0916078 --- /dev/null +++ b/app/common/utils/WsEvents.php @@ -0,0 +1,221 @@ +registerAddress; + } + + /** + * 监听消息接收 + */ + public function message($client_id, $message) + { + $this->clientId = $client_id; + + $payload = json_decode($message, true); + $event = $payload['event']; + $this->eventData = $payload['data'] ?? []; + $traceId = $payload['trace_id'] ?? null; + + $method = $this->eventToMethod($event); + + if (method_exists($this, $method)) { + try { + $this->$method($traceId); + } catch (\Throwable $th) { + Gateway::sendToClient($client_id, WsResponse::error( + $event, + 500, + $th->getMessage(), + $traceId + )); + } + } else { + Gateway::sendToClient($client_id, WsResponse::error( + $event, + 404, + "Event handler not found: $method", + $traceId + )); + } + } + + + // ================= 系统事件 ================= + /** + * 认证 + */ + public function auth($client_id, $payload) + { + try { + // 检查来源 + if (!isset($payload['server']['HTTP_ORIGIN'])) { + flg('[x] [TOKEN认证] 未定义HTTP_ORIGIN', false); + Gateway::sendToClient($client_id, WsResponse::error( + 'system.auth', + 1001, + '[x] [TOKEN认证] 未定义HTTP_ORIGIN' + )); + Gateway::closeClient($client_id); + return; + } + + // // 连接是否满足条件 + // if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { + // flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); + // Gateway::sendToClient($client_id, WsResponse::error( + // 'system.auth', + // 1001, + // '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' + // )); + // Gateway::closeClient($client_id); + // return; + // } + + // 签名检查 + if (!isset($payload['get']['token'])) { + flg('[x] [TOKEN认证] 未携带TOKEN参数', false); + Gateway::sendToClient($client_id, WsResponse::error( + 'system.auth', + 1001, + '[x] [TOKEN认证] 未携带TOKEN参数' + )); + Gateway::closeClient($client_id); + return; + } + + // 解析TOKEN + $user = (new Jwt())->verifyToken($payload['get']['token']); + // 绑定用户ID + Gateway::bindUid($client_id, $user->uid); + + // 响应 + Gateway::sendToClient($client_id, WsResponse::success( + 'system.auth', + ['uid' => $user->uid] + )); + } catch (\Throwable $th) { + flg('[x] [TOKEN认证] TOKEN认证失败：'.$th->getMessage(), false); + Gateway::sendToClient($client_id, WsResponse::error( + 'system.auth', + 1001, + '[x] [TOKEN认证] TOKEN认证失败：'.$th->getMessage() + )); + Gateway::closeClient($client_id); + return; + } + } + + /** + * 系统心跳 + * + * @param string|null $traceId + */ + public function systemPing(?string $traceId) + { + Gateway::sendToClient($this->clientId, WsResponse::success( + 'system.pong', + ['time' => time()], + $traceId + )); + } + + + // ================= 消息通知事件 ================= + /** + * 管理端主动推送通知 + * data = [ + * 'to_uids' => [uid1, uid2], // 可选，为空表示全员 + * 'title' => '标题', + * 'content' => '内容', + * ] + */ + public function notifyPush(?string $traceId) + { + $title = $this->eventData['title'] ?? null; + $content = $this->eventData['content'] ?? null; + $toUids = $this->eventData['to_uids'] ?? []; + + if (!$title || !$content) { + Gateway::sendToClient($this->clientId, WsResponse::error( + 'notify.push', + 400, + 'title and content are required', + $traceId + )); + return; + } + + $msgId = rand(1000, 9999); // 生成消息ID，可用数据库存储 + + $payload = WsResponse::success('notify.push', [ + 'msg_id' => $msgId, + 'title' => $title, + 'content' => $content, + 'created_at' => time() + ], $traceId); + + if (!empty($toUids)) { + // 推送给指定用户 + foreach ($toUids as $uid) { + Gateway::sendToUid($uid, $payload); + } + } else { + // 推送给全体在线用户 + Gateway::sendToAll($payload); + } + + // 回复发送者确认 + Gateway::sendToClient($this->clientId, WsResponse::success( + 'notify.push.result', + ['msg_id' => $msgId], + $traceId + )); + } + + /** + * 客户端标记通知已读 + * data = ['msg_ids' => [1,2,3]] + */ + public function notifyRead(?string $traceId) + { + $msgIds = $this->eventData['msg_ids'] ?? []; + if (empty($msgIds)) { + Gateway::sendToClient($this->clientId, WsResponse::error( + 'notify.read', + 400, + 'msg_ids required', + $traceId + )); + return; + } + Gateway::sendToClient($this->clientId, WsResponse::success( + 'notify.read.result', + ['msg_ids' => $msgIds], + $traceId + )); + } + + // ================= 辅助方法 ================= + protected function eventToMethod(string $event): string + { + $parts = explode('.', $event); + $method = array_shift($parts); + foreach ($parts as $part) { + $method .= ucfirst($part); + } + return $method; + } +} \ No newline at end of file diff --git a/app/common/utils/WsResponse.php b/app/common/utils/WsResponse.php new file mode 100644 index 0000000..6cf0b28 --- /dev/null +++ b/app/common/utils/WsResponse.php @@ -0,0 +1,47 @@ + $event, + 'code' => $code, + 'message' => $message, + 'data' => $data, + 'trace_id' => $traceId, // 如果没有传就是 null + ], JSON_UNESCAPED_UNICODE); + } + + /** + * 错误返回 + * + * @param string $event 事件名称 + * @param int $code 错误码 + * @param string $message 错误信息 + * @param string|null $traceId 请求追踪ID，可选，默认 null + * @param array $data 附加数据（可选） + * @return string JSON + */ + public static function error(string $event, int $code, string $message, ?string $traceId = null, array $data = []): string + { + return json_encode([ + 'event' => $event, + 'code' => $code, + 'message' => $message, + 'data' => $data, + 'trace_id' => $traceId, // 如果没有传就是 null + ], JSON_UNESCAPED_UNICODE); + } +} \ No newline at end of file diff --git a/composer.json b/composer.json index 98e3e54..c474010 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,8 @@ "symfony/filesystem": "^7.3", "workerman/crontab": "^1.0", "phpoffice/phpspreadsheet": "^4.5", - "phpmailer/phpmailer": "^6.10" + "phpmailer/phpmailer": "^6.10", + "webman/gateway-worker": "^1.0" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index edf286f..7d41f97 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "505fb3d97c338ea53b787196fcc3daaa", + "content-hash": "7c70d8c8bda8a5098b8baed463db8839", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -6634,6 +6634,39 @@ }, "time": "2025-04-04T13:23:25+00:00" }, + { + "name": "webman/gateway-worker", + "version": "v1.0.9", + "source": { + "type": "git", + "url": "https://github.com/webman-php/gateway-worker.git", + "reference": "6780c1c788c273a24699caee84feb14224234000" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webman-php/gateway-worker/zipball/6780c1c788c273a24699caee84feb14224234000", + "reference": "6780c1c788c273a24699caee84feb14224234000", + "shasum": "" + }, + "require": { + "workerman/gateway-worker": ">=3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Webman\\GatewayWorker\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "support": { + "issues": "https://github.com/webman-php/gateway-worker/issues", + "source": "https://github.com/webman-php/gateway-worker/tree/v1.0.9" + }, + "time": "2024-04-30T01:05:42+00:00" + }, { "name": "webman/redis", "version": "v2.1.3", @@ -6793,6 +6826,60 @@ }, "time": "2025-01-15T07:20:50+00:00" }, + { + "name": "workerman/gateway-worker", + "version": "v4.0.1", + "source": { + "type": "git", + "url": "https://github.com/walkor/GatewayWorker.git", + "reference": "25e4430982caa98f82e9187d092ce34b2fddfc90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/walkor/GatewayWorker/zipball/25e4430982caa98f82e9187d092ce34b2fddfc90", + "reference": "25e4430982caa98f82e9187d092ce34b2fddfc90", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "workerman/workerman": "^4.0.30 || ^5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "GatewayWorker\\": "./src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "homepage": "http://www.workerman.net", + "keywords": [ + "communication", + "distributed" + ], + "support": { + "issues": "https://github.com/walkor/GatewayWorker/issues", + "source": "https://github.com/walkor/GatewayWorker/tree/v4.0.1" + }, + "funding": [ + { + "url": "https://opencollective.com/walkor", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/walkor", + "type": "patreon" + } + ], + "time": "2025-06-27T01:30:09+00:00" + }, { "name": "workerman/redis", "version": "v2.0.4", diff --git a/config/plugin/webman/gateway-worker/app.php b/config/plugin/webman/gateway-worker/app.php new file mode 100644 index 0000000..8f9c426 --- /dev/null +++ b/config/plugin/webman/gateway-worker/app.php @@ -0,0 +1,4 @@ + true, +]; \ No newline at end of file diff --git a/config/plugin/webman/gateway-worker/process.php b/config/plugin/webman/gateway-worker/process.php new file mode 100644 index 0000000..5c7efaa --- /dev/null +++ b/config/plugin/webman/gateway-worker/process.php @@ -0,0 +1,39 @@ + [ + 'handler' => Gateway::class, + 'listen' => 'websocket://0.0.0.0:5151', + 'count' => 2, + 'reloadable' => false, + 'constructor' => ['config' => [ + 'lanIp' => '127.0.0.1', + 'startPort' => 2300, + 'pingInterval' => 55, + 'pingNotResponseLimit' => 1, + 'pingData' => '', + 'registerAddress' => '127.0.0.1:1236', + 'onConnect' => function(){}, + ]] + ], + 'worker' => [ + 'handler' => BusinessWorker::class, + 'count' => cpu_count()*2, + 'constructor' => ['config' => [ + 'eventHandler' => plugin\webman\gateway\Events::class, + 'name' => 'ChatBusinessWorker', + 'registerAddress' => '127.0.0.1:1236', + ]] + ], + 'register' => [ + 'handler' => Register::class, + 'listen' => 'text://127.0.0.1:1236', + 'count' => 1, // Must be 1 + 'reloadable' => false, + 'constructor' => [] + ], +]; diff --git a/plugin/webman/gateway/Events.php b/plugin/webman/gateway/Events.php new file mode 100644 index 0000000..d63708e --- /dev/null +++ b/plugin/webman/gateway/Events.php @@ -0,0 +1,38 @@ +auth($client_id, $data); + } + + public static function onMessage($client_id, $message) + { + self::$wsEvents->message($client_id, $message); + } + + public static function onClose($client_id) + { + var_dump('关闭客户端ID：'.$client_id); + } + +} \ No newline at end of file From 9f96b8d6253f6f380f4d93a4026b0103710ef8ed Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 20 Aug 2025 18:12:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageNotificationsController.php | 33 +++++++ .../MessageUserStatusController.php | 33 +++++++ .../logic/MessageNotificationsLogic.php | 17 ++++ app/common/logic/MessageUserStatusLogic.php | 17 ++++ app/common/model/MessageNotifications.php | 49 ++++++++++ app/common/model/MessageUserStatus.php | 49 ++++++++++ .../service/MessageNotificationsService.php | 95 +++++++++++++++++++ .../service/MessageUserStatusService.php | 31 ++++++ app/common/utils/WsEvents.php | 56 +++++++---- .../validate/MessageNotificationsValidate.php | 29 ++++++ .../validate/MessageUserStatusValidate.php | 29 ++++++ app/controller/IndexController.php | 30 ++---- app/functions.php | 24 +++++ 13 files changed, 451 insertions(+), 41 deletions(-) create mode 100644 app/common/controller/MessageNotificationsController.php create mode 100644 app/common/controller/MessageUserStatusController.php create mode 100644 app/common/logic/MessageNotificationsLogic.php create mode 100644 app/common/logic/MessageUserStatusLogic.php create mode 100644 app/common/model/MessageNotifications.php create mode 100644 app/common/model/MessageUserStatus.php create mode 100644 app/common/service/MessageNotificationsService.php create mode 100644 app/common/service/MessageUserStatusService.php create mode 100644 app/common/validate/MessageNotificationsValidate.php create mode 100644 app/common/validate/MessageUserStatusValidate.php diff --git a/app/common/controller/MessageNotificationsController.php b/app/common/controller/MessageNotificationsController.php new file mode 100644 index 0000000..4e475eb --- /dev/null +++ b/app/common/controller/MessageNotificationsController.php @@ -0,0 +1,33 @@ +service = new MessageNotificationsService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + // protected function indexFormat($data) + // { + // if (isset($data['created_at'])) + // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + // if (isset($data['updated_at'])) + // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + // return $data; + // } +} \ No newline at end of file diff --git a/app/common/controller/MessageUserStatusController.php b/app/common/controller/MessageUserStatusController.php new file mode 100644 index 0000000..302aec4 --- /dev/null +++ b/app/common/controller/MessageUserStatusController.php @@ -0,0 +1,33 @@ +service = new MessageUserStatusService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + // protected function indexFormat($data) + // { + // if (isset($data['created_at'])) + // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + // if (isset($data['updated_at'])) + // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + // return $data; + // } +} \ No newline at end of file diff --git a/app/common/logic/MessageNotificationsLogic.php b/app/common/logic/MessageNotificationsLogic.php new file mode 100644 index 0000000..b0a1429 --- /dev/null +++ b/app/common/logic/MessageNotificationsLogic.php @@ -0,0 +1,17 @@ +validator; + } + + + /** + * 创建一条消息 + */ + public function createMessage(array $data): int + { + $msgId = Db::table('message_notifications')->insertGetId([ + 'msg_no' => generateMsgId(), + 'sender_id' => $data['sender_id'], + 'sender_type' => $data['sender_type'], + 'title' => $data['title'], + 'content' => $data['content'], + 'scene' => $data['scene'], + 'recipient' => $data['recipient'], + 'created_at' => time(), + ]); + + return $msgId; + } + + /** + * 批量插入用户消息状态 + */ + public function addUserStatus(int $msgId, array $uids) + { + $rows = []; + foreach ($uids as $uid) { + $rows[] = [ + 'msg_id' => $msgId, + 'uid' => $uid, + 'status' => 0, + 'read_at' => null + ]; + } + if ($rows) { + Db::table('message_user_status')->insert($rows); + } + } + + /** + * 标记消息已读 + */ + public function markAsRead(array|string $msgIds, int $uid) + { + $query = Db::table('message_user_status')->where('uid', $uid); + if (is_array($msgIds)) { + $query->whereIn('msg_id', $msgIds); + } + return $query->update([ + 'status' => 1, + 'read_at' => time() + ]); + } + + /** + * 获取所有用户ID + */ + public function getAllUserIds(): array + { + return User::where('status', 1)->pluck('id')->toArray(); + } +} \ No newline at end of file diff --git a/app/common/service/MessageUserStatusService.php b/app/common/service/MessageUserStatusService.php new file mode 100644 index 0000000..f04e8b5 --- /dev/null +++ b/app/common/service/MessageUserStatusService.php @@ -0,0 +1,31 @@ +validator; + } +} \ No newline at end of file diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php index 0916078..c5642c0 100644 --- a/app/common/utils/WsEvents.php +++ b/app/common/utils/WsEvents.php @@ -4,6 +4,7 @@ namespace app\common\utils; use GatewayWorker\Lib\Gateway; use app\common\utils\WsResponse; +use app\common\service\MessageNotificationsService; class WsEvents { @@ -72,17 +73,17 @@ class WsEvents return; } - // // 连接是否满足条件 - // if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { - // flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); - // Gateway::sendToClient($client_id, WsResponse::error( - // 'system.auth', - // 1001, - // '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' - // )); - // Gateway::closeClient($client_id); - // return; - // } + // 连接是否满足条件 + if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { + flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); + Gateway::sendToClient($client_id, WsResponse::error( + 'system.auth', + 1001, + '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' + )); + Gateway::closeClient($client_id); + return; + } // 签名检查 if (!isset($payload['get']['token'])) { @@ -136,11 +137,6 @@ class WsEvents // ================= 消息通知事件 ================= /** * 管理端主动推送通知 - * data = [ - * 'to_uids' => [uid1, uid2], // 可选，为空表示全员 - * 'title' => '标题', - * 'content' => '内容', - * ] */ public function notifyPush(?string $traceId) { @@ -158,7 +154,20 @@ class WsEvents return; } - $msgId = rand(1000, 9999); // 生成消息ID，可用数据库存储 + // 写消息 + $msgService = new MessageNotificationsService(); + $msgId = $msgService->createMessage([ + 'sender_id' => $this->eventData['sender_id'] ?? 0, + 'sender_type' => $this->eventData['sender_type'] ?? 'system', + 'title' => $title, + 'content' => $content, + 'scene' => $this->eventData['scene'] ?? 0, + 'recipient' => $this->eventData['to_uids'] ? implode(',', $this->eventData['to_uids']) : '', + ]); + + // 写用户状态 + $uids = !empty($toUids) ? $toUids : $msgService->getAllUserIds(); + $msgService->addUserStatus($msgId, $uids); $payload = WsResponse::success('notify.push', [ 'msg_id' => $msgId, @@ -181,18 +190,18 @@ class WsEvents Gateway::sendToClient($this->clientId, WsResponse::success( 'notify.push.result', ['msg_id' => $msgId], - $traceId + $traceId, + '消息发送成功' )); } /** * 客户端标记通知已读 - * data = ['msg_ids' => [1,2,3]] */ public function notifyRead(?string $traceId) { - $msgIds = $this->eventData['msg_ids'] ?? []; - if (empty($msgIds)) { + $msgIds = $this->eventData['msg_ids']; + if (!is_array($msgIds) && $msgIds !== 'all') { Gateway::sendToClient($this->clientId, WsResponse::error( 'notify.read', 400, @@ -201,6 +210,11 @@ class WsEvents )); return; } + + // 更新消息为已读 + $msgService = new MessageNotificationsService(); + $msgService->markAsRead($msgIds, Gateway::getUidByClientId($this->clientId)); + Gateway::sendToClient($this->clientId, WsResponse::success( 'notify.read.result', ['msg_ids' => $msgIds], diff --git a/app/common/validate/MessageNotificationsValidate.php b/app/common/validate/MessageNotificationsValidate.php new file mode 100644 index 0000000..c5dd6e1 --- /dev/null +++ b/app/common/validate/MessageNotificationsValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/common/validate/MessageUserStatusValidate.php b/app/common/validate/MessageUserStatusValidate.php new file mode 100644 index 0000000..647cebd --- /dev/null +++ b/app/common/validate/MessageUserStatusValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index e7ae182..3651926 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -77,25 +77,25 @@ class IndexController $options = [ 'controller' => [ 'module' => 'common', - 'name' => 'resources' + 'name' => 'message_notifications' ], 'model' => [ 'module' => 'common', - 'name' => 'resources' + 'name' => 'message_notifications' ], 'service' => [ 'module' => 'common', - 'name' => 'resources' + 'name' => 'message_notifications' ], 'logic' => [ 'module' => 'common', - 'name' => 'resources' + 'name' => 'message_notifications' ], 'validate' => [ 'module' => 'common', - 'name' => 'resources' + 'name' => 'message_notifications' ], - 'table' => 'resources' + 'table' => 'message_notifications' ]; $result = (new Generate($options))->doGenerate(); @@ -106,21 +106,11 @@ class IndexController public function test() { - // $data = [ - // 'code' => 'GD20250703-1DC80', - // 'category' => '账号类问题', - // 'content' => '这是一条测试工单内容。' - // ]; - // \app\common\utils\email\MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的工单提醒', replaceTpl($data, 'work_order')); + $service = new \app\common\service\MessageNotificationsService(); + $udis = $service->getAllUserIds(); - // $options = [ - // 'corp_id' => 3, - // 'user_id' => 666 - // ]; - // \Webman\RedisQueue\Redis::send('perm-agt', $options); + var_dump($udis); - $res = Cache::delete("user_resources_74_fdesk"); - - return 22; + return json($udis); } } \ No newline at end of file diff --git a/app/functions.php b/app/functions.php index 299bad4..d9bb411 100644 --- a/app/functions.php +++ b/app/functions.php @@ -283,4 +283,28 @@ if (!function_exists('normalizeRichText')) { // 替换所有空白实体为普通空格 return preg_replace('/\s+/u', ' ', $result); } +} + + +/** + * 生成消息编号（唯一业务标识） + * 格式：年月日时分秒 + 微秒 + 随机数 + * 例如：20250820175530987654321 + * + * @return string + */ +if (!function_exists('generateMsgId')) { + function generateMsgId(): string + { + // 时间部分（精确到微秒） + $time = microtime(true); + $micro = sprintf("%06d", ($time - floor($time)) * 1e6); + $date = date('YmdHis', (int)$time); + + // 随机部分（3位） + $rand = mt_rand(100, 999); + + // 拼接：日期时间 + 微秒 + 随机数 + return $date . $micro . $rand; + } } \ No newline at end of file From 58dc6729d9b020ec06421f87790463f46cc44811 Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 20 Aug 2025 19:14:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/MessageNotifications.php | 8 ++++ .../service/MessageNotificationsService.php | 37 +++++++++++++- app/common/utils/WsEvents.php | 23 +++++++++ app/controller/IndexController.php | 19 ++++++-- app/queue/redis/Notice.php | 48 +++++++++++++++++++ 5 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 app/queue/redis/Notice.php diff --git a/app/common/model/MessageNotifications.php b/app/common/model/MessageNotifications.php index e17e7c0..9ee9b77 100644 --- a/app/common/model/MessageNotifications.php +++ b/app/common/model/MessageNotifications.php @@ -46,4 +46,12 @@ class MessageNotifications extends Model * 不允许自动填充模型字段 */ protected $guarded = []; + + // 消息创建 + const SCENE = [ + self::SCENE0 => '系统消息', + self::SCENE1 => '系统通知' + ]; + const SCENE0 = 0; + const SCENE1 = 1; } \ No newline at end of file diff --git a/app/common/service/MessageNotificationsService.php b/app/common/service/MessageNotificationsService.php index 077dad5..720fec2 100644 --- a/app/common/service/MessageNotificationsService.php +++ b/app/common/service/MessageNotificationsService.php @@ -75,7 +75,7 @@ class MessageNotificationsService */ public function markAsRead(array|string $msgIds, int $uid) { - $query = Db::table('message_user_status')->where('uid', $uid); + $query = Db::table('message_user_status')->where('uid', $uid)->where('status', 0); if (is_array($msgIds)) { $query->whereIn('msg_id', $msgIds); } @@ -92,4 +92,39 @@ class MessageNotificationsService { return User::where('status', 1)->pluck('id')->toArray(); } + + /** + * 批量推送消息 + */ + public function pushNotice(array $data): int + { + // 数据结构： + // $data = [ + // 'sender_id' => 0, + // 'sender_type' => 'system', + // 'title' => '测试消息 - 标题', + // 'content' => '测试消息 - 内容', + // 'scene' => 1, + // 'recipient' => [], + // ]; + + // 写消息 + $msgId = $this->createMessage([ + 'sender_id' => $data['sender_id'], + 'sender_type' => $data['sender_type'], + 'title' => $data['title'], + 'content' => $data['content'], + 'scene' => $data['scene'], + 'recipient' => $data['recipient'] ? implode(',', $data['recipient']) : '', + ]); + + // 写用户状态 + $uids = count($data['recipient']) > 0 ? $data['recipient'] : $this->getAllUserIds(); + $this->addUserStatus($msgId, $uids); + + // 执行推送 + (new \app\common\utils\WsEvents())->pushNotice($msgId, $data['title'], $data['content'], $data['recipient']); + + return $msgId; + } } \ No newline at end of file diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php index c5642c0..cded7a0 100644 --- a/app/common/utils/WsEvents.php +++ b/app/common/utils/WsEvents.php @@ -222,6 +222,29 @@ class WsEvents )); } + /** + * 推送消息通知 + */ + public function pushNotice(int $msgId, string $title, string $content, array $recipient) + { + $payload = WsResponse::success('notify.push', [ + 'msg_id' => $msgId, + 'title' => $title, + 'content' => $content, + 'created_at' => time() + ]); + + if (count($recipient) > 0) { + // 推送给指定用户 + foreach ($recipient as $uid) { + Gateway::sendToUid($uid, $payload); + } + } else { + // 推送给全体在线用户 + Gateway::sendToAll($payload); + } + } + // ================= 辅助方法 ================= protected function eventToMethod(string $event): string { diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index 3651926..b12be98 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -6,6 +6,7 @@ use app\common\model\InquiryLog; use app\common\model\User; use app\common\model\UserRoles; use app\common\model\UserSystems; +use app\common\service\MessageNotificationsService; use app\common\traits\DataPermission; use app\common\utils\email\MailSend; use app\common\utils\scaffold\Generate; @@ -106,11 +107,21 @@ class IndexController public function test() { - $service = new \app\common\service\MessageNotificationsService(); - $udis = $service->getAllUserIds(); + // $data = [ + // 'sender_id' => 0, + // 'sender_type' => 'system', + // 'title' => '测试消息 - 标题', + // 'content' => '测试消息 - 内容', + // 'scene' => 1, + // 'recipient' => [1], + // ]; - var_dump($udis); + // // 同步推送 + // (new MessageNotificationsService())->pushNotice($data); - return json($udis); + // // 异步推送 + // \Webman\RedisQueue\Redis::send('notice', $data); + + return json($data); } } \ No newline at end of file diff --git a/app/queue/redis/Notice.php b/app/queue/redis/Notice.php new file mode 100644 index 0000000..3a310c8 --- /dev/null +++ b/app/queue/redis/Notice.php @@ -0,0 +1,48 @@ +pushNotice($data); + return true; + } catch (\Throwable $th) { + var_dump('4 ：'.$th->getFile()."|".$th->getLine()."|".$th->getMessage()); + throw new BusinessException($th->getFile()."|".$th->getLine()."|".$th->getMessage()); + } + } + + // 消费失败回调 + /* + $package = [ + 'id' => 1357277951, // 消息ID + 'time' => 1709170510, // 消息时间 + 'delay' => 0, // 延迟时间 + 'attempts' => 2, // 消费次数 + 'queue' => 'send-mail', // 队列名 + 'data' => ['to' => 'tom@gmail.com', 'content' => 'hello'], // 消息内容 + 'max_attempts' => 5, // 最大重试次数 + 'error' => '错误信息' // 错误信息 + ] + */ + public function onConsumeFailure(\Throwable $e, $package) + { + echo "consume failure\n"; + echo $e->getMessage() . "\n"; + // 无需反序列化 + var_export($package); + } +} \ No newline at end of file From c1de258ce249596798445319956ba88cbddf7d56 Mon Sep 17 00:00:00 2001 From: mzl Date: Thu, 21 Aug 2025 15:47:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageNotificationsController.php | 35 +++++++-- .../logic/MessageNotificationsLogic.php | 12 +++ app/common/model/MessageNotifications.php | 42 +++++++++- app/common/model/MessageUserStatus.php | 17 +++++ .../service/MessageNotificationsService.php | 76 +++++++++++++++++++ app/common/utils/WsEvents.php | 13 ++-- app/controller/IndexController.php | 11 ++- config/route.php | 9 +++ 8 files changed, 197 insertions(+), 18 deletions(-) diff --git a/app/common/controller/MessageNotificationsController.php b/app/common/controller/MessageNotificationsController.php index 4e475eb..19341fc 100644 --- a/app/common/controller/MessageNotificationsController.php +++ b/app/common/controller/MessageNotificationsController.php @@ -4,6 +4,8 @@ namespace app\common\controller; use app\common\controller\BaseController; use app\common\traits\crud\CrudControllerTrait; use app\common\service\MessageNotificationsService; +use app\common\model\MessageNotifications; +use support\Request; class MessageNotificationsController extends BaseController { @@ -22,12 +24,29 @@ class MessageNotificationsController extends BaseController * @param array $data * @return array */ - // protected function indexFormat($data) - // { - // if (isset($data['created_at'])) - // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - // if (isset($data['updated_at'])) - // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - // return $data; - // } + protected function indexFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + return $data; + } + + protected function showFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + return $data; + } + + + public function push(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'store'); + $res = $this->service->servicePush($request, $data); + return $this->success($res, '推送成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/logic/MessageNotificationsLogic.php b/app/common/logic/MessageNotificationsLogic.php index b0a1429..594bb96 100644 --- a/app/common/logic/MessageNotificationsLogic.php +++ b/app/common/logic/MessageNotificationsLogic.php @@ -14,4 +14,16 @@ class MessageNotificationsLogic */ protected string $modelClass = MessageNotifications::class; + + public function logicDeleteBy($config) + { + $msg = $this->logicShow($config); + if ($msg) { + // 删除关联的用户状态记录 + $msg->userStatuses()->delete(); + // 删除消息本身 + $msg->delete(); + } + return true; + } } \ No newline at end of file diff --git a/app/common/model/MessageNotifications.php b/app/common/model/MessageNotifications.php index 9ee9b77..ef1b418 100644 --- a/app/common/model/MessageNotifications.php +++ b/app/common/model/MessageNotifications.php @@ -32,15 +32,16 @@ class MessageNotifications extends Model * * @var bool */ - public $timestamps = true; + public $timestamps = false; + // const UPDATED_AT = false; - protected $dateFormat = 'U'; + // protected $dateFormat = 'U'; /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'msg_no', 'sender_id', 'sender_type', 'recipient', 'title', 'content', 'scene', 'created_at']; + protected $fillable = ['id', 'msg_no', 'sender_id', 'sender_type', 'recipient', 'title', 'content', 'scene', 'push_method', 'created_at']; /** * 不允许自动填充模型字段 @@ -54,4 +55,39 @@ class MessageNotifications extends Model ]; const SCENE0 = 0; const SCENE1 = 1; + + // 推送方式 + const PUSH_METHOD = [ + self::PUSH_METHOD0 => '系统推送', + self::PUSH_METHOD1 => '手动推送' + ]; + const PUSH_METHOD0 = 0; + const PUSH_METHOD1 = 1; + + + /** + * 关联用户消息状态 (一对多) + */ + public function userStatuses() + { + return $this->hasMany(MessageUserStatus::class, 'msg_id', 'id'); + } + + /** + * 获取已读用户状态 + */ + public function readUsers() + { + return $this->hasMany(MessageUserStatus::class, 'msg_id', 'id') + ->where('status', 1); + } + + /** + * 获取未读用户状态 + */ + public function unreadUsers() + { + return $this->hasMany(MessageUserStatus::class, 'msg_id', 'id') + ->where('status', 0); + } } \ No newline at end of file diff --git a/app/common/model/MessageUserStatus.php b/app/common/model/MessageUserStatus.php index e1e1f74..70ff44e 100644 --- a/app/common/model/MessageUserStatus.php +++ b/app/common/model/MessageUserStatus.php @@ -46,4 +46,21 @@ class MessageUserStatus extends Model * 不允许自动填充模型字段 */ protected $guarded = []; + + + /** + * 关联消息 (多对一) + */ + public function message() + { + return $this->belongsTo(MessageNotifications::class, 'msg_id', 'id'); + } + + /** + * 关联用户 (假设你有 User 模型) + */ + public function user() + { + return $this->belongsTo(User::class, 'uid', 'id'); + } } \ No newline at end of file diff --git a/app/common/service/MessageNotificationsService.php b/app/common/service/MessageNotificationsService.php index 720fec2..4e8162c 100644 --- a/app/common/service/MessageNotificationsService.php +++ b/app/common/service/MessageNotificationsService.php @@ -2,11 +2,13 @@ namespace app\common\service; +use app\common\logic\MessageNotificationsLogic; use app\common\validate\MessageNotificationsValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\MessageNotifications; use app\common\model\User; use support\Db; +use support\Request; class MessageNotificationsService { @@ -31,6 +33,78 @@ class MessageNotificationsService return new $this->validator; } + protected function buildQueryConfig(Request $request, string $scene = 'default'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'index': + $config['order']['id'] = 'desc'; + break; + case 'show': + $config['where']['id'] = $p['id']; + break; + case 'store': + break; + case 'update': + $config['where']['id'] = $p['id']; + break; + case 'destroy': + $config['where']['id'] = $p['id']; + break; + } + + return $config; + } + + + public function serviceDestroy(Request $request) + { + $config = $this->buildQueryConfig($request, 'destroy'); + $deleted = (new MessageNotificationsLogic())->logicDeleteBy($config); + return $this->postProcess('Destroy', $deleted); + } + + /** + * 添加前置处理 + */ + public function servicePush(Request $request, $data) + { + $pushData = [ + 'sender_id' => $request->user->uid, + 'sender_type' => 'admin', + 'title' => $data['title'], + 'content' => $data['content'], + 'scene' => 1, + 'recipient' => $data['recipient'], + 'push_method' => 1 + ]; + $msgId = (new MessageNotificationsService())->pushNotice($pushData); + return ['msg_id' => $msgId]; + } + + public function afterServiceList($data) + { + $data->each(function (&$item) { + $temp = explode(',', $item->recipient); + $item->recipient_list = User::whereIn('id', $temp)->pluck('name')->toArray(); + $item->scene_name = MessageNotifications::SCENE[$item->scene]; + $item->push_method_name = MessageNotifications::PUSH_METHOD[$item->push_method]; + }); + unset($item); + return $data; + } + + public function afterServiceShow($data) + { + $temp = explode(',', $data->recipient); + $data->recipient_list = User::whereIn('id', $temp)->pluck('name')->toArray(); + $data->scene_name = MessageNotifications::SCENE[$data->scene]; + $data->push_method_name = MessageNotifications::PUSH_METHOD[$data->push_method]; + return $data; + } /** * 创建一条消息 @@ -45,6 +119,7 @@ class MessageNotificationsService 'content' => $data['content'], 'scene' => $data['scene'], 'recipient' => $data['recipient'], + 'push_method' => $data['push_method'], 'created_at' => time(), ]); @@ -116,6 +191,7 @@ class MessageNotificationsService 'content' => $data['content'], 'scene' => $data['scene'], 'recipient' => $data['recipient'] ? implode(',', $data['recipient']) : '', + 'push_method' => $data['push_method'], ]); // 写用户状态 diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php index cded7a0..50f82bb 100644 --- a/app/common/utils/WsEvents.php +++ b/app/common/utils/WsEvents.php @@ -146,9 +146,9 @@ class WsEvents if (!$title || !$content) { Gateway::sendToClient($this->clientId, WsResponse::error( - 'notify.push', + 'notify.push.result', 400, - 'title and content are required', + '标题和内容不能为空', $traceId )); return; @@ -163,13 +163,14 @@ class WsEvents 'content' => $content, 'scene' => $this->eventData['scene'] ?? 0, 'recipient' => $this->eventData['to_uids'] ? implode(',', $this->eventData['to_uids']) : '', + 'push_method' => isset($this->eventData['push_method']) ? $this->eventData['push_method'] : 0 ]); // 写用户状态 $uids = !empty($toUids) ? $toUids : $msgService->getAllUserIds(); $msgService->addUserStatus($msgId, $uids); - $payload = WsResponse::success('notify.push', [ + $payload = WsResponse::success('notify.receive', [ 'msg_id' => $msgId, 'title' => $title, 'content' => $content, @@ -203,9 +204,9 @@ class WsEvents $msgIds = $this->eventData['msg_ids']; if (!is_array($msgIds) && $msgIds !== 'all') { Gateway::sendToClient($this->clientId, WsResponse::error( - 'notify.read', + 'notify.read.result', 400, - 'msg_ids required', + '消息ID不能为空', $traceId )); return; @@ -227,7 +228,7 @@ class WsEvents */ public function pushNotice(int $msgId, string $title, string $content, array $recipient) { - $payload = WsResponse::success('notify.push', [ + $payload = WsResponse::success('notify.receive', [ 'msg_id' => $msgId, 'title' => $title, 'content' => $content, diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index b12be98..c8427cd 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -122,6 +122,15 @@ class IndexController // // 异步推送 // \Webman\RedisQueue\Redis::send('notice', $data); - return json($data); + // return json($data); + + $phone = ''; + $email = ''; + + $userByPhone = User::where('corp_id', 2)->where('phone', $phone)->where('phone', '!=', '')->first(); + $userByEmail = User::where('corp_id', 2)->where('email', $email)->where('email', '!=', '')->first(); + $user = $userByPhone ?: $userByEmail; + + return json($user); } } \ No newline at end of file diff --git a/config/route.php b/config/route.php index 9c33c32..99837b0 100644 --- a/config/route.php +++ b/config/route.php @@ -68,6 +68,15 @@ Route::group('/common', function () { // 后台管理 Route::group('/admin', function () { + // 消息通知 + Route::group('/notice', function () { + Route::any('/list', [app\common\controller\MessageNotificationsController::class, 'index']); + Route::any('/show', [app\common\controller\MessageNotificationsController::class, 'show']); + Route::any('/push', [app\common\controller\MessageNotificationsController::class, 'push']); + // Route::any('/update', [app\common\controller\MessageNotificationsController::class, 'update']); + Route::any('/destroy', [app\common\controller\MessageNotificationsController::class, 'destroy']); + }); + // 角色 Route::group('/role', function () { Route::any('/list', [app\admin\controller\RoleController::class, 'index']); From 5dc515f712b9bc1ceedca3502e6cba1d34f733e1 Mon Sep 17 00:00:00 2001 From: mzl Date: Thu, 21 Aug 2025 19:26:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageUserStatusController.php | 85 ++++++++++++++++-- app/common/model/MessageNotifications.php | 5 ++ app/common/model/MessageUserStatus.php | 4 +- .../service/MessageUserStatusService.php | 89 +++++++++++++++++++ config/route.php | 12 ++- 5 files changed, 184 insertions(+), 11 deletions(-) diff --git a/app/common/controller/MessageUserStatusController.php b/app/common/controller/MessageUserStatusController.php index 302aec4..a9ccb11 100644 --- a/app/common/controller/MessageUserStatusController.php +++ b/app/common/controller/MessageUserStatusController.php @@ -4,6 +4,7 @@ namespace app\common\controller; use app\common\controller\BaseController; use app\common\traits\crud\CrudControllerTrait; use app\common\service\MessageUserStatusService; +use support\Request; class MessageUserStatusController extends BaseController { @@ -22,12 +23,80 @@ class MessageUserStatusController extends BaseController * @param array $data * @return array */ - // protected function indexFormat($data) - // { - // if (isset($data['created_at'])) - // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - // if (isset($data['updated_at'])) - // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - // return $data; - // } + protected function indexFormat($data) + { + if (isset($data['read_at']) && $data['read_at'] !== null) { + $data['read_at'] = date('Y-m-d H:i:s', $data['read_at']); + } else { + $data['read_at'] = ' - '; + } + + if (isset($data['message'])) + $data['message']['created_at'] = date('Y-m-d H:i:s', $data['message']['created_at']); + return $data; + } + + protected function showFormat($data) + { + if (isset($data['read_at']) && $data['read_at'] !== null) { + $data['read_at'] = date('Y-m-d H:i:s', $data['read_at']); + } else { + $data['read_at'] = ' - '; + } + + if (isset($data['message'])) + $data['message']['created_at'] = date('Y-m-d H:i:s', $data['message']['created_at']); + return $data; + } + + protected function unReadFormat($data) + { + // if (isset($data['read_at']) && $data['read_at'] !== null) { + // $data['read_at'] = date('Y-m-d H:i:s', $data['read_at']); + // } else { + // $data['read_at'] = ' - '; + // } + + // if (isset($data['message'])) { + // $data['message']['created_at'] = date('Y-m-d H:i:s', $data['message']['created_at']); + // } + + foreach ($data as &$item) { + if (isset($item['read_at']) && $item['read_at'] !== null) { + $item['read_at'] = date('Y-m-d H:i:s', $item['read_at']); + } else { + $item['read_at'] = ' - '; + } + + if (isset($item['message'])) { + $item['message']['created_at'] = date('Y-m-d H:i:s', $item['message']['created_at']); + } + } + var_dump($data); + return $data; + } + + public function read(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'read'); + $this->service->serviceRead($request, $data); + return $this->success([], '操作成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + public function listUnRead(Request $request) + { + try { + $raw = $this->service->serviceListUnRead($request); + $data = $this->transformData($raw, method_exists($this, 'unReadFormat') + ? [$this, 'unReadFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/model/MessageNotifications.php b/app/common/model/MessageNotifications.php index ef1b418..196a329 100644 --- a/app/common/model/MessageNotifications.php +++ b/app/common/model/MessageNotifications.php @@ -90,4 +90,9 @@ class MessageNotifications extends Model return $this->hasMany(MessageUserStatus::class, 'msg_id', 'id') ->where('status', 0); } + + public function sender() + { + return $this->belongsTo(User::class, 'sender_id', 'id'); + } } \ No newline at end of file diff --git a/app/common/model/MessageUserStatus.php b/app/common/model/MessageUserStatus.php index 70ff44e..0e73ef5 100644 --- a/app/common/model/MessageUserStatus.php +++ b/app/common/model/MessageUserStatus.php @@ -32,10 +32,10 @@ class MessageUserStatus extends Model * * @var bool */ - public $timestamps = true; + public $timestamps = false; - protected $dateFormat = 'U'; + // protected $dateFormat = 'U'; /** * 允许自动填充模型字段 diff --git a/app/common/service/MessageUserStatusService.php b/app/common/service/MessageUserStatusService.php index f04e8b5..27ba060 100644 --- a/app/common/service/MessageUserStatusService.php +++ b/app/common/service/MessageUserStatusService.php @@ -5,6 +5,8 @@ namespace app\common\service; use app\common\validate\MessageUserStatusValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\MessageUserStatus; +use support\Request; +use app\common\model\User; class MessageUserStatusService { @@ -28,4 +30,91 @@ class MessageUserStatusService { return new $this->validator; } + + + protected function buildQueryConfig(Request $request, string $scene = 'default'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'unread': + $config['order']['id'] = 'desc'; + // $config['with']['user'] = ['sn', 'name']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['where']['uid'] = $request->user->uid; + $config['where']['status'] = 0; + break; + case 'index': + $config['order']['id'] = 'desc'; + // $config['with']['user'] = ['sn', 'name']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['where']['uid'] = $request->user->uid; + break; + case 'show': + $config['where']['id'] = $p['id']; + // $config['with']['user'] = ['sn', 'name']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['where']['uid'] = $request->user->uid; + break; + case 'store': + break; + case 'update': + case 'read': + $config['where']['id'] = $p['id']; + $config['where']['msg_id'] = $p['msg_id']; + $config['where']['uid'] = $request->user->uid; + break; + case 'destroy': + $config['where']['id'] = $p['id']; + $config['where']['uid'] = $request->user->uid; + break; + } + + return $config; + } + + public function serviceListUnRead(Request $request) + { + $config = $this->buildQueryConfig($request, 'unread'); + $result = $this->logicListAll($config); + return $this->postProcess('ListUnRead', $result); + } + + public function serviceRead(Request $request, array $data = []) + { + return $this->noticeRead($request->post('msg_ids'), $request->user->uid); + } + + public function noticeRead(array|string $msgIds, int $uid): bool + { + $model = MessageUserStatus::where('uid', $uid)->where('status', 0); + if (is_array($msgIds)) { + $model->whereIn('msg_id', $msgIds); + } + $udata['read_at'] = time(); + $udata['status'] = 1; + return $model->update($udata); + } + + + protected function afterServiceList($res) + { + $res->each(function (&$item) { + if (isset($item->message)) { + $item->message->sender_name = User::where('id', $item->message->sender_id)->value('name') ?: '系统'; + } + }); + unset($item); + return $res; + } + + protected function afterServiceShow($res) + { + if (isset($res->message)) { + $res->message->sender_name = User::where('id', $res->message->sender_id)->value('name') ?: '系统'; + } + return $res; + } } \ No newline at end of file diff --git a/config/route.php b/config/route.php index 99837b0..b578322 100644 --- a/config/route.php +++ b/config/route.php @@ -64,6 +64,17 @@ Route::group('/common', function () { Route::any('/cache/clear', [app\common\controller\PresetController::class, 'cacheClear']); Route::any('/menus', [app\common\controller\PresetController::class, 'menus']); }); + + + // 消息通知 + Route::group('/notice', function () { + Route::any('/list', [app\common\controller\MessageUserStatusController::class, 'index']); + Route::any('/show', [app\common\controller\MessageUserStatusController::class, 'show']); + Route::any('/read', [app\common\controller\MessageUserStatusController::class, 'read']); + Route::any('/destroy', [app\common\controller\MessageUserStatusController::class, 'destroy']); + + Route::any('/unread', [app\common\controller\MessageUserStatusController::class, 'listUnRead']); + }); }); // 后台管理 @@ -73,7 +84,6 @@ Route::group('/admin', function () { Route::any('/list', [app\common\controller\MessageNotificationsController::class, 'index']); Route::any('/show', [app\common\controller\MessageNotificationsController::class, 'show']); Route::any('/push', [app\common\controller\MessageNotificationsController::class, 'push']); - // Route::any('/update', [app\common\controller\MessageNotificationsController::class, 'update']); Route::any('/destroy', [app\common\controller\MessageNotificationsController::class, 'destroy']); }); From 8b91924d1a5bc7d8f4b8b7d202eb5e914b996aac Mon Sep 17 00:00:00 2001 From: mzl Date: Fri, 22 Aug 2025 16:27:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageUserStatusController.php | 15 +- .../service/MessageNotificationsService.php | 142 +++++++++++++----- .../service/MessageUserStatusService.php | 28 +++- app/common/utils/WsEvents.php | 39 ++--- app/controller/IndexController.php | 22 ++- 5 files changed, 158 insertions(+), 88 deletions(-) diff --git a/app/common/controller/MessageUserStatusController.php b/app/common/controller/MessageUserStatusController.php index a9ccb11..9a896a1 100644 --- a/app/common/controller/MessageUserStatusController.php +++ b/app/common/controller/MessageUserStatusController.php @@ -51,16 +51,6 @@ class MessageUserStatusController extends BaseController protected function unReadFormat($data) { - // if (isset($data['read_at']) && $data['read_at'] !== null) { - // $data['read_at'] = date('Y-m-d H:i:s', $data['read_at']); - // } else { - // $data['read_at'] = ' - '; - // } - - // if (isset($data['message'])) { - // $data['message']['created_at'] = date('Y-m-d H:i:s', $data['message']['created_at']); - // } - foreach ($data as &$item) { if (isset($item['read_at']) && $item['read_at'] !== null) { $item['read_at'] = date('Y-m-d H:i:s', $item['read_at']); @@ -72,7 +62,6 @@ class MessageUserStatusController extends BaseController $item['message']['created_at'] = date('Y-m-d H:i:s', $item['message']['created_at']); } } - var_dump($data); return $data; } @@ -94,6 +83,10 @@ class MessageUserStatusController extends BaseController $data = $this->transformData($raw, method_exists($this, 'unReadFormat') ? [$this, 'unReadFormat'] : null); + $data = [ + 'list' => $data, + 'counts' => count($data) + ]; return $this->success($data); } catch (\Throwable $e) { return $this->error($e->getMessage()); diff --git a/app/common/service/MessageNotificationsService.php b/app/common/service/MessageNotificationsService.php index 4e8162c..806bc1d 100644 --- a/app/common/service/MessageNotificationsService.php +++ b/app/common/service/MessageNotificationsService.php @@ -6,6 +6,7 @@ use app\common\logic\MessageNotificationsLogic; use app\common\validate\MessageNotificationsValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\MessageNotifications; +use app\common\model\MessageUserStatus; use app\common\model\User; use support\Db; use support\Request; @@ -106,6 +107,111 @@ class MessageNotificationsService return $data; } + + + // ====== ====== ====== 通知操作的处理 ====== ====== ====== + /** + * 推送消息 + */ + public function pushNotice(array $data = [], string $scene = "Default"): int + { + // 拼装数据（可能需要处理 消息标题、内容等等数据，可自行处理） + $pushData = $this->assemblyProcess($scene, $data); + // 写入消息 + $msgId = $this->insertMessage($pushData); + // 推送 + $this->pushWs($msgId, $pushData); + return $msgId; + } + + /** + * 执行推送 + */ + public function pushWs(int $msgId, array $pushData) + { + foreach ($pushData['recipient'] as $userId) { + // 查询消息数据 + $config['model'] = MessageUserStatus::class; + $config['order']['id'] = 'desc'; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'scene', 'created_at']; + $config['where']['uid'] = $userId; + $config['where']['msg_id'] = $msgId; + $config['where']['status'] = 0; + $wsData = (new MessageUserStatusService())->logicShow($config)->toArray(); + + // 组装数据 + if (isset($wsData['message']) && $wsData['message']) { + $wsData['message']['sender_name'] = User::where('id', $wsData['message']['sender_id'])->value('name') ?: '系统'; + $wsData['message']['scene_name'] = MessageNotifications::SCENE[$wsData['message']['scene']]; + $wsData['message']['created_at'] = date('Y-m-d H:i:s', $wsData['message']['created_at']); + } + + // 获取未读消息数 + $counts = MessageUserStatus::where('uid', $userId)->where('status', 0)->count('id'); + $data = [ + 'notice_data' => $wsData, + 'unread_counts' => $counts + ]; + + // 执行推送 + (new \app\common\utils\WsEvents())->pushWsNotice($data, $userId); + } + return true; + } + + /** + * 插入消息 + * @param array $data + * @return int + */ + public function insertMessage(array $data): int + { + // 写消息 + $msgId = $this->createMessage([ + 'sender_id' => $data['sender_id'], + 'sender_type' => $data['sender_type'], + 'title' => $data['title'], + 'content' => $data['content'], + 'scene' => $data['scene'], + 'recipient' => implode(',', $data['recipient']), + 'push_method' => $data['push_method'], + ]); + // 写用户状态 + $this->addUserStatus($msgId, $data['recipient']); + return $msgId; + } + + /** + * 数据拼装方法调用 + */ + protected function assemblyProcess(string $op, mixed $data): mixed + { + $hook = "assembly{$op}"; + return method_exists($this, $hook) + ? $this->{$hook}($data) + : $data; + } + + /** + * 默认数据拼装 + */ + public function assemblyDefault(array $data) + { + return [ + 'sender_id' => isset($data['sender_id']) && $data['sender_id'] ? $data['sender_id'] : 0, + 'sender_type' => isset($data['sender_type']) && $data['sender_type'] ? $data['sender_type'] : 'system', + 'title' => isset($data['title']) && $data['title'] ? $data['title'] : '系统通知', + 'content' => isset($data['content']) && $data['content'] ? $data['content'] : '系统通知-默认', + 'scene' => isset($data['scene']) && $data['scene'] ? $data['scene'] : 1, + 'recipient' => isset($data['recipient']) && count($data['recipient']) > 0 ? $data['recipient'] : $this->getAllUserIds(), + 'push_method' => isset($data['push_method']) && $data['push_method'] ? $data['push_method'] : 0, + ]; + } + + // *** *** 可以扩展数据组拼装方法 *** *** + + // ====== ====== ====== 通知操作的基础方法 ====== ====== ====== + /** * 创建一条消息 */ @@ -167,40 +273,4 @@ class MessageNotificationsService { return User::where('status', 1)->pluck('id')->toArray(); } - - /** - * 批量推送消息 - */ - public function pushNotice(array $data): int - { - // 数据结构： - // $data = [ - // 'sender_id' => 0, - // 'sender_type' => 'system', - // 'title' => '测试消息 - 标题', - // 'content' => '测试消息 - 内容', - // 'scene' => 1, - // 'recipient' => [], - // ]; - - // 写消息 - $msgId = $this->createMessage([ - 'sender_id' => $data['sender_id'], - 'sender_type' => $data['sender_type'], - 'title' => $data['title'], - 'content' => $data['content'], - 'scene' => $data['scene'], - 'recipient' => $data['recipient'] ? implode(',', $data['recipient']) : '', - 'push_method' => $data['push_method'], - ]); - - // 写用户状态 - $uids = count($data['recipient']) > 0 ? $data['recipient'] : $this->getAllUserIds(); - $this->addUserStatus($msgId, $uids); - - // 执行推送 - (new \app\common\utils\WsEvents())->pushNotice($msgId, $data['title'], $data['content'], $data['recipient']); - - return $msgId; - } } \ No newline at end of file diff --git a/app/common/service/MessageUserStatusService.php b/app/common/service/MessageUserStatusService.php index 27ba060..2162f86 100644 --- a/app/common/service/MessageUserStatusService.php +++ b/app/common/service/MessageUserStatusService.php @@ -2,6 +2,7 @@ namespace app\common\service; +use app\common\model\MessageNotifications; use app\common\validate\MessageUserStatusValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\MessageUserStatus; @@ -41,21 +42,18 @@ class MessageUserStatusService switch ($scene) { case 'unread': $config['order']['id'] = 'desc'; - // $config['with']['user'] = ['sn', 'name']; - $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'scene', 'created_at']; $config['where']['uid'] = $request->user->uid; $config['where']['status'] = 0; break; case 'index': $config['order']['id'] = 'desc'; - // $config['with']['user'] = ['sn', 'name']; - $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'scene', 'created_at']; $config['where']['uid'] = $request->user->uid; break; case 'show': $config['where']['id'] = $p['id']; - // $config['with']['user'] = ['sn', 'name']; - $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'created_at']; + $config['with']['message'] = ['sender_id', 'sender_type', 'msg_no', 'title', 'content', 'scene', 'created_at']; $config['where']['uid'] = $request->user->uid; break; case 'store': @@ -104,6 +102,7 @@ class MessageUserStatusService $res->each(function (&$item) { if (isset($item->message)) { $item->message->sender_name = User::where('id', $item->message->sender_id)->value('name') ?: '系统'; + $item->message->scene_name = MessageNotifications::SCENE[$item->message->scene]; } }); unset($item); @@ -114,7 +113,24 @@ class MessageUserStatusService { if (isset($res->message)) { $res->message->sender_name = User::where('id', $res->message->sender_id)->value('name') ?: '系统'; + $res->message->scene_name = MessageNotifications::SCENE[$res->message->scene]; + } + // 标记已读 + if ($res->status == 0) { + $this->noticeRead([$res->msg_id], $res->uid); } return $res; } + + protected function afterServiceListUnRead($res) + { + $res->each(function (&$item) { + if (isset($item->message)) { + $item->message->sender_name = User::where('id', $item->message->sender_id)->value('name') ?: '系统'; + $item->message->scene_name = MessageNotifications::SCENE[$item->message->scene]; + } + }); + unset($item); + return $res; + } } \ No newline at end of file diff --git a/app/common/utils/WsEvents.php b/app/common/utils/WsEvents.php index 50f82bb..2a65f3e 100644 --- a/app/common/utils/WsEvents.php +++ b/app/common/utils/WsEvents.php @@ -74,16 +74,16 @@ class WsEvents } // 连接是否满足条件 - if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { - flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); - Gateway::sendToClient($client_id, WsResponse::error( - 'system.auth', - 1001, - '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' - )); - Gateway::closeClient($client_id); - return; - } + // if ($payload['server']['HTTP_ORIGIN'] != 'https://wstool.js.org') { + // flg('[x] [TOKEN认证] HTTP_ORIGIN不满足条件', false); + // Gateway::sendToClient($client_id, WsResponse::error( + // 'system.auth', + // 1001, + // '[x] [TOKEN认证] HTTP_ORIGIN不满足条件' + // )); + // Gateway::closeClient($client_id); + // return; + // } // 签名检查 if (!isset($payload['get']['token'])) { @@ -226,24 +226,9 @@ class WsEvents /** * 推送消息通知 */ - public function pushNotice(int $msgId, string $title, string $content, array $recipient) + public function pushWsNotice(array $wsData, int $userId) { - $payload = WsResponse::success('notify.receive', [ - 'msg_id' => $msgId, - 'title' => $title, - 'content' => $content, - 'created_at' => time() - ]); - - if (count($recipient) > 0) { - // 推送给指定用户 - foreach ($recipient as $uid) { - Gateway::sendToUid($uid, $payload); - } - } else { - // 推送给全体在线用户 - Gateway::sendToAll($payload); - } + Gateway::sendToUid($userId, WsResponse::success('notify.receive', $wsData)); } // ================= 辅助方法 ================= diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index c8427cd..8e15d2a 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -116,21 +116,27 @@ class IndexController // 'recipient' => [1], // ]; + $data['recipient'] = [1, 74]; // // 同步推送 // (new MessageNotificationsService())->pushNotice($data); - // // 异步推送 - // \Webman\RedisQueue\Redis::send('notice', $data); + + + // 异步推送 + \Webman\RedisQueue\Redis::send('notice', $data); + + + return 'success'; // return json($data); - $phone = ''; - $email = ''; + // $phone = ''; + // $email = ''; - $userByPhone = User::where('corp_id', 2)->where('phone', $phone)->where('phone', '!=', '')->first(); - $userByEmail = User::where('corp_id', 2)->where('email', $email)->where('email', '!=', '')->first(); - $user = $userByPhone ?: $userByEmail; + // $userByPhone = User::where('corp_id', 2)->where('phone', $phone)->where('phone', '!=', '')->first(); + // $userByEmail = User::where('corp_id', 2)->where('email', $email)->where('email', '!=', '')->first(); + // $user = $userByPhone ?: $userByEmail; - return json($user); + // return json($user); } } \ No newline at end of file