Merge commit 'ed96e0f8589042fb8e9d6cfee713c5150612bb34'

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;
@@ -77,25 +78,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();
@@ -107,20 +108,35 @@ class IndexController
     {
 
         // $data = [
-        //     'code' => 'GD20250703-1DC80',
-        //     'category' => '账号类问题',
-        //     'content' => '这是一条测试工单内容。'
+        //     'sender_id'     => 0,
+        //     'sender_type'   => 'system',
+        //     'title'         => '测试消息 - 标题',
+        //     'content'       => '测试消息 - 内容',
+        //     'scene'         => 1,
+        //     'recipient'     => [1],
         // ];
-        // \app\common\utils\email\MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的工单提醒', replaceTpl($data, 'work_order'));
 
-        // $options = [
-        //     'corp_id'   => 3,
-        //     'user_id'   => 666
-        // ];
-        // \Webman\RedisQueue\Redis::send('perm-agt', $options);
+        $data['recipient'] = [1, 74];
+        // // 同步推送
+        // (new MessageNotificationsService())->pushNotice($data);
 
-        $res = Cache::delete("user_resources_74_fdesk");
         
-        return 22;
+
+        // 异步推送
+        \Webman\RedisQueue\Redis::send('notice', $data);
+
+
+        return 'success';
+
+        // 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);
     }
 }