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

@@ -122,7 +122,8 @@ class RemainDay extends Command
             if($deploy_build['seo_service_duration'] != 0){
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
-                    $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
+                    $compliance_day  = floor($diff / (60 * 60 * 24));
+                    $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
                 }else{
                     $seo_remain_day = $deploy_build['seo_service_duration'];
                 }
@@ -130,7 +131,7 @@ class RemainDay extends Command
                     $seo_remain_day = 0;
                 }
                 if($deploy_build['plan'] == 0 && $seo_remain_day == 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常未0，放入未续费中
-                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
+                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
                 }else{
                     //同时包括白帽版本+默认版本的项目
                     $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);

@@ -69,6 +69,7 @@ class RenewProjectController extends BaseController
         }
         $map['extend_type'] = 0;
         $map['remain_day'] = ['<=',15];
+        $map['seo_remain_day'] = ['<=',15];
         return $map;
     }
 
@@ -142,6 +143,7 @@ class RenewProjectController extends BaseController
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
         }
+        $plan = Project::planMap();
         $item = [
             'id' => $item['id'],
             'title' => $item['title'],
@@ -159,7 +161,7 @@ class RenewProjectController extends BaseController
             'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
             'type' => $item['type'],
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
-            'plan' =>Project::planMap()[$item['deploy_build']['plan']],
+            'plan' =>$plan[$item['deploy_build']['plan']] ?? '白帽seo版本',
             'plan_id' =>$item['deploy_build']['plan'],
             'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),

@@ -63,10 +63,11 @@ class AiBlogLogic extends BaseLogic
             $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
             $aiBlogService->key = $aiSettingInfo['key'];
             $aiBlogService->updateDetail(['task_id'=>$this->param['task_id'],'title'=>$this->param['new_title'],'thumb'=>$this->param['image'],'route'=>$this->param['route'],'author_id'=>$this->param['author_id']]);
+            $aiBlogTaskModel = new AiBlogTask();
+            $aiBlogTaskModel->edit(['status'=>AiBlogTask::STATUS_RUNNING],['task_id'=>$this->param['task_id']]);//重新走拉取流程
         }catch (\Exception $e){
             $this->fail('保存失败，请联系管理员');
         }
-        $this->sendHttpC([$this->param['route'],'top-blog']);
         return $this->success();
     }
 

@@ -10,6 +10,7 @@ use App\Models\Com\UpdateNotify;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServersIp;
 use App\Models\Project\Project;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 

@@ -908,17 +908,17 @@ class ProductLogic extends  BaseLogic
                 //处理内容中的图片
 
                 /*****阿里巴巴国际站特殊情况处理start******/
-                preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);
-                if($result_alibaba[0] ?? []){
-                    foreach ($result_alibaba[0] as $v_ali){
-                        $data[6] = str_replace($v_ali,'',$data[6]);
-                    }
-
-                    $data[6] = str_replace('<noscript>','',$data[6]);
-                    $data[6] = str_replace('</noscript>','',$data[6]);
-                    $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);
-                    $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);
-                }
+//                preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);
+//                if($result_alibaba[0] ?? []){
+//                    foreach ($result_alibaba[0] as $v_ali){
+//                        $data[6] = str_replace($v_ali,'',$data[6]);
+//                    }
+//
+//                    $data[6] = str_replace('<noscript>','',$data[6]);
+//                    $data[6] = str_replace('</noscript>','',$data[6]);
+//                    $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);
+//                    $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);
+//                }
                 /*****阿里巴巴国际站特殊情况处理end******/
 
                 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);