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

@@ -347,7 +347,7 @@ class FileController
         // 设置响应头
         // 设置响应头
         header('Content-Description: File Transfer');
         header('Content-Description: File Transfer');
         header('Content-Type: application/octet-stream');
         header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename="' . $info['name'] . '"');
+        header('Content-Disposition: attachment; filename="' . !empty($info['name']) ? $info['name'] : '未命名'.basename($info['path']) . '"');
         // 下载文件
         // 下载文件
         readfile($fileUrl);
         readfile($fileUrl);
     }
     }

@@ -30,8 +30,8 @@ class BlogLogic extends BaseLogic
      */
      */
     public function blogSave(){
     public function blogSave(){
         //拼接参数
         //拼接参数
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             $this->param = $this->paramProcessing($this->param);
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $id = $this->param['id'];
                 $id = $this->param['id'];
@@ -48,11 +48,11 @@ class BlogLogic extends BaseLogic
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                 $this->edit(['url'=>$route],['id'=>$id]);
                 $this->edit(['url'=>$route],['id'=>$id]);
             }
             }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('系统错误，请联系管理员');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('系统错误，请联系管理员');
+//        }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);

@@ -486,6 +486,7 @@ class RankDataLogic extends BaseLogic
         //保证关键词数
         //保证关键词数
         $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');
+        $model_is_compliance = $model->is_compliance;
         $model->is_compliance = 0;
         $model->is_compliance = 0;
         //是否达标
         //是否达标
         $is_compliance = $first_page_num >= $keyword_num;
         $is_compliance = $first_page_num >= $keyword_num;
@@ -495,7 +496,7 @@ class RankDataLogic extends BaseLogic
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
             //项目表更新
             //项目表更新
-            if (($model->updated_date != date('Y-m-d') || empty($model->is_compliance)) && !$lang) {
+            if (($model->updated_date != date('Y-m-d') || empty($model_is_compliance)) && !$lang) {
                 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
                 $compliance_day = Project::where(['id' => $project_id])->value('finish_remain_day') ?: 0;
                 Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
                 Project::where('id', $project_id)->update(['is_remain_today' => 1, 'finish_remain_day' => $compliance_day + 1]);
                 Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：'. ($compliance_day + 1));
                 Log::channel('rank_data')->info('项目' . $project_id . '达标天数+1：'. ($compliance_day + 1));