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

+<?php
+
+namespace App\Console\Commands\GeneratePDF;
+
+use App\Models\File\PdfFile;
+use App\Models\ProjectAssociation\ProjectAssociation;
+use App\Services\CosService;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Illuminate\Console\Command;
+
+class GeneratePdfData extends Command
+{
+//    use CmdSignal;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'generate_pdf_data';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '生成v6绑定的aicc用户的pdf备用数据';
+
+    // 最大支持5个进程
+    public $maxRunNumber = 50;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function handle()
+    {
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    public function start(): int
+    {
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    protected function main()
+    {
+        $month = date('m');
+        $list  = ProjectAssociation::query()->whereStatus(ProjectAssociation::STATUS_NORMAL)
+                                   ->where('m_status', '!=', $month)->first();
+
+        if (is_null($list)) {
+            $this->error('没有任务，等待中');
+            sleep(60);
+            return 0;
+        }
+        $pdfFile = new PdfFile();
+        $bool    = $pdfFile->saveData(['pid' => $list->id]);
+        if (!$bool) {
+            $this->error('生成v6绑定的aicc用户的pdf备用数据添加失败');
+            return 0;
+        }
+        $list->m_status = $month;
+        $list->save();
+        $this->info('生成v6绑定的aicc用户的pdf备用数据添加成功');
+        return 0;
+    }
+}

 <?php
 <?php
 
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\GeneratePDF;
 
 
-use App\Http\Controllers\File\FileController;
-use App\Models\File\DataFile;
+use App\Models\File\PdfFile;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Services\CosService;
 use App\Services\CosService;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\Facade\Pdf;
@@ -12,7 +11,7 @@ use Illuminate\Http\File;
 
 
 class ProjectFilePDF extends Command
 class ProjectFilePDF extends Command
 {
 {
-    use CmdSignal;
+//    use CmdSignal;
 
 
     /**
     /**
      * The name and signature of the console command.
      * The name and signature of the console command.
@@ -28,14 +27,8 @@ class ProjectFilePDF extends Command
      */
      */
     protected $description = '网站项目数据，生成PDF文件';
     protected $description = '网站项目数据，生成PDF文件';
 
 
-    protected $ProjectAssociation;
-
-    protected $DataFile;
-
     protected $time;
     protected $time;
 
 
-    protected $fileController;
-
     protected $CosService;
     protected $CosService;
 
 
     // 最大支持5个进程
     // 最大支持5个进程
@@ -48,71 +41,89 @@ class ProjectFilePDF extends Command
      */
      */
     public function __construct()
     public function __construct()
     {
     {
-        $this->ProjectAssociation = new ProjectAssociation();
-        $this->DataFile           = new DataFile();
         $this->time       = date("Y-m");
         $this->time       = date("Y-m");
-        $this->fileController     = new FileController();
         $this->CosService = new CosService();
         $this->CosService = new CosService();
         parent::__construct();
         parent::__construct();
     }
     }
 
 
-//    public function handle()
-//    {
-//        $project_data = [];
-//        $html         = $this->html($project_data);
-//        $filename     = hash('md5', $this->time . '-' . '$project_id' . '-' . '$friend_id' . '-' . '$user_id');
-//        $this->savePDF($html, $filename);
-////        $this->testStreamPdf($html, $filename);
-////        $file_path = $this->savePDF2($html, $filename);
-//        return 0;
-//    }
+    public function handle()
+    {
+        // 开始时间
+        $startTime = microtime(true);
+        $html      = $this->html([]);
+        $filename  = hash('md5', $this->time . '-' . random_int(100000, 999999));
+        $this->savePDF($html, $filename);
+
+        // 结束时间
+        $endTime = microtime(true);
+
+        // 计算执行时间
+        $executionTime = ($endTime - $startTime);
+
+        // 输出执行时间
+        var_dump("程序执行时间： " . $executionTime . " 秒");
+//        return $this->main();
+    }
 
 
+    /**
+     * @return int
+     */
     public function start(): int
     public function start(): int
     {
     {
-        # 0 - 未生成
-        # 1 - 已生成
-        # 2 - 其它问题
-        $is_pdf = 0;
-        $lists  = $this->ProjectAssociation::query()->where('is_pdf', $is_pdf)
-                                           ->where('project_id', '!=', 0)
-                                           ->where('friend_id', '!=', 0)
-                                           ->where('user_id', '!=', 0)
-                                           ->where('created_at', 'like', $this->time . '%')->first();
-
-        if (is_null($lists)) {
-            $this->debug_echo('没有任务，等待中');
-            sleep(30);
+        return $this->main();
+    }
+
+    /**
+     * @return int
+     */
+    protected function main()
+    {
+        $list = PdfFile::query()->whereIsPdf(PdfFile::GENERATE_NOT_PDF)->first();
+
+        if (is_null($list)) {
+            $this->error('没有任务，等待中');
+            sleep(60);
+            return 0;
+        }
+        $pid = $list->pid;
+        if (empty($pid)) {
+            $this->error('数据错误');
+            return 0;
+        }
+        $isExists = ProjectAssociation::query()->whereId($pid)->whereStatus(ProjectAssociation::STATUS_NORMAL)->first();
+        if (is_null($isExists)) {
+            $this->error('数据已被禁用 —— ' . $pid);
             return 0;
             return 0;
         }
         }
-        $key   = $this->signature . '-' . $lists->id;
-        $count = redis_get($key);
 
 
-        $project_id = $lists->project_id;
-        $user_id    = $lists->user_id;
-        $friend_id  = $lists->friend_id;
+        $key        = 'generate_pdf_' . $list->id;
+        $count      = (int)redis_get($key) ?: 0;
+        $project_id = $isExists->project_id;
+        $user_id    = $isExists->user_id;
+        $friend_id  = $isExists->friend_id;
         // todo 根据项目查询数据
         // todo 根据项目查询数据
         $project_data = [];
         $project_data = [];
         $html         = $this->html($project_data);
         $html         = $this->html($project_data);
         $filename     = hash('md5', $this->time . '-' . $project_id . '-' . $friend_id . '-' . $user_id);
         $filename     = hash('md5', $this->time . '-' . $project_id . '-' . $friend_id . '-' . $user_id);
 
 
-        $file_path = $this->savePDF($html, $filename);
-        if (empty($file_path)) {
-            $this->debug_echo('pdf生成失败！');
+        if ($count == 2) {
+            $list->is_pdf = PdfFile::GENERATE_OTHER_PDF;
+            $list->save();
+            $this->error('项目文件数据保存失败！ - 其他原因 - ' . $key);
             return 0;
             return 0;
         }
         }
-        $isRes = $this->DataFile->saveData(compact('project_id', 'user_id', 'friend_id', 'file_path') + ['time' => $this->time]);
-        if (!$isRes) {
-            if ($count == 2) {
-                $lists->is_pdf = 2;
-                $lists->save();
-                $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
-            } else {
+
+        $file_path = $this->savePDF($html, $filename);
+        if (empty($file_path)) {
             redis_set($key, $count + 1);
             redis_set($key, $count + 1);
-                $this->debug_echo('项目文件数据保存失败！ - ' . $key);
-            }
+            $this->error('pdf生成失败！');
+            return 0;
         }
         }
-        $lists->is_pdf = 1;
-        $lists->save();
+
+        // 保存文件路径
+        $list->file_path = $file_path;
+        $list->is_pdf    = PdfFile::GENERATE_PDF;
+        $list->save();
         $this->info('项目文件数据保存成功！');
         $this->info('项目文件数据保存成功！');
         return 0;
         return 0;
     }
     }
@@ -131,18 +142,22 @@ class ProjectFilePDF extends Command
         }
         }
         // 指定保存路径和文件名
         // 指定保存路径和文件名
         $savePath = $pdf_path . $filename . '.pdf';
         $savePath = $pdf_path . $filename . '.pdf';
+
         if (file_exists($savePath)) {
         if (file_exists($savePath)) {
             echo '文件已经存在';
             echo '文件已经存在';
             return 0;
             return 0;
         }
         }
 
 
+        $path = '/PDF/' . $this->time;
         $pdf  = PDF::loadHTML($html);
         $pdf  = PDF::loadHTML($html);
-        $pdf->save($savePath);
 
 
-        $path = '/V6/PDF/' . $this->time;
-        // 创建一个文件实例
-        $file = new File($savePath);
-        return $this->CosService->uploadFile($file, $path, $filename . '.pdf');
+        // 获取二进制文件
+        $binary = $pdf->output(['compres' => 0]);
+        // 将文件保存到本地
+//        $pdf->save($savePath);
+//        $binary = new File($savePath);
+
+        return $this->CosService->uploadFile($binary, $path, $filename . '.pdf', true);
     }
     }
 
 
     /**
     /**
@@ -153,6 +168,6 @@ class ProjectFilePDF extends Command
     protected function html($item)
     protected function html($item)
     {
     {
         $font_path = storage_path('fonts\msyh.ttf');
         $font_path = storage_path('fonts\msyh.ttf');
-        return '<html><head><title>Laravel</title><meta http-equiv=\'Content-Type\' content=\'text/html; charset=utf-8\'/><style>body{  font-family: \'msyh\';  }  @font-face {  font-family: \'msyh\';  font-style: normal;  font-weight: normal;  src: url(' . $font_path . ') format(\'truetype\');  }</style></head><body><div class=\'container\'><div class=\'content\'><p style=\'font-family: msyh, DejaVu Sans,sans-serif;\'>献给母亲的爱</p><div style=\'font-family: msyh, DejaVu Sans,sans-serif;\' class=\'title\'>Laravel 5中文测试</div><div  class=\'title\'>测试三askjdhfkjasdhf</div></div></div></body></html>';
+        return '<html><head><title>Laravel</title><meta http-equiv=\'Content-Type\' content=\'text/html; charset=utf-8\'/><style>body{  font-family: \'msyh\';  }  @font-face {  font-family: \'msyh\';  font-style: normal;  font-weight: normal;  src: url(' . $font_path . ') format(\'truetype\');  }</style></head><body><div class=\'container\'><div class=\'content\'><p style=\'font-family: msyh, DejaVu Sans,sans-serif;\'>献给母亲的爱</p><div style=\'font-family: msyh, DejaVu Sans,sans-serif;\' class=\'title\'>Laravel 5中文测试sdsd</div><div  class=\'title\'>测试三askjdhfkjasdhf</div></div></div></body></html>';
     }
     }
 }
 }

 <?php
 <?php
 
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\GeneratePDF;
 
 
-use App\Models\File\DataFile;
+use App\Models\File\PdfFile;
+use App\Models\ProjectAssociation\ProjectAssociation;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 
 
-class WebsiteData extends Command
+class PushAiccData extends Command
 {
 {
-    use CmdSignal;
+//    use CmdSignal;
 
 
     /**
     /**
      * The name and signature of the console command.
      * The name and signature of the console command.
      *
      *
      * @var string
      * @var string
      */
      */
