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

@@ -11,6 +11,8 @@ namespace App\Http\Controllers\Aside\Optimize;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Models\Project\DeployOptimize;
+use App\Models\Project\Project;
 
 
 class KeywordsController extends BaseController
 class KeywordsController extends BaseController
 {
 {
@@ -22,7 +24,12 @@ class KeywordsController extends BaseController
      * @time   :2023/9/4 10:13
      * @time   :2023/9/4 10:13
      */
      */
     public function lists(){
     public function lists(){
-        $lists = [];
+        $projectDeployOptimizeModel = new DeployOptimize();
+        $ids = $projectDeployOptimizeModel->where('customer_keywords','like','%'.$this->map['search'].'%')
+            ->orWhere('main_keywords', 'like' , '%'.$this->map['search'].'%')->pluck('project_id')->toArray();
+        $projectModel = new Project();
+        $lists = $projectModel->formatQuery(['id'=>['in',$ids]])->with('payment')->with('deploy_build')
+            ->with('deploy_optimize')->get()->toArray();
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -228,7 +228,7 @@ Route::middleware(['aloginauth'])->group(function () {
     });
     });
 
 
     //优化中台
     //优化中台
-    Route::prefix('keywords')->group(function () {
+    Route::prefix('keyword')->group(function () {
         Route::any('/', [Aside\Optimize\KeywordsController::class, 'lists'])->name('admin.optimize_keywords_lists');//优化中台
         Route::any('/', [Aside\Optimize\KeywordsController::class, 'lists'])->name('admin.optimize_keywords_lists');//优化中台
     });
     });