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

@@ -98,7 +98,6 @@ class TranslateController extends BaseController
      * @time   :2024/1/12 11:19
      * @time   :2024/1/12 11:19
      */
      */
     public function save(TranslateLogic $logic){
     public function save(TranslateLogic $logic){
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($this->request->all(), true) . PHP_EOL, FILE_APPEND);
         $this->request->validate([
         $this->request->validate([
             'type'=>'required',
             'type'=>'required',
             'language_id'=>'required',
             'language_id'=>'required',

@@ -284,6 +284,7 @@ class ProjectLogic extends BaseLogic
         $deploy_optimize['special'] = !empty($deploy_optimize['special']) ? ','.trim($deploy_optimize['special'],',').',' : '';
         $deploy_optimize['special'] = !empty($deploy_optimize['special']) ? ','.trim($deploy_optimize['special'],',').',' : '';
         //是否更新了api_no
         //是否更新了api_no
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
+        if(!empty($api_no)){
             if($api_no != $deploy_optimize['api_no']){
             if($api_no != $deploy_optimize['api_no']){
                 if($deploy_optimize['api_no']){
                 if($deploy_optimize['api_no']){
                     NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no'] ?: 0]);
                     NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no'] ?: 0]);
@@ -297,6 +298,7 @@ class ProjectLogic extends BaseLogic
                     RankWeek::where('project_id', $deploy_optimize['project_id'])->delete();
                     RankWeek::where('project_id', $deploy_optimize['project_id'])->delete();
                 }
                 }
             }
             }
+        }
         $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]);
         $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]);
         return $this->success();
         return $this->success();
     }
     }

@@ -482,7 +482,7 @@ class RankDataLogic extends BaseLogic
             $model = new RankData();
             $model = new RankData();
         }
         }
         //g-top方案达标天数
         //g-top方案达标天数
-        $this->g_top_plan($project_id,$first_page_num);
+        $this->g_top_plan($project_id,$first_page_without_extension_num);
         //保证关键词数
         //保证关键词数
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
         $type = Project::where('id', $project_id)->value('type');
         $type = Project::where('id', $project_id)->value('type');