-    protected $signature = 'website_data';
+    protected $signature = 'push_data_to_aicc';
 
 
     /**
     /**
      * The console command description.
      * The console command description.
@@ -39,41 +40,65 @@ class WebsiteData extends Command
         parent::__construct();
         parent::__construct();
     }
     }
 
 
+
+    public function handle()
+    {
+        return $this->main();
+    }
+
     public function start(): int
     public function start(): int
     {
     {
-        # 0 - 未推送
-        # 1 - 已推送
-        # 2 - 其他问题
-        $status = 0;
-        $lists  = DataFile::query()->where('status', $status)
-                          ->where('created_at', 'like', $this->time . '%')->first();
-        if (is_null($lists)) {
-            $this->debug_echo('没有任务，等待中');
-            sleep(30);
+        return $this->main();
+    }
+
+    protected function main()
+    {
+        $list = PdfFile::query()->whereIsPdf(PdfFile::GENERATE_PUSH)->whereIsPush(PdfFile::GENERATE_NOT_PUSH)->first();
+        if (is_null($list)) {
+            $this->error('向AICC推送 - 没有任务，等待中');
+            sleep(60);
             return 0;
             return 0;
         }
         }
 
 
-        $key         = $this->signature . '-' . $lists->id;
-        $count       = redis_get($key);
-        $data        = $lists;
+        $pid = $list->pid;
+        if (empty($pid)) {
+            $this->error('向AICC推送数据错误');
+            return 0;
+        }
+        $isExists = ProjectAssociation::query()->whereId($pid)->whereStatus(ProjectAssociation::STATUS_NORMAL)->first();
+        if (is_null($isExists)) {
+            $this->error('向AICC推送数据已被禁用 —— ' . $pid);
+            return 0;
+        }
+
+        $key   = 'push_data_to_aicc_' . $list->id;
+        $count = (int)redis_get($key) ?: 0;
+
+        $data               = $list->toArray();
+        $data['project_id'] = $isExists->project_id;
+        $data['friend_id']  = $isExists->friend_id;
+        $data['user_id']    = $isExists->user_id;
+
         $url         = env('AICC_URL');
         $url         = env('AICC_URL');
         $msg         = http_post($url, json_encode(compact('data')));
         $msg         = http_post($url, json_encode(compact('data')));
         $status_code = 0;
         $status_code = 0;
         if ($msg) {
         if ($msg) {
             $status_code = (int)$msg['status'];
             $status_code = (int)$msg['status'];
         }
         }
-        if ($status_code != 200) {
         if ($count == 2) {
         if ($count == 2) {
-                $lists->status = 2;
-                $lists->save();
+            $list->is_push = PdfFile::GENERATE_OTHER_PUSH;
+            $list->save();
             $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
             $this->debug_echo('项目文件数据保存失败！ - 其他原因 - ' . $key);
-            } else {
+            return 0;
+        }
+
+        if ($status_code != 200) {
             redis_set($key, $count + 1);
             redis_set($key, $count + 1);
             $this->debug_echo('项目文件数据保存失败！ - ' . $key);
             $this->debug_echo('项目文件数据保存失败！ - ' . $key);
+            return 0;
         }
         }
-        }
-        $lists->status = 1;
-        $lists->save();
+        $list->is_push = PdfFile::GENERATE_PUSH;
+        $list->save();
         $this->info('项目文件数据保存成功！');
         $this->info('项目文件数据保存成功！');
         return 0;
         return 0;
     }
     }

@@ -41,28 +41,60 @@ class HtmlCustomCollect extends Command
     {
     {
         ini_set('memory_limit', '512M');
         ini_set('memory_limit', '512M');
 
 
-        $project_id = 517;
-        $project_site = 'v6-1gee9.globalso.site';
+//        $project_id = 437;
+//        $project_site = 'v6-1500k.globalso.site';
+//        $pages = [
+//            'https://www.tourletent.com/project/b300-glamping-tent-in-china/',
+//            'https://www.tourletent.com/project/lotus-bell-tent-in-australia/',
+//            'https://www.tourletent.com/project/luxury-resort-in-china/',
+//            'https://www.tourletent.com/project/canvas-safari-tent-inthailand/',
+//            'https://www.tourletent.com/project/safari-tent-for-m8-in-mexcio/',
+//            'https://www.tourletent.com/project/9m-pvc-dome-tent-in-canada/',
+//            'https://www.tourletent.com/project/c900-hotel-tent-in-korea/',
+//            'https://www.tourletent.com/project/safari-tent-in-guizhou/',
+//            'https://www.tourletent.com/project/dome-tent-in-austin/',
+//            'https://www.tourletent.com/project/safari-tent-in-italy/',
+//            'https://www.tourletent.com/project/glass-igloo-in-china/',
+//            'https://www.tourletent.com/project/tree-house-in-sichuan/'
+//        ];
+
+//        $project_id = 517;
+//        $project_site = 'v6-1gee9.globalso.site';
+//        $pages = [
+//            'https://www.beifa.group/help/send-results/',
+//            'https://www.beifa.group/help/terms-of-use/',
+//            'https://www.beifa.group/help/position-3/',
+//            'https://www.beifa.group/help/position-2/',
+//            'https://www.beifa.group/help/position-1/',
+//            'https://www.beifa.group/help/social-media/',
+//            'https://www.beifa.group/help/globle-exibition-2/',
+//            'https://www.beifa.group/help/job/',
+//            'https://www.beifa.group/help/vr/',
+//            'https://www.beifa.group/help/on-live-video/',
+//            'https://www.beifa.group/help/honor/',
+//            'https://www.beifa.group/help/certification/',
+//            'https://www.beifa.group/help/quanity-control/',
+//            'https://www.beifa.group/help/testing-center/',
+//            'https://www.beifa.group/help/rd/',
+//            'https://www.beifa.group/help/design-trend/',
+//            'https://www.beifa.group/help/partner/',
+//            'https://www.beifa.group/help/social-responsibility/',
+//            'https://www.beifa.group/help/contact/',
+//        ];
+
+        $project_id = 546;
+        $project_site = 'v6-kx260.globalso.site';
         $pages = [
         $pages = [
-            'https://www.beifa.group/help/send-results/',
-            'https://www.beifa.group/help/terms-of-use/',
-            'https://www.beifa.group/help/position-3/',
-            'https://www.beifa.group/help/position-2/',
-            'https://www.beifa.group/help/position-1/',
-            'https://www.beifa.group/help/social-media/',
-            'https://www.beifa.group/help/globle-exibition-2/',
-            'https://www.beifa.group/help/job/',
-            'https://www.beifa.group/help/vr/',
-            'https://www.beifa.group/help/on-live-video/',
-            'https://www.beifa.group/help/honor/',
-            'https://www.beifa.group/help/certification/',
-            'https://www.beifa.group/help/quanity-control/',
-            'https://www.beifa.group/help/testing-center/',
-            'https://www.beifa.group/help/rd/',
-            'https://www.beifa.group/help/design-trend/',
-            'https://www.beifa.group/help/partner/',
-            'https://www.beifa.group/help/social-responsibility/',
-            'https://www.beifa.group/help/contact/',
+            'https://www.grechofiberglass.com/success_stories/',
+            'https://www.grechofiberglass.com/success_stories/achieving-transformative-improvements-for-polyurethane-exterior-insulation-panels-in-france/',
+            'https://www.grechofiberglass.com/success_stories/grechos-fiberglass-rebar-revolutionizing-canadian-construction-projects-with-unparalleled-quality/',
+            'https://www.grechofiberglass.com/success_stories/customer-from-the-uk-purchases-fiberglass-coated-mats-for-plasterboards-from-grecho/',
+            'https://www.grechofiberglass.com/success_stories/supplying-carbon-fiber-to-australian-surfboard-manufacturer/',
+            'https://www.grechofiberglass.com/success_stories/300g-chopped-strand-mat-for-composite-slates-shipped-to-malaysia/',
+            'https://www.grechofiberglass.com/success_stories/fiberglass-roving-for-pipewater-tank-shipped-to-russia/',
+            'https://www.grechofiberglass.com/success_stories/fiberglass-fleece-for-acoustic-ceiling-shipped-to-russia/',
+            'https://www.grechofiberglass.com/success_stories/600g-fiberglass-aluminum-foil-cloth-shipped-to-australia-for-pipe-heat-shielding/',
+            'https://www.grechofiberglass.com/success_stories/shipping-our-first-truck-of-fiberglass-tissue-in-2022/',
         ];
         ];
 
 
 //        $project_id = 586;
 //        $project_id = 586;
@@ -78,6 +110,36 @@ class HtmlCustomCollect extends Command
 //            'https://www.citymax-group.com/case/field-experiment-crop-lettuce/',
 //            'https://www.citymax-group.com/case/field-experiment-crop-lettuce/',
 //        ];
 //        ];
 
 
+//        $project_id = 626;
+//        $project_site = 'v6-m342g.globalso.site';
+//        $pages = [
+//            'https://www.lecusostreetlight.com/project_catalog/project/',
+//            'https://www.lecusostreetlight.com/project_catalog/project/page/2/',
+//            'https://www.lecusostreetlight.com/project/560pcs-250w-smart-led-street-light-in-manila-city-philippines/',
+//            'https://www.lecusostreetlight.com/project/3200pcs-8m-150w-solar-street-light-in-cebu-philippines/',
+//            'https://lecusostreetlight.com/project/170pcs-100w-split-lithium-battery-solar-street-light-in-tanzania/',
+//            'https://www.lecusostreetlight.com/project/250pcs-40w-sl-series-solar-street-light-in-kuwait/',
+//            'https://www.lecusostreetlight.com/project/272pcs-8m-80w-solar-street-light-in-tanzania/',
+//            'https://www.lecusostreetlight.com/project/185pcs-10m-120w-highway-solar-street-light-in-jordan/',
+//            'https://www.lecusostreetlight.com/project/270pcs-9m-patterned-decorative-light-pole-with-150w-led-cobra-light-in-cambodia/',
+//            'https://www.lecusostreetlight.com/project/48pcs-5m-24w-decorative-aluminium-pole-in-dubai-uae/',
+//            'https://www.lecusostreetlight.com/project/105pcs-9m-100w-led-street-light-in-sri-lanka/',
+//            'https://www.lecusostreetlight.com/project/45pcs-6m-hot-dip-galvanized-double-arm-street-light-pole-in-dubai-uae/',
+//            'https://www.lecusostreetlight.com/project/356pcs-8m-100w-solar-street-light-in-ethiopia/',
+//            'https://www.lecusostreetlight.com/project/52pcs-6m-30w-solar-led-street-light-with-gel-battery-in-poland/',
+//            'https://www.lecusostreetlight.com/project/225pcs-6m-80w-solar-street-light-in-vietnam/',
+//            'https://www.lecusostreetlight.com/project/450pcs-7m-60w-double-arm-solar-light-in-nigeria/',
+//            'https://www.lecusostreetlight.com/project/100pcs-6m-50w-led-street-light-in-maldives/',
+//            'https://www.lecusostreetlight.com/project/202pcs-6m-40w-3000k-solar-street-light-in-manila-philippines/',
+//            'https://www.lecusostreetlight.com/project/245pcs-120w-smart-led-street-light-in-bangkok-thailand/',
+//            'https://www.lecusostreetlight.com/project/170pcs-7m-50w-all-in-one-solar-light-in-davao-philippines/',
+//            'https://www.lecusostreetlight.com/project/80pcs-9m-150w-led-street-light-in-iraq/',
+//            'https://www.lecusostreetlight.com/project/252pcs-6m-40w-separate-solar-street-light-with-lithium-battery-in-thailand/',
+//            'https://www.lecusostreetlight.com/project/198pcs-8m-80w-zc-series-all-in-two-solar-light-in-philippines/',
+//            'https://www.lecusostreetlight.com/project/5m-30w-morden-led-garden-light-in-russian/',
+//            'https://www.lecusostreetlight.com/project/135pcs-all-in-one-solar-street-light-in-uae-dubai-park/'
+//        ];
+
 //        $project_id = 633;
 //        $project_id = 633;
 //        $project_site = 'v6-ke5nz.globalso.site';
 //        $project_site = 'v6-ke5nz.globalso.site';
 //        $pages = [
 //        $pages = [
@@ -117,53 +179,6 @@ class HtmlCustomCollect extends Command
 //            'https://www.mach-sales.com/case/cooperation-win-win-and-starting-anew-sumec-creates-a-new-sample-of-strong-enterprise-cooperation/'
 //            'https://www.mach-sales.com/case/cooperation-win-win-and-starting-anew-sumec-creates-a-new-sample-of-strong-enterprise-cooperation/'
 //        ];
 //        ];
 
 
-//        $project_id = 437;
-//        $project_site = 'v6-1500k.globalso.site';
-//        $pages = [
-//            'https://www.tourletent.com/project/b300-glamping-tent-in-china/',
-//            'https://www.tourletent.com/project/lotus-bell-tent-in-australia/',
-//            'https://www.tourletent.com/project/luxury-resort-in-china/',
-//            'https://www.tourletent.com/project/canvas-safari-tent-inthailand/',
-//            'https://www.tourletent.com/project/safari-tent-for-m8-in-mexcio/',
-//            'https://www.tourletent.com/project/9m-pvc-dome-tent-in-canada/',
-//            'https://www.tourletent.com/project/c900-hotel-tent-in-korea/',
-//            'https://www.tourletent.com/project/safari-tent-in-guizhou/',
-//            'https://www.tourletent.com/project/dome-tent-in-austin/',
-//            'https://www.tourletent.com/project/safari-tent-in-italy/',
-//            'https://www.tourletent.com/project/glass-igloo-in-china/',
-//            'https://www.tourletent.com/project/tree-house-in-sichuan/'
-//        ];
-
-//        $project_id = 626;
-//        $project_site = 'v6-m342g.globalso.site';
-//        $pages = [
-//            'https://www.lecusostreetlight.com/project_catalog/project/',
-//            'https://www.lecusostreetlight.com/project_catalog/project/page/2/',
-//            'https://www.lecusostreetlight.com/project/560pcs-250w-smart-led-street-light-in-manila-city-philippines/',
-//            'https://www.lecusostreetlight.com/project/3200pcs-8m-150w-solar-street-light-in-cebu-philippines/',
-//            'https://lecusostreetlight.com/project/170pcs-100w-split-lithium-battery-solar-street-light-in-tanzania/',
-//            'https://www.lecusostreetlight.com/project/250pcs-40w-sl-series-solar-street-light-in-kuwait/',
-//            'https://www.lecusostreetlight.com/project/272pcs-8m-80w-solar-street-light-in-tanzania/',
-//            'https://www.lecusostreetlight.com/project/185pcs-10m-120w-highway-solar-street-light-in-jordan/',
-//            'https://www.lecusostreetlight.com/project/270pcs-9m-patterned-decorative-light-pole-with-150w-led-cobra-light-in-cambodia/',
-//            'https://www.lecusostreetlight.com/project/48pcs-5m-24w-decorative-aluminium-pole-in-dubai-uae/',
-//            'https://www.lecusostreetlight.com/project/105pcs-9m-100w-led-street-light-in-sri-lanka/',
-//            'https://www.lecusostreetlight.com/project/45pcs-6m-hot-dip-galvanized-double-arm-street-light-pole-in-dubai-uae/',
-//            'https://www.lecusostreetlight.com/project/356pcs-8m-100w-solar-street-light-in-ethiopia/',
-//            'https://www.lecusostreetlight.com/project/52pcs-6m-30w-solar-led-street-light-with-gel-battery-in-poland/',
-//            'https://www.lecusostreetlight.com/project/225pcs-6m-80w-solar-street-light-in-vietnam/',
-//            'https://www.lecusostreetlight.com/project/450pcs-7m-60w-double-arm-solar-light-in-nigeria/',
-//            'https://www.lecusostreetlight.com/project/100pcs-6m-50w-led-street-light-in-maldives/',
-//            'https://www.lecusostreetlight.com/project/202pcs-6m-40w-3000k-solar-street-light-in-manila-philippines/',
-//            'https://www.lecusostreetlight.com/project/245pcs-120w-smart-led-street-light-in-bangkok-thailand/',
-//            'https://www.lecusostreetlight.com/project/170pcs-7m-50w-all-in-one-solar-light-in-davao-philippines/',
-//            'https://www.lecusostreetlight.com/project/80pcs-9m-150w-led-street-light-in-iraq/',
-//            'https://www.lecusostreetlight.com/project/252pcs-6m-40w-separate-solar-street-light-with-lithium-battery-in-thailand/',
-//            'https://www.lecusostreetlight.com/project/198pcs-8m-80w-zc-series-all-in-two-solar-light-in-philippines/',
-//            'https://www.lecusostreetlight.com/project/5m-30w-morden-led-garden-light-in-russian/',
-//            'https://www.lecusostreetlight.com/project/135pcs-all-in-one-solar-street-light-in-uae-dubai-park/'
-//        ];
-
         foreach ($pages as $page) {
         foreach ($pages as $page) {
             $this->start_collect(urldecode($page), $project_id, $project_site);
             $this->start_collect(urldecode($page), $project_id, $project_site);
         }
         }
@@ -213,8 +228,19 @@ class HtmlCustomCollect extends Command
                 $html = str_replace($old_info['home_url'], $project_site, $html);
                 $html = str_replace($old_info['home_url'], $project_site, $html);
 
 
                 //暂时隐藏小语种
                 //暂时隐藏小语种
-                $html = str_replace('<div class="change-language ensemble">', '<div class="change-language ensemble" style="display: none">', $html);
-                $html = str_replace('<div class="language_more">', '<div class="language_more" style="display: none">', $html);
+//                $html = str_replace('<div class="change-language ensemble">', '<div class="change-language ensemble" style="display: none">', $html);
+//                $html = str_replace('<div class="language_more">', '<div class="language_more" style="display: none">', $html);
+
+                //处理搜索
+                preg_match_all('/<form\s+[^>]*?action\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_search);
+                $search = $result_search[2] ?? [];
+                foreach ($search as $vc) {
+                    if((strpos($vc,'search.php') !== false) || (strpos($vc,'index.php') !== false)){
+                        $html = str_replace($vc,'/search/',$html);
+                    }
+                }
+
+                //增加统计代码
                 $html = str_replace('</body>', '<script src="https://ecdn6.globalso.com/public/customerVisit.min.js\"></script></body>', $html);
                 $html = str_replace('</body>', '<script src="https://ecdn6.globalso.com/public/customerVisit.min.js\"></script></body>', $html);
 
 
                 //html写入文件
                 //html写入文件

-<?php
-
-namespace App\Models\File;
-
-use App\Models\Base;
-
-class DataFile extends Base
-{
-    protected $table = 'gl_data_file';
-
-    public function saveData(array $data): bool
-    {
-        # v6项目ID
-        $project_id = (int)$data['project_id'] ?? 0;
-        $isRes      = self::query()->where('project_id', $project_id)->where('created_at', 'like', $data['time'] . '%')->first();
-        if (!$isRes) {
-            $isRes             = new self();
-            $isRes->project_id = $project_id;
-            # AICC用户ID
-            $isRes->user_id = $data['user_id'];
-            # 第三方朋友ID
-            $isRes->friend_id = $data['friend_id'];
-            # 生成文件路径
-            $isRes->file_path = $data['file_path'];
-        }
-        return $isRes->save();
-    }
-
-    /**
-     * @param int $page
-     * @param int $perPage
-     * @return array
-     */
-    public function allData(int $page = 1, int $perPage = 15)
-    {
-        $lists       = self::query()->paginate($perPage, ['*'], 'page', $page);
-        $items       = $lists->Items();
-        $totalPage   = $lists->lastPage();
-        $total       = $lists->total();
-        $currentPage = $lists->currentPage();
-        return compact('total', 'items', 'totalPage', 'currentPage');
-    }
-
-}

