Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -29,7 +29,7 @@ class KeywordsController extends BaseController
             ->orWhere('main_keywords', 'like' , '%'.$this->map['search'].'%')->pluck('project_id')->toArray();
             ->orWhere('main_keywords', 'like' , '%'.$this->map['search'].'%')->pluck('project_id')->toArray();
         $projectModel = new Project();
         $projectModel = new Project();
         $lists = $projectModel->formatQuery(['id'=>['in',$ids]])->with('payment')->with('deploy_build')
         $lists = $projectModel->formatQuery(['id'=>['in',$ids]])->with('payment')->with('deploy_build')
-            ->with('deploy_optimize')->get()->toArray();
+            ->with('deploy_optimize')->with('domainInfo')->get()->toArray();
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -227,7 +227,7 @@ class Project extends Base
      */
      */
     public function domainInfo()
     public function domainInfo()
     {
     {
-        return self::hasOne(\App\Models\Domain\DomainInfo::class, 'project_id', 'project_id')->select('project_id', 'domain');;
+        return self::hasOne(\App\Models\Domain\DomainInfo::class, 'project_id', 'project_id')->select('project_id', 'domain');
     }
     }
 
 
     public function setLevelAttribute($value)
     public function setLevelAttribute($value)

@@ -186,6 +186,8 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         Route::any('/saveInquiryFilterConfig', [Aside\Project\ProjectController::class, 'saveInquiryFilterConfig'])->name('admin.project_inquiry_filter_config_save');//保存询盘过滤配置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
+            //优化中台
+            Route::any('/', [Aside\Optimize\KeywordsController::class, 'lists'])->name('admin.optimize_keywords_lists');//优化中台
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
             Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
             Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
             Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
@@ -282,10 +284,7 @@ Route::middleware(['aloginauth'])->group(function () {
     });
     });
 
 
 
 
-    //优化中台
-    Route::prefix('keyword')->group(function () {
-        Route::any('/', [Aside\Optimize\KeywordsController::class, 'lists'])->name('admin.optimize_keywords_lists');//优化中台
-    });
+
 
 
     //上线审核列表
     //上线审核列表
     Route::prefix('online')->group(function () {
     Route::prefix('online')->group(function () {