From eef9fa56c67b21df4a900fa9e989eda225a4f080 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 6 Mar 2025 19:24:29 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96ES=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncDialogUserMsgToElasticsearch.php      |  6 ++---
 app/Http/Controllers/Api/DialogController.php |  4 +--
 app/Module/ElasticSearch.php                  | 25 ++++++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/Console/Commands/SyncDialogUserMsgToElasticsearch.php b/app/Console/Commands/SyncDialogUserMsgToElasticsearch.php
index 1872b3d1a..ec2be19a1 100644
--- a/app/Console/Commands/SyncDialogUserMsgToElasticsearch.php
+++ b/app/Console/Commands/SyncDialogUserMsgToElasticsearch.php
@@ -30,7 +30,7 @@ class SyncDialogUserMsgToElasticsearch extends Command
     public function __construct()
     {
         parent::__construct();
-        $this->es = new ElasticSearch(ElasticSearch::DUM);
+        $this->es = new ElasticSearch(ElasticSearch::DUMIndex());
     }
 
     /**
@@ -145,7 +145,7 @@ class SyncDialogUserMsgToElasticsearch extends Command
             foreach ($dialogUsers as $dialogUser) {
                 $params['body'][] = [
                     'index' => [
-                        '_index' => ElasticSearch::DUM,
+                        '_index' => ElasticSearch::DUMIndex(),
                         '_id' => ElasticSearch::generateDialogUserDicId($dialogUser),
                     ]
                 ];
@@ -217,7 +217,7 @@ class SyncDialogUserMsgToElasticsearch extends Command
                 foreach ($userDialogMap[$dialogMsg->dialog_id] as $userid) {
                     $params['body'][] = [
                         'index' => [
-                            '_index' => ElasticSearch::DUM,
+                            '_index' => ElasticSearch::DUMIndex(),
                             '_id' => ElasticSearch::generateDialogMsgDicId($dialogMsg, $userid),
                             'routing' => ElasticSearch::generateDialogMsgParentId($dialogMsg, $userid) // 路由到父文档
                         ]
diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 1892fee35..7ff41291a 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -172,7 +172,7 @@ class DialogController extends AbstractController
         }
         // 搜索消息会话
         if (count($list) < 20) {
-            $es = new ElasticSearch(ElasticSearch::DUM);
+            $es = new ElasticSearch(ElasticSearch::DUMIndex());
             $searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, 20 - count($list));
             if ($searchResults) {
                 foreach ($searchResults as $item) {
@@ -734,7 +734,7 @@ class DialogController extends AbstractController
         $key = trim(Request::input('key'));
         $list = [];
         //
-        $es = new ElasticSearch(ElasticSearch::DUM);
+        $es = new ElasticSearch(ElasticSearch::DUMIndex());
         $searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, Base::getPaginate(50, 20));
         if ($searchResults) {
             foreach ($searchResults as $item) {
diff --git a/app/Module/ElasticSearch.php b/app/Module/ElasticSearch.php
index ee6b0f086..7cff30e64 100644
--- a/app/Module/ElasticSearch.php
+++ b/app/Module/ElasticSearch.php
@@ -50,7 +50,7 @@ class ElasticSearch
         if (!empty($user)) {
             $config['basicAuthentication'] = [$user, $pass];
         }
-        
+
         $config['SSLVerification'] = $verifi;
         if ($verifi) {
             $config['SSLCert'] = $cert;
@@ -61,7 +61,7 @@ class ElasticSearch
         $this->client = ClientBuilder::fromConfig($config);
 
         if ($index) {
-            $this->index = $index . env("ES_INDEX_SUFFIX", "");
+            $this->index = $index;
         }
     }
 
@@ -411,7 +411,14 @@ class ElasticSearch
     /** ******************************************************************************************************** */
     /** ******************************************************************************************************** */
 
-    const DUM = "dialog_user_msg";
+    /**
+     * DialogUserMsg 索引名称
+     * @return string
+     */
+    public static function DUMIndex()
+    {
+        return "dialog_user_msg" . env("ES_INDEX_SUFFIX", "");
+    }
 
     /**
      * 会话用户 - 生成文档ID
@@ -458,7 +465,7 @@ class ElasticSearch
     public static function syncDialogUserToElasticSearch(WebSocketDialogUser $dialogUser)
     {
         try {
-            $es = new self(self::DUM);
+            $es = new self(self::DUMIndex());
             $es->indexDocument(self::generateDialogUserFormat($dialogUser), self::generateDialogUserDicId($dialogUser));
         } catch (\Exception $e) {
             Log::error('syncDialogUserToElasticSearch: ' . $e->getMessage());
@@ -471,7 +478,7 @@ class ElasticSearch
     public static function deleteDialogUserFromElasticSearch(WebSocketDialogUser $dialogUser)
     {
         try {
-            $es = new self(self::DUM);
+            $es = new self(self::DUMIndex());
 
             $docId = "user_{$dialogUser->userid}_dialog_{$dialogUser->dialog_id}";
 
@@ -545,7 +552,7 @@ class ElasticSearch
     public static function syncDialogToElasticSearch(WebSocketDialogMsg $dialogMsg)
     {
         try {
-            $es = new self(self::DUM);
+            $es = new self(self::DUMIndex());
 
             // 获取此会话的所有用户
             $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
@@ -559,7 +566,7 @@ class ElasticSearch
             foreach ($dialogUsers as $dialogUser) {
                 $params['body'][] = [
                     'index' => [
-                        '_index' => self::DUM,
+                        '_index' => self::DUMIndex(),
                         '_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid),
                         'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid)
                     ]
@@ -581,7 +588,7 @@ class ElasticSearch
     public static function deleteDialogFromElasticSearch(WebSocketDialogMsg $dialogMsg)
     {
         try {
-            $es = new self(self::DUM);
+            $es = new self(self::DUMIndex());
 
             // 获取此会话的所有用户
             $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
@@ -595,7 +602,7 @@ class ElasticSearch
             foreach ($dialogUsers as $dialogUser) {
                 $params['body'][] = [
                     'delete' => [
-                        '_index' => self::DUM,
+                        '_index' => self::DUMIndex(),
                         '_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid),
                         'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid)
                     ]