合并分支 'akun' 到 'master'

Akun



查看合并请求 !2778

@@ -8,6 +8,7 @@ use App\Models\Project\Project;
 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;
+use Illuminate\Support\Facades\Redis;
 
 
 class ThumbProjectImage extends Command
 class ThumbProjectImage extends Command
 {
 {
@@ -16,7 +17,7 @@ class ThumbProjectImage extends Command
      *
      *
      * @var string
      * @var string
      */
      */
-    protected $signature = 'thumb_project_image {project_id}';
+    protected $signature = 'thumb_project_image';
 
 
     /**
     /**
      * The console command description.
      * The console command description.
@@ -27,60 +28,31 @@ class ThumbProjectImage extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $project_id = $this->argument('project_id');
-
-        if ($project_id > 0) {
-            //指定项目
-            $this->output('project_id:' . $project_id . ' | start');
-
-            $project_info = ProjectServer::useProject($project_id);
-
-            if ($project_info) {
-                $thumb_w = $project_info->deploy_build->thumb_w ?? 0;
-                Product::select(['id', 'project_id', 'thumb'])->chunk(100, function ($products) use ($thumb_w) {
-                    foreach ($products as $product) {
-                        $thumb = $product->thumb;
-                        if (isset($thumb['url']) && $thumb['url']) {
-                            $new_thumb = thumbImageByUrl($thumb['url'], $thumb_w);
-                            if ($new_thumb != $thumb['url']) {
-                                $thumb['url'] = $new_thumb;
-                                $json_thumb = Arr::a2s($thumb);
-                                if (strlen($json_thumb) <= 500) {
-                                    $product->timestamps = false;
-                                    $product->thumb = $json_thumb;
-                                    $product->save();
-
-                                    $this->output('project_id:' . $product->project_id . ',product_id:' . $product->id . ' | success');
-                                }
+        while (true) {
+            $this->start_thumb();
         }
         }
     }
     }
-                    }
-                });
 
 
-                DB::disconnect('custom_mysql');
+    public function start_thumb()
+    {
+        $key = 'thumb_project_image';
+        $project_id = Redis::rpop($key);
+        if (empty($project_id)) {
+            sleep(60);
+            return true;
         }
         }
 
 
-            $this->output('project_id:' . $project_id . ' | end');
-        } else {
-            //所有项目
-            $projectModel = new Project();
-            $list = $projectModel->list(['delete_status' => 0, 'is_upgrade' => 0, 'type' => ['in', [1, 2, 3, 4, 6]]], 'id', ['id'], 'asc');
-            foreach ($list as $k => $v) {
-                $project_id = $v['id'];
-
         $this->output('project_id:' . $project_id . ' | start');
         $this->output('project_id:' . $project_id . ' | start');
 
 
         $project_info = ProjectServer::useProject($project_id);
         $project_info = ProjectServer::useProject($project_id);
 
 
         if ($project_info) {
         if ($project_info) {
             $thumb_w = $project_info->deploy_build->thumb_w ?? 0;
             $thumb_w = $project_info->deploy_build->thumb_w ?? 0;
-                    Product::select(['id', 'project_id', 'thumb'])->chunk(100, function ($products) use ($thumb_w) {
+            Product::select(['id', 'project_id', 'gallery'])->chunk(100, function ($products) use ($thumb_w) {
                 foreach ($products as $product) {
                 foreach ($products as $product) {
-                            $thumb = $product->thumb;
+                    $thumb = $product['gallery'][0] ?? [];
                     if (isset($thumb['url']) && $thumb['url']) {
                     if (isset($thumb['url']) && $thumb['url']) {
-                                $new_thumb = thumbImageByUrl($thumb['url'], $thumb_w);
-                                if ($new_thumb != $thumb['url']) {
-                                    $thumb['url'] = $new_thumb;
+                        $thumb['url'] = thumbImageByUrl($thumb['url'], $thumb_w);
                         $json_thumb = Arr::a2s($thumb);
                         $json_thumb = Arr::a2s($thumb);
                         if (strlen($json_thumb) <= 500) {
                         if (strlen($json_thumb) <= 500) {
                             $product->timestamps = false;
                             $product->timestamps = false;
@@ -91,15 +63,14 @@ class ThumbProjectImage extends Command
                         }
                         }
                     }
                     }
                 }
                 }
-                        }
             });
             });
 
 
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
 
 
         $this->output('project_id:' . $project_id . ' | end');
         $this->output('project_id:' . $project_id . ' | end');
-            }
-        }
+
+        return true;
     }
     }
 
 
 
 

@@ -1486,10 +1486,6 @@ function thumbImageByUrl($url, $width = 360)
         return $url;
         return $url;
     }
     }
 
 
-    if (strpos($url, '_thumb') !== false) {
-        return $url;
-    }
-
     //获取图片完整访问地址
     //获取图片完整访问地址
     $url_complete = getImageUrl($url, 0, 0, 0);//先用v6-file地址
     $url_complete = getImageUrl($url, 0, 0, 0);//先用v6-file地址
     if (strpos($url_complete, 'v6-file') !== false) {
     if (strpos($url_complete, 'v6-file') !== false) {