合并分支 'master-server' 到 'master'

gx脚本更新路由



查看合并请求 !971

@@ -18,7 +18,6 @@ use App\Models\Com\City;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
-use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -202,9 +201,9 @@ class ProjectController extends BaseController
      */
      */
     public function searchContent(&$query){
     public function searchContent(&$query){
         if(!empty($this->map['domain'])){
         if(!empty($this->map['domain'])){
-            $parsedUrl = parse_url($this->map['domain']);
-            $search = $parsedUrl['host'] ?? $this->map['search'];
-            $ids = DomainInfo::where('domain', 'like', '%'.$search.'%')->pluck('id')->toArray();
+            $parsedUrl = parse_url($this->map['search']);
+            $this->map['search'] = $parsedUrl['host'] ?? $this->map['search'];
+            $ids = DomainInfo::where('domain', 'like', '%'.$this->map['search'].'%')->pluck('id')->toArray();
             $query->whereIn('gl_project_deploy_optimize.domain', $ids);
             $query->whereIn('gl_project_deploy_optimize.domain', $ids);
         }
         }
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){