周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 643e2fada5d8a2d85ef6cf1e3fccf6cad7283c63 2 个父辈 819f19fc 5baef218

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 29 行增加 和 31 行删除
... ... @@ -32,39 +32,37 @@ class SyncImage extends Command
protected $description = '同步图片与文件';
public function handle(){
$str = $this->getProjectConfig(1808);
$imageModel = new Image();
$str_image = '/upload/p/1808/image_product/2024-09/ppp.png,/upload/p/1808/image_product/2024-09/86e4866b-7432-40c1-8c06-d335cd736e29.png,/upload/p/1808/image_product/2024-09/7fd109cc-56f4-457c-a9c4-c3fa8d8195b2.png,/upload/p/1808/image_product/2024-09/1.png,/upload/p/1808/image_product/2024-08/bxb12501-3-1.png,/upload/p/1808/image_product/2024-08/bxa10801-3-1.png,/upload/p/1808/image_product/2024-08/bxa007-3-1.png,/upload/p/1808/image_product/2024-08/auto-parts-rectifier-bxf1070-for-alternator-1-1.png,/upload/p/1808/image_product/2024-08/auto-parts-rectifier-bxd1102-for-alternator-2-1.png,/upload/p/1808/image_product/2024-08/11407-3-1.png,/upload/p/1808/image_product/2024-07/gfjty.jpg,/upload/p/1808/image_product/2024-07/bxn11508-g1-2.png,/upload/p/1808/image_product/2024-07/bxn11508-g1-1.png,/upload/p/1808/image_product/2024-07/bxb12501-2.png,/upload/p/1808/image_product/2024-07/bxb12501-1.png,/upload/p/1808/image_product/2024-07/bxb1209-2.png,/upload/p/1808/image_product/2024-07/bxb1209-1.png,/upload/p/1808/image_product/2024-07/bxa10801-2.png,/upload/p/1808/image_product/2024-07/bxa10801-1.png,/upload/p/1808/image_product/2024-07/bxa007-2.png,/upload/p/1808/image_product/2024-07/bxa007-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf6102-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf1070-for-alternator-3.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxf1070-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd9410-for-alternator-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd1102-for-alternator-3.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxd1102-for-alternator-1.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxb12807-for-alternator-2.png,/upload/p/1808/image_product/2024-07/auto-parts-rectifier-bxb12807-for-alternator-1.png,/upload/p/1808/image_product/2024-07/11407-2.png,/upload/p/1808/image_product/2024-07/11407-1.png';
$lists = explode(',',$str_image);
$domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
foreach ($lists as $v){
$url = $domain . $v.'?'.$str;
echo date('Y-m-d H:i:s') . '水印路径:'. $url .',主键id：'. $v . PHP_EOL;
$this->coverOriginalImage($url,$v);
}
return true;
}
// public function handle(){
// $str = $this->getProjectConfig(501);
// $data = [];
// $domain = 'https://ecdn6-nc.globalso.com/';
// $imageModel = new Image();
// $lists = $imageModel->list(['project_id'=>501]);
// $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
// $lists = $imageModel->list(['project_id'=>1808]);
// foreach ($lists as $k => $v){
// if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){
// continue;
// }
// $url = $domain . $v['path'].'?'.$str;
// echo date('Y-m-d H:i:s') . '水印路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
// $this->coverOriginalImage($url,$v['path']);
// $url = $domain . $v['path'];
// echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
// $data[] = $url;
// }
// return true;
// $yunService = new UpyunService();
// return $yunService->preheatPush($data);
// }
public function handle(){
$data = [];
$domain = 'https://ecdn6-nc.globalso.com/';
$imageModel = new Image();
$lists = $imageModel->list(['project_id'=>501]);
foreach ($lists as $k => $v){
if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){
continue;
}
$url = $domain . $v['path'];
echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
$data[] = $url;
}
$yunService = new UpyunService();
return $yunService->preheatPush($data);
}
/**
* @remark :添加水印后保存图片（覆盖/非覆盖的文件未存入数据库）
* @name :uploadImages
... ...
... ... @@ -277,8 +277,8 @@ class TranslateLogic extends BaseLogic
if($this->param['url'] == 'other_all_text'){
$this->param['language_id'] = 0;
}
// DB::beginTransaction();
// try {
DB::beginTransaction();
try {
$info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
if($info === false){
$sourceInfo = $this->getRouteSource($sendData['new_route']);
... ... @@ -303,11 +303,11 @@ class TranslateLogic extends BaseLogic
//写日志
$userLogModel = new UserLog();
$userLogModel->add(['model'=>'translate/save','remark'=>json_encode($this->param,true),'type'=>0,'operator_id'=>$this->user['id'],'project_id'=>$this->user['project_id']]);
// DB::commit();
// }catch (\Exception $e){
// DB::rollback();
// $this->fail('系统错误请联系管理员');
// }
DB::commit();
}catch (\Exception $e){
DB::rollback();
$this->fail('系统错误请联系管理员');
}
$this->sendMessage($sendData);
return $this->success();
}
... ...