+<?php
+
+namespace App\Models\File;
+
+use App\Models\Base;
+
+/**
+ * App\Models\File\PdfFile
+ *
+ * @property int $id
+ * @property int $pid AICC用户ID
+ * @property string $file_path 生成文件路径
+ * @property int $is_pdf 0 - 未生成 1 - 已生成 2 - 其它问题
+ * @property int|null $is_push 0 - 未推送 1 - 已推送 2 - 其他问题
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile newModelQuery()
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|PdfFile query()
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereCreatedAt($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereFilePath($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereId($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereIsPdf($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereIsPush($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile wherePid($value)
+ * @method  \Illuminate\Database\Eloquent\Builder|PdfFile whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class PdfFile extends Base
+{
+    protected $table = 'gl_pdf_file';
+
+    /** @var int PDF - 未生成 */
+    const GENERATE_NOT_PDF = 0;
+
+    /** @var int PDF - 已生成 */
+    const GENERATE_PDF = 1;
+
+    /** @var int PDF - 其它问题 */
+    const GENERATE_OTHER_PDF = 2;
+
+    /** @var int AICC - 未推送 */
+    const GENERATE_NOT_PUSH = 0;
+    /** @var int AICC - 已推送 */
+    const GENERATE_PUSH = 1;
+    /** @var int AICC - 其他问题 */
+    const GENERATE_OTHER_PUSH = 2;
+
+    public function saveData(array $data): bool
+    {
+        # v6项目ID
+        $pid   = (int)$data['pid'] ?? 0;
+        $time = $data['time'] ?? date('Y-m-d');
+        $isRes = self::query()->wherePid($pid)->where('created_at', 'like', $time . '%')->first();
+        if (!$isRes) {
+            $isRes      = new self();
+            $isRes->pid = $pid;
+            # 生成文件路径
+            $isRes->file_path = $data['file_path'] ?? '';
+        }
+        return $isRes->save();
+    }
+
+}

