正在显示
1 个修改的文件
包含
10 行增加
和
5 行删除
@@ -141,12 +141,12 @@ class HomeEs extends Base { | @@ -141,12 +141,12 @@ class HomeEs extends Base { | ||
141 | if(is_array($address)){ | 141 | if(is_array($address)){ |
142 | // 发贱人 | 142 | // 发贱人 |
143 | if(Verify::sEmail($address['from']??'')){ | 143 | if(Verify::sEmail($address['from']??'')){ |
144 | - $query['query']['bool']['must'][] = ['match'=>['from.email'=>$address['from']]]; | 144 | + $query['query']['bool']['must'][] = ['match_phrase'=>['from.email'=>$address['from']]]; |
145 | } | 145 | } |
146 | // 收件人 | 146 | // 收件人 |
147 | if(Verify::sEmail($address['to']??'')){ | 147 | if(Verify::sEmail($address['to']??'')){ |
148 | $query['query']['bool']['must'][] = [ | 148 | $query['query']['bool']['must'][] = [ |
149 | - 'match' => [ | 149 | + 'match_phrase' => [ |
150 | 'to'=> $address['to'], | 150 | 'to'=> $address['to'], |
151 | ] | 151 | ] |
152 | ]; | 152 | ]; |
@@ -156,10 +156,10 @@ class HomeEs extends Base { | @@ -156,10 +156,10 @@ class HomeEs extends Base { | ||
156 | $query['query']['bool']['must'][] = [ | 156 | $query['query']['bool']['must'][] = [ |
157 | 'bool' =>[ | 157 | 'bool' =>[ |
158 | 'must'=>[ | 158 | 'must'=>[ |
159 | - ['match'=>['from.email'=>$address]] | 159 | + ['match_phrase'=>['from.email'=>$address]] |
160 | ], | 160 | ], |
161 | 'should'=>[ | 161 | 'should'=>[ |
162 | - ['match'=>['to'=>$address]] | 162 | + ['match_phrase'=>['to'=>$address]] |
163 | ] | 163 | ] |
164 | ] | 164 | ] |
165 | ]; | 165 | ]; |
@@ -191,7 +191,12 @@ class HomeEs extends Base { | @@ -191,7 +191,12 @@ class HomeEs extends Base { | ||
191 | // 不让查询数据 | 191 | // 不让查询数据 |
192 | $query['query']['bool']['must'][] = ['term'=>['uuid'=>0]]; | 192 | $query['query']['bool']['must'][] = ['term'=>['uuid'=>0]]; |
193 | }else{ | 193 | }else{ |
194 | - $query['query']['bool']['must'][] = ['match'=>['from.email'=>$from]]; | 194 | + $from = is_array($from)?$from:[$from]; |
195 | + $query['query']['bool']['must'][] = ['query_string'=>[ | ||
196 | + 'query'=>'from.email:('.implode(' OR ',array_map(function($e){ | ||
197 | + return '"'.$e.'"'; | ||
198 | + },$from)).')'] | ||
199 | + ]; | ||
195 | } | 200 | } |
196 | } | 201 | } |
197 | 202 |
-
请 注册 或 登录 后发表评论