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

@@ -35,7 +35,7 @@ class MonthCount extends Command
 
 
     public function handle(){
     public function handle(){
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)->where('gl_project.id',1)
+            ->where('gl_project.type','!=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
             ->select($this->selectParam())->get()->toArray();
@@ -98,11 +98,7 @@ class MonthCount extends Command
      * @time   :2024/1/8 9:05
      * @time   :2024/1/8 9:05
      */
      */
     public function count($project_id,$url){
     public function count($project_id,$url){
-        $list = DB::connection('custom_mysql')->table('gl_customer_visit')
-            ->select(DB::raw("DATE_FORMAT(updated_date, '%Y-%m') as month"))
-            ->groupBy('month')->get()->toArray();
-        foreach ($list as $k=>$v){
-            $v = (array)$v;
+            $v = ['month'=>date('Y-m')];
             $monthCountModel = new MonthCountModel();
             $monthCountModel = new MonthCountModel();
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             // 获取当月开始时间
             // 获取当月开始时间
@@ -140,7 +136,6 @@ class MonthCount extends Command
             }else{
             }else{
                 $monthCountModel->edit($arr,['id'=>$info['id']]);
                 $monthCountModel->edit($arr,['id'=>$info['id']]);
             }
             }
-        }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }