Merge remote-tracking branch 'origin/master' into akun

@@ -16,6 +16,8 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Detail;
 use App\Models\Product\Detail;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Visit\Visit;
+use App\Models\Visit\VisitItem;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -40,6 +42,7 @@ class DownloadProject extends Command
 
 
     public function handle(){
     public function handle(){
         ProjectServer::useProject(1225);
         ProjectServer::useProject(1225);
+        echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         $data = $this->downloadProduct();
         $data = $this->downloadProduct();
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -50,12 +53,13 @@ class DownloadProject extends Command
     {
     {
         $product = new Product();
         $product = new Product();
         $filed = ['id', 'project_id', 'title' ,'thumb' , 'route' ,'intro','content',
         $filed = ['id', 'project_id', 'title' ,'thumb' , 'route' ,'intro','content',
-            'category_id', 'status'];
+            'category_id', 'status','seo_mate'];
         $this->order = 'sort';
         $this->order = 'sort';
         $lists = $product->list(['status'=>1],'id',$filed);
         $lists = $product->list(['status'=>1],'id',$filed);
         if(!empty($lists)){
         if(!empty($lists)){
             $cate_data = $this->getCategoryList();//分类
             $cate_data = $this->getCategoryList();//分类
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
+                echo date('Y-m-d H:i:s') . '产品id:'.$v['id'] . PHP_EOL;
                 $v['url'] = 'https://www.autsikinta.com/' . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);
                 $v['url'] = 'https://www.autsikinta.com/' . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);
                 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
                 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
                 //ToDo::处理图片及文件
                 //ToDo::处理图片及文件
@@ -64,10 +68,10 @@ class DownloadProject extends Command
                 }else{
                 }else{
                     $v['images'] = '';
                     $v['images'] = '';
                 }
                 }
+                $v['seo_mate'] = json_encode($v['seo_mate']);
                 $lists[$k] = $v;
                 $lists[$k] = $v;
             }
             }
         }
         }
-        echo date('Y-m-d H:i:s') . '数据详情$v:'. json_encode($lists) . PHP_EOL;
         return $lists;
         return $lists;
     }
     }
     public function categoryName($product_id,$data){
     public function categoryName($product_id,$data){
@@ -106,6 +110,39 @@ class DownloadProject extends Command
         }
         }
         return $data;
         return $data;
     }
     }
