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

@@ -52,9 +52,9 @@ class LyhImportTest extends Command
      * @time   :2023/11/20 15:13
      */
     public function handle(){
-        ProjectServer::useProject(3494);
+        ProjectServer::useProject(2140);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        $this->importCustomModule('https://ecdn6.globalso.com/upload/p/3494/file/2025-05/faq-1.csv',3494);
+        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/2025-16.csv',2140);
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
@@ -469,7 +469,7 @@ class LyhImportTest extends Command
             $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,
                 $contentId, $project_id);
             $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
-            if(!empty($item[3])){
+            if(!empty($item[1])){
                 $categoryId = ',';
                 $cateArr = explode('/',$item[1]);
                 foreach ($cateArr as $cateV){
@@ -491,18 +491,18 @@ class LyhImportTest extends Command
                 ['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')],
                 ['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')],
                 ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
-                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+                ['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')],
+//                ['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')],
+//                ['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')],
+//                ['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')],
             ];
             $customExtendContentTModel->insert($saveData);
 //            }catch (\Exception $e){

@@ -147,8 +147,9 @@ class OptimizeController extends BaseController
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         $manageModel = new ManageHr();
-//        $plan = Project::planMap();
-//        $seo_plan = Project::seoMap();
+        $plan = Project::planMap();
+        $seo_plan = Project::seoMap();
+        $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);

@@ -17,6 +17,8 @@ use App\Models\Channel\Zone;
 use App\Models\Com\City;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
+use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\HomeCount\Count;
@@ -1124,7 +1126,6 @@ class ProjectController extends BaseController
      * @time   :2024/7/29 17:12
      */
     public function saveSiteStatus(){
-        $projectModel = new Project();
         $this->request->validate([
             'id'=>'required',
             'site_status'=>'required'
@@ -1132,14 +1133,71 @@ class ProjectController extends BaseController
             'id.required' => '项目id不能为空',
             'site_status.required' => '状态不能为空',
         ]);
-        $projectModel->edit(['site_status'=>$this->map['site_status']],['id'=>$this->param['id']]);
-        //TODO::通知C端
+
+        //获取项目数据
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$this->param['id']],['project_type','serve_id','site_status']);
+        if(!$projectInfo){
+            $this->fail('获取项目数据失败');
+        }
+        if($projectInfo['site_status'] == $this->param['site_status']){
+            $this->response('success');
+        }
+
+        //获取域名数据
         $domainModel = new DomainInfoModel();
-        $domainInfo = $domainModel->read(['project_id'=>$this->param['id']]);
-        if($domainInfo !== false){
-            $rs = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website?site_status='.$this->map['site_status']);
-            @file_put_contents(storage_path('logs/site_status.log'), var_export('通知C端on/off'.$domainInfo['domain'].'.返回结果：'.json_encode($rs), true) . PHP_EOL, FILE_APPEND);
+        $domainInfo = $domainModel->read(['project_id'=>$this->param['id']],['id','domain','amp_status']);
+        if(!$domainInfo){
+            $this->fail('获取域名数据失败');
         }
+
+        if($this->param['site_status'] == 1){
+            //关闭站点：通知C端
+            $re = curl_get('https://'.$domainInfo['domain'].'/api/stop_or_start_website');
+            if(isset($re['status']) && $re['status'] !== 200){
+                $this->fail($re['message']);
+            }
+        }else{
+            //开启站点：创建建站任务
+            $serverIpModel = new ServersIp();
+            $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
+            if(!$serversIpInfo){
+                $this->fail('获取项目所属服务器失败');
+            }
+
+            if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
+                $type = DomainCreateTask::TYPE_BLOG;
+            } else {
+                $type = DomainCreateTask::TYPE_MAIN;
+            }
+
+            //创建更新站点证书任务
+            $domainCreateTaskModel = new DomainCreateTask();
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
+            if (!$task_info) {
+                $domainCreateTaskModel->add([
+                    'server_id' => $serversIpInfo['servers_id'],
+                    'project_id' => $this->param['id'],
+                    'domain_id' => $domainInfo['id'],
+                    'type' => $type
+                ]);
+            }
+
+            if($domainInfo['amp_status']){
+                $task_info_amp = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $domainInfo['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]], ['id']);
+                if (!$task_info_amp) {
+                    $domainCreateTaskModel->add([
+                        'server_id' => $serversIpInfo['servers_id'],
+                        'project_id' => $this->param['id'],
+                        'domain_id' => $domainInfo['id'],
+                        'type' => DomainCreateTask::TYPE_AMP
+                    ]);
+                }
+            }
+        }
+
+        $projectModel->edit(['site_status'=>$this->param['site_status']],['id'=>$this->param['id']]);
+
         $this->response('success');
     }