Merge remote-tracking branch 'origin/master' into akun

@@ -173,7 +173,11 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
         $url = $this->user['domain'].'api/delHtml/?'.$str;
-        shell_exec('curl -k '.$url);
+        $rs = shell_exec('curl -k "'.$url.'"');
+//        if($this->user['project_id'] == 177){
+//            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($url, true) . PHP_EOL, FILE_APPEND);
+//            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($rs, true) . PHP_EOL, FILE_APPEND);
+//        }
 //        curlGet($url);
 //        curlGet($url);
         return $this->success();
         return $this->success();
     }
     }

@@ -88,7 +88,7 @@ class CountLogic extends BaseLogic
      * @time   :2023/5/24 14:03
      * @time   :2023/5/24 14:03
      */
      */
     public function keyword_data_count(){
     public function keyword_data_count(){
-        $yesterday = Carbon::yesterday()->toDateString();
+        $yesterday = date('Y-m-d');
         $rankDataModel = new RankDataModel();
         $rankDataModel = new RankDataModel();
         $param = [
         $param = [
             'updated_date' => $yesterday,
             'updated_date' => $yesterday,
@@ -96,8 +96,12 @@ class CountLogic extends BaseLogic
         ];
         ];
         $data = $rankDataModel->read($param,['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num']);
         $data = $rankDataModel->read($param,['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num']);
         if($data === false){
         if($data === false){
+            $param['updated_date'] = Carbon::yesterday()->toDateString();
+            $data = $rankDataModel->read($param,['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num']);
+            if($data === false){
                 $data = [];
                 $data = [];
             }
             }
+        }
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -57,9 +57,12 @@ class CopyProjectJob implements ShouldQueue
             $data = $data->getAttributes();
             $data = $data->getAttributes();
             $type = $data['type'];
             $type = $data['type'];
             $data['type'] = 0;
             $data['type'] = 0;
+            $data['old_project_id'] = $this->param['project_id'];
             $data['title'] = $data['title'].'-copy';
             $data['title'] = $data['title'].'-copy';
             unset($data['id']);
             unset($data['id']);
             $project_id = $projectModel->insertGetId($data);
             $project_id = $projectModel->insertGetId($data);
+            $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
+            $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
             //复制部署表
             //复制部署表
             $buildModel = new DeployBuild();
             $buildModel = new DeployBuild();
             $buildData = $buildModel::where('project_id', $this->param['project_id'])->first();
             $buildData = $buildModel::where('project_id', $this->param['project_id'])->first();