github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化ES索引名称

Browse Source
This commit is contained in:
kuaifan 2025-03-06 19:24:29 +08:00
parent 945d84dbc4
commit eef9fa56c6
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/SyncDialogUserMsgToElasticsearch.php
View File

@ -30,7 +30,7 @@ class SyncDialogUserMsgToElasticsearch extends Command
public function __construct() public function __construct()
{ {
parent::__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) { foreach ($dialogUsers as $dialogUser) {
$params['body'][] = [ $params['body'][] = [
'index' => [ 'index' => [
'_index' => ElasticSearch::DUM, '_index' => ElasticSearch::DUMIndex(),
'_id' => ElasticSearch::generateDialogUserDicId($dialogUser), '_id' => ElasticSearch::generateDialogUserDicId($dialogUser),
] ]
]; ];
@ -217,7 +217,7 @@ class SyncDialogUserMsgToElasticsearch extends Command
foreach ($userDialogMap[$dialogMsg->dialog_id] as $userid) { foreach ($userDialogMap[$dialogMsg->dialog_id] as $userid) {
$params['body'][] = [ $params['body'][] = [
'index' => [ 'index' => [
'_index' => ElasticSearch::DUM, '_index' => ElasticSearch::DUMIndex(),
'_id' => ElasticSearch::generateDialogMsgDicId($dialogMsg, $userid), '_id' => ElasticSearch::generateDialogMsgDicId($dialogMsg, $userid),
'routing' => ElasticSearch::generateDialogMsgParentId($dialogMsg, $userid) // 路由到父文档 'routing' => ElasticSearch::generateDialogMsgParentId($dialogMsg, $userid) // 路由到父文档
] ]

4
app/Http/Controllers/Api/DialogController.php
View File

@ -172,7 +172,7 @@ class DialogController extends AbstractController
} }
// 搜索消息会话 // 搜索消息会话
if (count($list) < 20) { if (count($list) < 20) {
$es = new ElasticSearch(ElasticSearch::DUM); $es = new ElasticSearch(ElasticSearch::DUMIndex());
$searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, 20 - count($list)); $searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, 20 - count($list));
if ($searchResults) { if ($searchResults) {
foreach ($searchResults as $item) { foreach ($searchResults as $item) {
@ -734,7 +734,7 @@ class DialogController extends AbstractController
$key = trim(Request::input('key')); $key = trim(Request::input('key'));
$list = []; $list = [];
// //
$es = new ElasticSearch(ElasticSearch::DUM); $es = new ElasticSearch(ElasticSearch::DUMIndex());
$searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, Base::getPaginate(50, 20)); $searchResults = $es->searchDialogsByUserAndKeyword($user->userid, $key, Base::getPaginate(50, 20));
if ($searchResults) { if ($searchResults) {
foreach ($searchResults as $item) { foreach ($searchResults as $item) {

25
app/Module/ElasticSearch.php
View File

@ -50,7 +50,7 @@ class ElasticSearch
if (!empty($user)) { if (!empty($user)) {
$config['basicAuthentication'] = [$user, $pass]; $config['basicAuthentication'] = [$user, $pass];
} }
$config['SSLVerification'] = $verifi; $config['SSLVerification'] = $verifi;
if ($verifi) { if ($verifi) {
$config['SSLCert'] = $cert; $config['SSLCert'] = $cert;
@ -61,7 +61,7 @@ class ElasticSearch
$this->client = ClientBuilder::fromConfig($config); $this->client = ClientBuilder::fromConfig($config);
if ($index) { 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 * 会话用户 - 生成文档ID
@ -458,7 +465,7 @@ class ElasticSearch
public static function syncDialogUserToElasticSearch(WebSocketDialogUser $dialogUser) public static function syncDialogUserToElasticSearch(WebSocketDialogUser $dialogUser)
{ {
try { try {
$es = new self(self::DUM); $es = new self(self::DUMIndex());
$es->indexDocument(self::generateDialogUserFormat($dialogUser), self::generateDialogUserDicId($dialogUser)); $es->indexDocument(self::generateDialogUserFormat($dialogUser), self::generateDialogUserDicId($dialogUser));
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('syncDialogUserToElasticSearch: ' . $e->getMessage()); Log::error('syncDialogUserToElasticSearch: ' . $e->getMessage());
@ -471,7 +478,7 @@ class ElasticSearch
public static function deleteDialogUserFromElasticSearch(WebSocketDialogUser $dialogUser) public static function deleteDialogUserFromElasticSearch(WebSocketDialogUser $dialogUser)
{ {
try { try {
$es = new self(self::DUM); $es = new self(self::DUMIndex());
$docId = "user_{$dialogUser->userid}_dialog_{$dialogUser->dialog_id}"; $docId = "user_{$dialogUser->userid}_dialog_{$dialogUser->dialog_id}";
@ -545,7 +552,7 @@ class ElasticSearch
public static function syncDialogToElasticSearch(WebSocketDialogMsg $dialogMsg) public static function syncDialogToElasticSearch(WebSocketDialogMsg $dialogMsg)
{ {
try { try {
$es = new self(self::DUM); $es = new self(self::DUMIndex());
// 获取此会话的所有用户 // 获取此会话的所有用户
$dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get(); $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
@ -559,7 +566,7 @@ class ElasticSearch
foreach ($dialogUsers as $dialogUser) { foreach ($dialogUsers as $dialogUser) {
$params['body'][] = [ $params['body'][] = [
'index' => [ 'index' => [
'_index' => self::DUM, '_index' => self::DUMIndex(),
'_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid), '_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid),
'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid) 'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid)
] ]
@ -581,7 +588,7 @@ class ElasticSearch
public static function deleteDialogFromElasticSearch(WebSocketDialogMsg $dialogMsg) public static function deleteDialogFromElasticSearch(WebSocketDialogMsg $dialogMsg)
{ {
try { try {
$es = new self(self::DUM); $es = new self(self::DUMIndex());
// 获取此会话的所有用户 // 获取此会话的所有用户
$dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get(); $dialogUsers = WebSocketDialogUser::whereDialogId($dialogMsg->dialog_id)->get();
@ -595,7 +602,7 @@ class ElasticSearch
foreach ($dialogUsers as $dialogUser) { foreach ($dialogUsers as $dialogUser) {
$params['body'][] = [ $params['body'][] = [
'delete' => [ 'delete' => [
'_index' => self::DUM, '_index' => self::DUMIndex(),
'_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid), '_id' => self::generateDialogMsgDicId($dialogMsg, $dialogUser->userid),
'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid) 'routing' => self::generateDialogMsgParentId($dialogMsg, $dialogUser->userid)
] ]