周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 5a865179759e217ffa0e21abcc19f80f9d178695 2 个父辈 4b684b38 c6e29dcd

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 83 行增加 和 24 行删除
@@ -52,9 +52,9 @@ class LyhImportTest extends Command @@ -52,9 +52,9 @@ class LyhImportTest extends Command
52 * @time :2023/11/20 15:13 52 * @time :2023/11/20 15:13
53 */ 53 */
54 public function handle(){ 54 public function handle(){
55 - ProjectServer::useProject(3494); 55 + ProjectServer::useProject(2140);
56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
57 - $this->importCustomModule('https://ecdn6.globalso.com/upload/p/3494/file/2025-05/faq-1.csv',3494); 57 + $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/2025-16.csv',2140);
58 DB::disconnect('custom_mysql'); 58 DB::disconnect('custom_mysql');
59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
60 } 60 }
@@ -469,7 +469,7 @@ class LyhImportTest extends Command @@ -469,7 +469,7 @@ class LyhImportTest extends Command
469 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE, 469 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,
470 $contentId, $project_id); 470 $contentId, $project_id);
471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]); 471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
472 - if(!empty($item[3])){ 472 + if(!empty($item[1])){
473 $categoryId = ','; 473 $categoryId = ',';
474 $cateArr = explode('/',$item[1]); 474 $cateArr = explode('/',$item[1]);
475 foreach ($cateArr as $cateV){ 475 foreach ($cateArr as $cateV){
@@ -491,18 +491,18 @@ class LyhImportTest extends Command @@ -491,18 +491,18 @@ class LyhImportTest extends Command
491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
492 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 492 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
493 ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 493 ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
494 - ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
495 - ['key'=>'pd_extended_field_16', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
496 - ['key'=>'pd_extended_field_15', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
497 - ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
498 - ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
499 - ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
500 - ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
501 - ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
502 - ['key'=>'pd_extended_field_21', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
503 - ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
504 - ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
505 - ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 494 + ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  495 + ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  496 + ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  497 + ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  498 + ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  499 + ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  500 + ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  501 + ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  502 + ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  503 +// ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  504 +// ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  505 +// ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
506 ]; 506 ];
507 $customExtendContentTModel->insert($saveData); 507 $customExtendContentTModel->insert($saveData);
508 // }catch (\Exception $e){ 508 // }catch (\Exception $e){
@@ -147,8 +147,9 @@ class OptimizeController extends BaseController @@ -147,8 +147,9 @@ class OptimizeController extends BaseController
147 $data = APublicModel::getNumByProjectId($item['id']); 147 $data = APublicModel::getNumByProjectId($item['id']);
148 } 148 }
149 $manageModel = new ManageHr(); 149 $manageModel = new ManageHr();
150 -// $plan = Project::planMap();  
151 -// $seo_plan = Project::seoMap(); 150 + $plan = Project::planMap();
  151 + $seo_plan = Project::seoMap();
  152 + $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
152 $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0); 153 $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
153 $item['build_leader'] = $manageModel->getName($item['leader_mid']); 154 $item['build_leader'] = $manageModel->getName($item['leader_mid']);
154 $item['build_manager'] = $manageModel->getName($item['manager_mid']); 155 $item['build_manager'] = $manageModel->getName($item['manager_mid']);
@@ -17,6 +17,8 @@ use App\Models\Channel\Zone; @@ -17,6 +17,8 @@ use App\Models\Channel\Zone;
17 use App\Models\Com\City; 17 use App\Models\Com\City;
18 use App\Models\Com\UpdateLog; 18 use App\Models\Com\UpdateLog;
19 use App\Models\Devops\ServerConfig; 19 use App\Models\Devops\ServerConfig;
  20 +use App\Models\Devops\ServersIp;
  21 +use App\Models\Domain\DomainCreateTask;
20 use App\Models\Domain\DomainInfo; 22 use App\Models\Domain\DomainInfo;
21 use App\Models\Domain\DomainInfo as DomainInfoModel; 23 use App\Models\Domain\DomainInfo as DomainInfoModel;
22 use App\Models\HomeCount\Count; 24 use App\Models\HomeCount\Count;
@@ -1124,7 +1126,6 @@ class ProjectController extends BaseController @@ -1124,7 +1126,6 @@ class ProjectController extends BaseController
1124 * @time :2024/7/29 17:12 1126 * @time :2024/7/29 17:12
1125 */ 1127 */
1126 public function saveSiteStatus(){ 1128 public function saveSiteStatus(){
1127 - $projectModel = new Project();  
1128 $this->request->validate([ 1129 $this->request->validate([
1129 'id'=>'required', 1130 'id'=>'required',
1130 'site_status'=>'required' 1131 'site_status'=>'required'
@@ -1132,14 +1133,71 @@ class ProjectController extends BaseController @@ -1132,14 +1133,71 @@ class ProjectController extends BaseController
1132 'id.required' => '项目id不能为空', 1133 'id.required' => '项目id不能为空',
1133 'site_status.required' => '状态不能为空', 1134 'site_status.required' => '状态不能为空',
1134 ]); 1135 ]);
1135 - $projectModel->edit(['site_status'=>$this->map['site_status']],['id'=>$this->param['id']]);  
1136 - //TODO::通知C端 1136 +
  1137 + //获取项目数据
  1138 + $projectModel = new Project();
  1139 + $projectInfo = $projectModel->read(['id'=>$this->param['id']],['project_type','serve_id','site_status']);
  1140 + if(!$projectInfo){
  1141 + $this->fail('获取项目数据失败');
  1142 + }
  1143 + if($projectInfo['site_status'] == $this->param['site_status']){
  1144 + $this->response('success');
  1145 + }
  1146 +
  1147 + //获取域名数据
1137 $domainModel = new DomainInfoModel(); 1148 $domainModel = new DomainInfoModel();
1138 - $domainInfo = $domainModel->read(['project_id'=>$this->param['id']]);  
1139 - if($domainInfo !== false){  
1140 - $rs = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website?site_status='.$this->map['site_status']);  
1141 - @file_put_contents(storage_path('logs/site_status.log'), var_export('通知C端on/off'.$domainInfo['domain'].'.返回结果：'.json_encode($rs), true) . PHP_EOL, FILE_APPEND); 1149 + $domainInfo = $domainModel->read(['project_id'=>$this->param['id']],['id','domain','amp_status']);
  1150 + if(!$domainInfo){
  1151 + $this->fail('获取域名数据失败');
  1152 + }
  1153 +
  1154 + if($this->param['site_status'] == 1){
  1155 + //关闭站点：通知C端
  1156 + $re = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website');
  1157 + if(isset($re['status']) && $re['status'] !== 200){
  1158 + $this->fail($re['message']);
  1159 + }
  1160 + }else{
  1161 + //开启站点：创建建站任务
  1162 + $serverIpModel = new ServersIp();
  1163 + $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
  1164 + if(!$serversIpInfo){
  1165 + $this->fail('获取项目所属服务器失败');
  1166 + }
  1167 +
  1168 + if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
  1169 + $type = DomainCreateTask::TYPE_BLOG;
  1170 + } else {
  1171 + $type = DomainCreateTask::TYPE_MAIN;
  1172 + }
  1173 +
  1174 + //创建更新站点证书任务
  1175 + $domainCreateTaskModel = new DomainCreateTask();
  1176 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
  1177 + if (!$task_info) {
  1178 + $domainCreateTaskModel->add([
  1179 + 'server_id' => $serversIpInfo['servers_id'],
  1180 + 'project_id' => $this->param['id'],
  1181 + 'domain_id' => $domainInfo['id'],
  1182 + 'type' => $type
  1183 + ]);
  1184 + }
  1185 +
  1186 + if($domainInfo['amp_status']){
  1187 + $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
  1188 + if (!$task_info_amp) {
  1189 + $domainCreateTaskModel->add([
  1190 + 'server_id' => $serversIpInfo['servers_id'],
  1191 + 'project_id' => $this->param['id'],
  1192 + 'domain_id' => $domainInfo['id'],
  1193 + 'type' => DomainCreateTask::TYPE_AMP
  1194 + ]);
  1195 + }
1142 } 1196 }
  1197 + }
  1198 +
  1199 + $projectModel->edit(['site_status'=>$this->param['site_status']],['id'=>$this->param['id']]);
  1200 +
1143 $this->response('success'); 1201 $this->response('success');
1144 } 1202 }
1145 1203