+//    public function exportData($data){
+//        // 创建一个新的 Excel 电子表格实例
+//        $spreadsheet = new Spreadsheet();
+//        $sheet = $spreadsheet->getActiveSheet();
+//        // 添加表头
+//        $sheet->setCellValue('A1', '浏览时间');
+//        $sheet->setCellValue('B1', '访客来源');
+//        $sheet->setCellValue('C1', '访客入路页面');
+//        $sheet->setCellValue('D1', '终端');
+//        $sheet->setCellValue('E1', '国家ip');
+//        $sheet->setCellValue('F1', '深度访问页数');
+//        $rowCount = 2;
+//        foreach ($data as $v) {
+//            $sheet->setCellValue('A' . $rowCount, $v['created_at']);
+//            $sheet->setCellValue('B' . $rowCount, $v['referrer_url']);
+//            $sheet->setCellValue('C' . $rowCount, $v['url']);
+//            $sheet->setCellValue('D' . $rowCount, $v['device_text']);
+//            $sheet->setCellValue('E' . $rowCount, $v['ip']);
+//            $sheet->setCellValue('F' . $rowCount, $v['depth']);
+//            $rowCount++;
+//        }
+//        // 创建一个新的 Excel Writer 对象
+//        $writer = new Xlsx($spreadsheet);
+//        $filename = time().'.xlsx';
+//        // 设置导出文件的保存路径和文件名
+//        $filePath = public_path('upload/excel/'.$filename);
+//        // 导出 Excel 文件
+//        $writer->save($filePath);
+//        echo date('Y-m-d H:i:s') . 'file_link:'.url('upload/excel/'.$filename) . PHP_EOL;
+//        // 返回导出文件的响应
+//        return ['file_link'=>url('upload/excel/'.$filename)];
+//    }
+
     public function exportData($data){
     public function exportData($data){
         // 创建一个新的 Excel 电子表格实例
         // 创建一个新的 Excel 电子表格实例
         $spreadsheet = new Spreadsheet();
         $spreadsheet = new Spreadsheet();
@@ -118,6 +155,7 @@ class DownloadProject extends Command
         $sheet->setCellValue('E1', '产品分类');
         $sheet->setCellValue('E1', '产品分类');
         $sheet->setCellValue('F1', '产品状态');
         $sheet->setCellValue('F1', '产品状态');
         $sheet->setCellValue('G1', '产品主图');
         $sheet->setCellValue('G1', '产品主图');
+        $sheet->setCellValue('H1', '产品TDK');
         $rowCount = 2;
         $rowCount = 2;
         foreach ($data as $v) {
         foreach ($data as $v) {
             $sheet->setCellValue('A' . $rowCount, $v['title']);
             $sheet->setCellValue('A' . $rowCount, $v['title']);
@@ -127,6 +165,7 @@ class DownloadProject extends Command
             $sheet->setCellValue('E' . $rowCount, $v['category_id_text']);
             $sheet->setCellValue('E' . $rowCount, $v['category_id_text']);
             $sheet->setCellValue('F' . $rowCount, '发布中');
             $sheet->setCellValue('F' . $rowCount, '发布中');
             $sheet->setCellValue('G' . $rowCount, $v['images']);
             $sheet->setCellValue('G' . $rowCount, $v['images']);
+            $sheet->setCellValue('H' . $rowCount, $v['seo_mate']);
             $rowCount++;
             $rowCount++;
         }
         }
         // 创建一个新的 Excel Writer 对象
         // 创建一个新的 Excel Writer 对象
@@ -140,4 +179,27 @@ class DownloadProject extends Command
         // 返回导出文件的响应
         // 返回导出文件的响应
         return ['file_link'=>url('upload/excel/'.$filename)];
         return ['file_link'=>url('upload/excel/'.$filename)];
     }
     }
+
+//    public function downloadItem($filed = ['id','depth','created_at','referrer_url','url','device_port','country','ip']){
+//        $visitModel = new Visit();
+//        $page = 1;
+//        $pageSize = 3000;
+//        $lists = $visitModel->lists(['updated_date'=>['between',['2025-02-01','2025-02-31']]],$page,$pageSize,'id',$filed);
+//        foreach ($lists as $v){
+//            $customer_visit_id[] = $v['id'];
+//        }
+//        $itemModel = new VisitItem();
+//        $itemList = $itemModel->list(['customer_visit_id'=>['in',$customer_visit_id]],['customer_visit_id','url']);
+//        foreach ($lists as $key => $value){
+//            $sub = [];
+//            foreach ($itemList as $sonValue){
+//                if($value['id'] == $sonValue['customer_visit_id']){
+//                    $sub[] = $sonValue;
+//                }
+//            }
+//            $value['sub'] = $sub;
+//            $lists[$key] = $value;
+//        }
+//        return $lists;
+//    }
 }
 }

@@ -149,7 +149,7 @@ class WebTrafficRussia extends Command
      * 概率值
      * 概率值
      * @var int[]
      * @var int[]
      */
      */
-    protected $sjjg = [360, 640];//访问间隔占比  访问|不访问  比非俄语站降一半
+    protected $sjjg = [480, 520];//访问间隔占比  访问|不访问  比非俄语站降一半
     //访问页面类型占比  产品详情页、单页|产品分类页
     //访问页面类型占比  产品详情页、单页|产品分类页
     protected $ymzb = [
     protected $ymzb = [
         'urls_cats' => 700,
         'urls_cats' => 700,