周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 f4105c7b1dbbd86cbe2cdec6ebd0d5fe3faf93d8 2 个父辈 70c9d570 338b17d2

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

内嵌 并排对比
正在显示 5 个修改的文件 包含 20 行增加 和 15 行删除
@@ -122,7 +122,8 @@ class RemainDay extends Command @@ -122,7 +122,8 @@ class RemainDay extends Command
122 if($deploy_build['seo_service_duration'] != 0){ 122 if($deploy_build['seo_service_duration'] != 0){
123 if($item['uptime']){ 123 if($item['uptime']){
124 $diff = time() - strtotime($item['uptime']); 124 $diff = time() - strtotime($item['uptime']);
125 - $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24)); 125 + $compliance_day = floor($diff / (60 * 60 * 24));
  126 + $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
126 }else{ 127 }else{
127 $seo_remain_day = $deploy_build['seo_service_duration']; 128 $seo_remain_day = $deploy_build['seo_service_duration'];
128 } 129 }
@@ -130,7 +131,7 @@ class RemainDay extends Command @@ -130,7 +131,7 @@ class RemainDay extends Command
130 $seo_remain_day = 0; 131 $seo_remain_day = 0;
131 } 132 }
132 if($deploy_build['plan'] == 0 && $seo_remain_day == 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常未0，放入未续费中 133 if($deploy_build['plan'] == 0 && $seo_remain_day == 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常未0，放入未续费中
133 - $this->project->edit(['seo_remain_day'=>$seo_remain_day,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]); 134 + $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
134 }else{ 135 }else{
135 //同时包括白帽版本+默认版本的项目 136 //同时包括白帽版本+默认版本的项目
136 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]); 137 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
@@ -69,6 +69,7 @@ class RenewProjectController extends BaseController @@ -69,6 +69,7 @@ class RenewProjectController extends BaseController
69 } 69 }
70 $map['extend_type'] = 0; 70 $map['extend_type'] = 0;
71 $map['remain_day'] = ['<=',15]; 71 $map['remain_day'] = ['<=',15];
  72 + $map['seo_remain_day'] = ['<=',15];
72 return $map; 73 return $map;
73 } 74 }
74 75
@@ -142,6 +143,7 @@ class RenewProjectController extends BaseController @@ -142,6 +143,7 @@ class RenewProjectController extends BaseController
142 if($item['type'] != Project::TYPE_ZERO){ 143 if($item['type'] != Project::TYPE_ZERO){
143 $data = APublicModel::getNumByProjectId($item['id']); 144 $data = APublicModel::getNumByProjectId($item['id']);
144 } 145 }
  146 + $plan = Project::planMap();
145 $item = [ 147 $item = [
146 'id' => $item['id'], 148 'id' => $item['id'],
147 'title' => $item['title'], 149 'title' => $item['title'],
@@ -159,7 +161,7 @@ class RenewProjectController extends BaseController @@ -159,7 +161,7 @@ class RenewProjectController extends BaseController
159 'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术 161 'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
160 'type' => $item['type'], 162 'type' => $item['type'],
161 'test_domain' => $item['deploy_build']['test_domain'] ?? 0, 163 'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
162 - 'plan' =>Project::planMap()[$item['deploy_build']['plan']], 164 + 'plan' =>$plan[$item['deploy_build']['plan']] ?? '白帽seo版本',
163 'plan_id' =>$item['deploy_build']['plan'], 165 'plan_id' =>$item['deploy_build']['plan'],
164 'domain' => !empty($item['deploy_optimize']['domain']) ? $domainModel->getDomain($item['deploy_optimize']['domain']) : '', 166 'domain' => !empty($item['deploy_optimize']['domain']) ? $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
165 'created_at' => date('Y年m月d日', strtotime($item['created_at'])), 167 'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
@@ -63,10 +63,11 @@ class AiBlogLogic extends BaseLogic @@ -63,10 +63,11 @@ class AiBlogLogic extends BaseLogic
63 $aiBlogService->mch_id = $aiSettingInfo['mch_id']; 63 $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
64 $aiBlogService->key = $aiSettingInfo['key']; 64 $aiBlogService->key = $aiSettingInfo['key'];
65 $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']]); 65 $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']]);
  66 + $aiBlogTaskModel = new AiBlogTask();
  67 + $aiBlogTaskModel->edit(['status'=>AiBlogTask::STATUS_RUNNING],['task_id'=>$this->param['task_id']]);//重新走拉取流程
66 }catch (\Exception $e){ 68 }catch (\Exception $e){
67 $this->fail('保存失败，请联系管理员'); 69 $this->fail('保存失败，请联系管理员');
68 } 70 }
69 - $this->sendHttpC([$this->param['route'],'top-blog']);  
70 return $this->success(); 71 return $this->success();
71 } 72 }
72 73
@@ -10,6 +10,7 @@ use App\Models\Com\UpdateNotify; @@ -10,6 +10,7 @@ use App\Models\Com\UpdateNotify;
10 use App\Models\Devops\ServerConfig; 10 use App\Models\Devops\ServerConfig;
11 use App\Models\Devops\ServersIp; 11 use App\Models\Devops\ServersIp;
12 use App\Models\Project\Project; 12 use App\Models\Project\Project;
  13 +use Illuminate\Support\Facades\Artisan;
13 use Illuminate\Support\Facades\Cache; 14 use Illuminate\Support\Facades\Cache;
14 use Illuminate\Support\Str; 15 use Illuminate\Support\Str;
15 16
@@ -908,17 +908,17 @@ class ProductLogic extends BaseLogic @@ -908,17 +908,17 @@ class ProductLogic extends BaseLogic
908 //处理内容中的图片 908 //处理内容中的图片
909 909
910 /*****阿里巴巴国际站特殊情况处理start******/ 910 /*****阿里巴巴国际站特殊情况处理start******/
911 - preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);  
912 - if($result_alibaba[0] ?? []){  
913 - foreach ($result_alibaba[0] as $v_ali){  
914 - $data[6] = str_replace($v_ali,'',$data[6]);  
915 - }  
916 -  
917 - $data[6] = str_replace('<noscript>','',$data[6]);  
918 - $data[6] = str_replace('</noscript>','',$data[6]);  
919 - $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);  
920 - $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);  
921 - } 911 +// preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);
  912 +// if($result_alibaba[0] ?? []){
  913 +// foreach ($result_alibaba[0] as $v_ali){
  914 +// $data[6] = str_replace($v_ali,'',$data[6]);
  915 +// }
  916 +//
  917 +// $data[6] = str_replace('<noscript>','',$data[6]);
  918 +// $data[6] = str_replace('</noscript>','',$data[6]);
  919 +// $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);
  920 +// $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);
  921 +// }
922 /*****阿里巴巴国际站特殊情况处理end******/ 922 /*****阿里巴巴国际站特殊情况处理end******/
923 923
924 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content); 924 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);