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

gx



查看合并请求 !1728

@@ -213,6 +213,7 @@ class OptimizeController extends BaseController
             'gl_project_deploy_build.tech_mid AS tech_mid',
             'gl_project_deploy_build.tech_mid AS tech_mid',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.plan AS plan',
             'gl_project_deploy_build.plan AS plan',
+            'gl_project_deploy_build.seo_plan AS seo_plan',
             'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
             'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
             'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
             'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
             'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
             'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
@@ -246,7 +247,10 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
         if(isset($this->map['site_status'])){
         if(isset($this->map['site_status'])){
-            $query = $query->where('gl_project.site_status',$this->map['site_status']);
+            $query = $query->where('gl_project_deploy_build.site_status',$this->map['site_status']);
+        }
+        if(isset($this->map['seo_plan'])){
+            $query = $query->where('gl_project.seo_plan',$this->map['seo_plan']);
         }
         }
         if(isset($this->map['main_lang_id'])){
         if(isset($this->map['main_lang_id'])){
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);

+<?php
+/**
+ * @remark :
+ * @name   :GoogleLinkController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/4/3 15:05
+ */
+
+namespace App\Http\Controllers\Bside\GoogleKeyword;
+
+use App\Http\Controllers\Bside\BaseController;
+
+class GoogleLinkController extends BaseController
+{
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :GoogleLinkService.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/4/3 15:06
+ */
+
+namespace App\Services;
+
+class GoogleLinkService
+{
+    public $url = 'https://www.cmer.site/api/outlinks?domain=www.sinsmarts.com&pagesize=20&page=1';
+}