@@ -5,10 +5,47 @@ namespace App\Models\ProjectAssociation;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 
 
+/**
+ * App\Models\ProjectAssociation\ProjectAssociation
+ *
+ * @property int $id
+ * @property int $project_id V6项目ID
+ * @property int $friend_id AICC朋友ID
+ * @property int $user_id AICC用户ID
+ * @property string|null $nickname AICC朋友昵称
+ * @property string|null $user_name AICC用户姓名
+ * @property string|null $image AICC朋友头像
+ * @property int|null $status 1 - 正常， 0 - 禁用
+ * @property int|null $m_status 统计当月是否生成数据
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method  Builder|ProjectAssociation newModelQuery()
+ * @method  Builder|ProjectAssociation newQuery()
+ * @method static Builder|ProjectAssociation query()
+ * @method  Builder|ProjectAssociation whereCreatedAt($value)
+ * @method  Builder|ProjectAssociation whereFriendId($value)
+ * @method  Builder|ProjectAssociation whereId($value)
+ * @method  Builder|ProjectAssociation whereImage($value)
+ * @method  Builder|ProjectAssociation whereMStatus($value)
+ * @method  Builder|ProjectAssociation whereNickname($value)
+ * @method  Builder|ProjectAssociation whereProjectId($value)
+ * @method  Builder|ProjectAssociation whereStatus($value)
+ * @method  Builder|ProjectAssociation whereUpdatedAt($value)
+ * @method  Builder|ProjectAssociation whereUserId($value)
+ * @method  Builder|ProjectAssociation whereUserName($value)
+ * @mixin \Eloquent
+ */
 class ProjectAssociation extends Model
 class ProjectAssociation extends Model
 {
 {
+
     protected $table = 'gl_project_association';
     protected $table = 'gl_project_association';
 
 
+    /** @var int 数据状态 - 正常 */
+    const STATUS_NORMAL = 1;
+
+    /** @var int 数据状态 - 禁用 */
+    const STATUS_DISABLED = 0;
+
     /**
     /**
      * 保存|修改数据
      * 保存|修改数据
      * @param array $data
      * @param array $data

@@ -21,7 +21,7 @@ class CosService
      * @method :post
      * @method :post
      * @time   :2023/7/19 15:28
      * @time   :2023/7/19 15:28
      */
      */
-    public function uploadFile(&$files,$path,$filename)
+    public function uploadFile(&$files,$path,$filename, $binary = false)
     {
     {
         $cos = config('filesystems.disks.cos');
         $cos = config('filesystems.disks.cos');
         $cosClient = new Client([
         $cosClient = new Client([
@@ -32,10 +32,11 @@ class CosService
             ],
             ],
         ]);
         ]);
         $key = $path.'/'.$filename;
         $key = $path.'/'.$filename;
+        $Body = $binary ? $files : fopen($files->getRealPath(), 'r');
         $cosClient->putObject([
         $cosClient->putObject([
             'Bucket' => $cos['bucket'],
             'Bucket' => $cos['bucket'],
             'Key' => $key,
             'Key' => $key,
-            'Body' => fopen($files->getRealPath(), 'r'),
+            'Body' => $Body,
         ]);
         ]);
         return $key;
         return $key;
     }
     }

@@ -23,6 +23,7 @@
         "swooletw/laravel-swoole": "^2.13"
         "swooletw/laravel-swoole": "^2.13"
     },
     },
     "require-dev": {
     "require-dev": {
+        "barryvdh/laravel-ide-helper": "^2.13",
         "facade/ignition": "^2.5",
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
         "fakerphp/faker": "^1.9.1",
         "laravel/sail": "^1.0.1",
         "laravel/sail": "^1.0.1",