no message

app/Http/Controllers/Api/DialogController.php

@@ -130,7 +130,11 @@ class DialogController extends AbstractController
         $list = WebSocketDialog::searchDialog($user->userid, $key, $take);
         // 搜索联系人
         if (count($list) < $take && Base::judgeClientVersion("0.21.60")) {
-            $users = User::searchUser($key, $take - count($list));
+            $users = User::select(User::$basicField)
+                ->searchByKeyword($key)
+                ->orderBy('userid')
+                ->take($take - count($list))
+                ->get();
             $users->transform(function (User $item) use ($user) {
                 $id = 'u:' . $item->userid;
                 $lastAt = null;

app/Http/Controllers/Api/SearchController.php

@@ -26,7 +26,7 @@ use App\Module\Manticore\ManticoreMsg;
 class SearchController extends AbstractController
 {
     /**
-     * @api {get} api/search/contact          搜索联系人
+     * @api {get} api/search/contact 搜索联系人
      *
      * @apiDescription 需要token身份，优先使用 Manticore Search，未安装则使用 MySQL 搜索
      * @apiVersion 1.0.0
@@ -119,7 +119,7 @@ class SearchController extends AbstractController
     }
 
     /**
-     * @api {get} api/search/project          搜索项目
+     * @api {get} api/search/project 搜索项目
      *
      * @apiDescription 需要token身份，优先使用 Manticore Search，未安装则使用 MySQL 搜索
      * @apiVersion 1.0.0
@@ -201,7 +201,7 @@ class SearchController extends AbstractController
     }
 
     /**
-     * @api {get} api/search/task             搜索任务
+     * @api {get} api/search/task 搜索任务
      *
      * @apiDescription 需要token身份，优先使用 Manticore Search，未安装则使用 MySQL 搜索
      * @apiVersion 1.0.0
@@ -292,7 +292,7 @@ class SearchController extends AbstractController
     }
 
     /**
-     * @api {get} api/search/file              搜索文件
+     * @api {get} api/search/file 搜索文件
      *
      * @apiDescription 需要token身份，优先使用 Manticore Search，未安装则使用 MySQL 搜索
      * @apiVersion 1.0.0
@@ -399,7 +399,7 @@ class SearchController extends AbstractController
     }
 
     /**
-     * @api {get} api/search/message          搜索消息
+     * @api {get} api/search/message 搜索消息
      *
      * @apiDescription 需要token身份，优先使用 Manticore Search，未安装则使用 MySQL 搜索
      * @apiVersion 1.0.0

app/Http/Controllers/Api/UsersController.php

@@ -2829,7 +2829,11 @@ class UsersController extends AbstractController
                 $dialogIds[] = $dialog['id'];
             }
             if ($key && count($dialogList) < $dialogTake) {
-                $dialogUsers = User::searchUser($key, $dialogTake - count($dialogList));
+                $dialogUsers = User::select(User::$basicField)
+                    ->searchByKeyword($key)
+                    ->orderBy('userid')
+                    ->take($dialogTake - count($dialogList))
+                    ->get();
                 foreach ($dialogUsers as $item) {
                     $dialog = WebSocketDialog::getUserDialog($user->userid, $item->userid, now()->addDay());
                     if ($dialog && !in_array($dialog->id, $dialogIds)) {

app/Models/File.php

@@ -42,6 +42,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|File query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|File searchByKeyword(string $keyword)
+ * @method static \Illuminate\Database\Eloquent\Builder|File sharedToUser(int $userid)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedId($value)

app/Models/Project.php

@@ -48,6 +48,7 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|Project query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|Project searchByKeyword(string $keyword)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchiveDays($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchiveMethod($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Project whereArchivedAt($value)

app/Models/ProjectTask.php

@@ -74,6 +74,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask searchByKeyword(string $keyword)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedFollow($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTask whereArchivedUserid($value)

app/Models/Report.php

@@ -27,6 +27,9 @@ use JetBrains\PhpStorm\Pure;
  * @property string $sign 汇报唯一标识
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ReportReceive> $Receives
  * @property-read int|null $receives_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ReportAnalysis> $aiAnalyses
+ * @property-read int|null $ai_analyses_count
+ * @property-read \App\Models\ReportAnalysis|null $aiAnalysis
  * @property-read mixed $receives
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $receivesUser
  * @property-read int|null $receives_user_count

app/Models/ReportAnalysis.php

@@ -4,6 +4,37 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
+/**
+ * App\Models\ReportAnalysis
+ *
+ * @property int $id
+ * @property int $rid 报告ID
+ * @property int $userid 生成分析的会员ID
+ * @property string $model 使用的模型名称
+ * @property string $analysis_text AI 分析的原始文本（Markdown）
+ * @property array|null $meta 额外的上下文信息
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Report|null $report
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereAnalysisText($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereMeta($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereModel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereRid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportAnalysis whereUserid($value)
+ * @mixin \Eloquent
+ */
 class ReportAnalysis extends AbstractModel
 {
     protected $table = 'report_ai_analyses';

app/Models/User.php

@@ -25,7 +25,7 @@ use Carbon\Carbon;
  * @property string|null $tel 联系电话
  * @property string $nickname 昵称
  * @property string|null $profession 职位/职称
- * @property \Illuminate\Support\Carbon|null $birthday 生日
+ * @property string|null $birthday 生日
  * @property string|null $address 地址
  * @property string|null $introduction 个人简介
  * @property string $userimg 头像
@@ -55,7 +55,10 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|User searchByKeyword(string $keyword)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereAddress($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereAz($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereBirthday($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereBot($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereChangepass($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
@@ -66,6 +69,7 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerity($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEncrypt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereIdentity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereIntroduction($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLang($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLastAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLastIp($value)
@@ -809,20 +813,4 @@ class User extends AbstractModel
                 ->orWhere("profession", "like", "%{$keyword}%");
         });
     }
-
-    /**
-     * 搜索用户
-     * @param $key
-     * @param $take
-     * @return User[]|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Query\Builder[]|\Illuminate\Support\Collection
-     * @deprecated 建议使用 scopeSearchByKeyword
-     */
-    public static function searchUser($key, $take = 20)
-    {
-        return User::select(User::$basicField)
-            ->searchByKeyword($key)
-            ->orderBy('userid')
-            ->take($take)
-            ->get();
-    }
 }

app/Models/UserAppSort.php

@@ -10,9 +10,15 @@ namespace App\Models;
  * @property array|null $sorts 排序配置
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserAppSort whereSorts($value)

app/Models/UserBot.php

@@ -21,7 +21,7 @@ use Throwable;
  * @property \Illuminate\Support\Carbon|null $clear_at 下一次清理时间
  * @property string|null $webhook_url 消息webhook地址
  * @property int|null $webhook_num 消息webhook请求次数
- * @property array|null $webhook_events Webhook事件配置
+ * @property array $webhook_events Webhook事件配置
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
@@ -40,6 +40,7 @@ use Throwable;
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookEvents($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookNum($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserBot whereWebhookUrl($value)
  * @mixin \Eloquent

app/Models/UserTag.php

@@ -5,6 +5,37 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+/**
+ * App\Models\UserTag
+ *
+ * @property int $id
+ * @property int $user_id 被标签用户ID
+ * @property string $name 标签名称
+ * @property int $created_by 创建人
+ * @property int|null $updated_by 最后更新人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\User $creator
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\UserTagRecognition> $recognitions
+ * @property-read int|null $recognitions_count
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereCreatedBy($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereUpdatedBy($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTag whereUserId($value)
+ * @mixin \Eloquent
+ */
 class UserTag extends AbstractModel
 {
     protected $table = 'user_tags';

app/Models/UserTagRecognition.php

@@ -4,6 +4,32 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
+/**
+ * App\Models\UserTagRecognition
+ *
+ * @property int $id
+ * @property int $tag_id 标签ID
+ * @property int $user_id 认可人ID
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\UserTag $tag
+ * @property-read \App\Models\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition whereTagId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTagRecognition whereUserId($value)
+ * @mixin \Eloquent
+ */
 class UserTagRecognition extends AbstractModel
 {
     protected $table = 'user_tag_recognitions';

app/Models/WebSocketDialogMsg.php

@@ -44,6 +44,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read int|mixed $percentage
  * @property-read \App\Models\User|null $user
  * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg accessibleByUser(int $userid)
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
@@ -54,6 +55,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg searchByKeyword(string $keyword)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereBot($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDeletedAt($value)

public/docs/index.html

@@ -5,15 +5,15 @@
   <meta name="description" content="APP接口文档">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link href="assets/bootstrap.min.css?v=1762874667062" rel="stylesheet" media="screen">
+  <link href="assets/bootstrap.min.css?v=1768392926271" rel="stylesheet" media="screen">
-  <link href="assets/prism.css?v=1762874667062" rel="stylesheet" />
+  <link href="assets/prism.css?v=1768392926271" rel="stylesheet" />
-  <link href="assets/prism-toolbar.css?v=1762874667062" rel="stylesheet" />
+  <link href="assets/prism-toolbar.css?v=1768392926271" rel="stylesheet" />
-  <link href="assets/prism-diff-highlight.css?v=1762874667062" rel="stylesheet" />
+  <link href="assets/prism-diff-highlight.css?v=1768392926271" rel="stylesheet" />
-  <link href="assets/main.css?v=1762874667062" rel="stylesheet" media="screen, print">
+  <link href="assets/main.css?v=1768392926271" rel="stylesheet" media="screen, print">
-  <link href="assets/favicon.ico?v=1762874667062" rel="icon" type="image/x-icon">
+  <link href="assets/favicon.ico?v=1768392926271" rel="icon" type="image/x-icon">
-  <link href="assets/apple-touch-icon.png?v=1762874667062" rel="apple-touch-icon" sizes="180x180">
+  <link href="assets/apple-touch-icon.png?v=1768392926271" rel="apple-touch-icon" sizes="180x180">
-  <link href="assets/favicon-32x32.png?v=1762874667062" rel="icon" type="image/png" sizes="32x32">
+  <link href="assets/favicon-32x32.png?v=1768392926271" rel="icon" type="image/png" sizes="32x32">
-  <link href="assets/favicon-16x16.png?v=1762874667062" rel="icon" type="image/png" sizes="16x16">
+  <link href="assets/favicon-16x16.png?v=1768392926271" rel="icon" type="image/png" sizes="16x16">
 </head>
 
 <body class="container-fluid">
@@ -1042,6 +1042,6 @@
   </div>
 </div>
 
-<script src="assets/main.bundle.js?v=1762874667062"></script>
+<script src="assets/main.bundle.js?v=1768392926271"></script>
 </body>
 </html>