周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 5c11c6e969f89b7832ddb196e7f577da44a871de 2 个父辈 32e7c99f f1b6703d

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 31 行增加 和 55 行删除
... ... @@ -4,10 +4,10 @@ namespace App\Console\Commands\Project;
use App\Helper\Arr;
use App\Models\Product\Product;
use App\Models\Project\Project;
use App\Services\ProjectServer;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Redis;
class ThumbProjectImage extends Command
{
... ... @@ -16,7 +16,7 @@ class ThumbProjectImage extends Command
*
* @var string
*/
protected $signature = 'thumb_project_image {project_id}';
protected $signature = 'thumb_project_image';
/**
* The console command description.
... ... @@ -27,68 +27,38 @@ class ThumbProjectImage extends Command
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');
$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) {
Product::select(['id', 'project_id', 'gallery'])->chunk(100, function ($products) use ($thumb_w) {
foreach ($products as $product) {
$thumb = $product->thumb;
$thumb = $product['gallery'][0] ?? [];
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);
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');
}
$this->output('project_id:' . $product->project_id . ',product_id:' . $product->id . ',thumb:' . $thumb_w . ' | success');
}
}
}
... ... @@ -98,8 +68,8 @@ class ThumbProjectImage extends Command
}
$this->output('project_id:' . $project_id . ' | end');
}
}
return true;
}
... ...
... ... @@ -1468,7 +1468,8 @@ function diffInHours($startTime, $endTime)
return round($hours, 1);
}
/**
if (!function_exists('thumbImageByUrl')) {
/**
* 通过图片地址压缩图片
* @param $url
* @param int $width
... ... @@ -1476,8 +1477,8 @@ function diffInHours($startTime, $endTime)
* @author Akun
* @date 2025/09/01 15:18
*/
function thumbImageByUrl($url, $width = 360)
{
function thumbImageByUrl($url, $width = 360)
{
if (empty($url)) {
return $url;
}
... ... @@ -1486,10 +1487,6 @@ function thumbImageByUrl($url, $width = 360)
return $url;
}
if (strpos($url, '_thumb') !== false) {
return $url;
}
//获取图片完整访问地址
$url_complete = getImageUrl($url, 0, 0, 0);//先用v6-file地址
if (strpos($url_complete, 'v6-file') !== false) {
... ... @@ -1526,10 +1523,11 @@ function thumbImageByUrl($url, $width = 360)
$url = $thumb_url ? $thumb_url : $url;
} catch (\Exception $e) {
Log::channel('thumb_img')->error($e->getMessage(), [$url, $width]);
Log::channel('thumb_img')->error($e->getMessage(), [$url_complete, $width]);
}
return $url;
}
}
if (!function_exists('checkRemoteFileExists')) {
... ...
... ... @@ -59,6 +59,7 @@ use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log as LogInfo;
use Illuminate\Support\Facades\Redis;
/**
* Class ProjectLogic
... ... @@ -528,6 +529,13 @@ class ProjectLogic extends BaseLogic
protected function saveProjectDeployBuild($deploy_build){
$deployBuildModel = new DeployBuild();
$deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
//如果更改了缩略图压缩大小，同步写入处理缩略图任务队列
$old_thumb_info = $deployBuildModel->read(['id'=>$deploy_build['id']],['thumb_w']);
if(isset($old_thumb_info['thumb_w']) && $old_thumb_info['thumb_w'] != $deploy_build['thumb_w']){
Redis::lpush('thumb_project_image',$deploy_build['project_id']);
}
$deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
return $this->success();
}
... ...