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

@@ -48,7 +48,7 @@ class Demo extends Command
     protected $description = 'demo';
     protected $description = 'demo';
 
 
     public function handle(){
     public function handle(){
-        $this->synchronizationFile('/upload/m/file/2024-07/tongli-haiyuan-keywords.pdf');
+//        $this->synchronizationFile('/upload/m/file/2024-07/tongli-haiyuan-keywords.pdf');
     }
     }
 
 
     public function synchronizationFile($path_name){
     public function synchronizationFile($path_name){

@@ -174,6 +174,7 @@ class OptimizeController extends BaseController
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project.is_upgrade AS is_upgrade',
             'gl_project.is_upgrade AS is_upgrade',
+            'gl_project.site_status AS site_status',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.go_question AS go_question',
             'gl_project_online_check.go_question AS go_question',
@@ -220,6 +221,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $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'])){
+            $query = $query->where('gl_project.site_status',$this->map['site_status']);
+        }
         if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
         if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
         }
         }

@@ -48,7 +48,6 @@ class CNoticeController extends BaseController
         $url = $request->input('url', []);
         $url = $request->input('url', []);
         $language = $request->input('language', []);
         $language = $request->input('language', []);
         $is_sitemap = intval($request->input('is_sitemap', 0));
         $is_sitemap = intval($request->input('is_sitemap', 0));
-
         //获取项目所在服务器
         //获取项目所在服务器
         $project_model = new Project();
         $project_model = new Project();
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
@@ -106,8 +105,10 @@ class CNoticeController extends BaseController
                 'is_sitemap' => $is_sitemap
                 'is_sitemap' => $is_sitemap
             ];
             ];
             http_post($c_url, json_encode($param));
             http_post($c_url, json_encode($param));
+//            $shell = 'curl -X POST ' . escapeshellarg($c_url) . ' -H "Content-Type: application/json"' .
+//                ' -d ' . escapeshellarg(json_encode($param)) . ' > /dev/null 2>&1 &';
+//            shell_exec($shell);
         }
         }
-
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
     }
     }