周海龙 / 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 @@ -32,39 +32,37 @@ class SyncImage extends Command
32 protected $description = '同步图片与文件'; 32 protected $description = '同步图片与文件';
33 33
34 34
  35 + public function handle(){
  36 + $str = $this->getProjectConfig(1808);
  37 + $imageModel = new Image();
  38 + $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';
  39 + $lists = explode(',',$str_image);
  40 + $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
  41 + foreach ($lists as $v){
  42 + $url = $domain . $v.'?'.$str;
  43 + echo date('Y-m-d H:i:s') . '水印路径:'. $url .',主键id：'. $v . PHP_EOL;
  44 + $this->coverOriginalImage($url,$v);
  45 + }
  46 + return true;
  47 + }
  48 +
35 // public function handle(){ 49 // public function handle(){
36 -// $str = $this->getProjectConfig(501); 50 +// $data = [];
  51 +// $domain = 'https://ecdn6-nc.globalso.com/';
37 // $imageModel = new Image(); 52 // $imageModel = new Image();
38 -// $lists = $imageModel->list(['project_id'=>501]);  
39 -// $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名 53 +// $lists = $imageModel->list(['project_id'=>1808]);
40 // foreach ($lists as $k => $v){ 54 // foreach ($lists as $k => $v){
41 // if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){ 55 // if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){
42 // continue; 56 // continue;
43 // } 57 // }
44 -// $url = $domain . $v['path'].'?'.$str;  
45 -// echo date('Y-m-d H:i:s') . '水印路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;  
46 -// $this->coverOriginalImage($url,$v['path']); 58 +// $url = $domain . $v['path'];
  59 +// echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
  60 +// $data[] = $url;
47 // } 61 // }
48 -// return true; 62 +// $yunService = new UpyunService();
  63 +// return $yunService->preheatPush($data);
49 // } 64 // }
50 65
51 - public function handle(){  
52 - $data = [];  
53 - $domain = 'https://ecdn6-nc.globalso.com/';  
54 - $imageModel = new Image();  
55 - $lists = $imageModel->list(['project_id'=>501]);  
56 - foreach ($lists as $k => $v){  
57 - if($v['path'] == '/upload/p/501/image_product/2024-09/6569ac3a212aa39368.png'){  
58 - continue;  
59 - }  
60 - $url = $domain . $v['path'];  
61 - echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;  
62 - $data[] = $url;  
63 - }  
64 - $yunService = new UpyunService();  
65 - return $yunService->preheatPush($data);  
66 - }  
67 -  
68 /** 66 /**
69 * @remark :添加水印后保存图片（覆盖/非覆盖的文件未存入数据库） 67 * @remark :添加水印后保存图片（覆盖/非覆盖的文件未存入数据库）
70 * @name :uploadImages 68 * @name :uploadImages
@@ -277,8 +277,8 @@ class TranslateLogic extends BaseLogic @@ -277,8 +277,8 @@ class TranslateLogic extends BaseLogic
277 if($this->param['url'] == 'other_all_text'){ 277 if($this->param['url'] == 'other_all_text'){
278 $this->param['language_id'] = 0; 278 $this->param['language_id'] = 0;
279 } 279 }
280 -// DB::beginTransaction();  
281 -// try { 280 + DB::beginTransaction();
  281 + try {
282 $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]); 282 $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
283 if($info === false){ 283 if($info === false){
284 $sourceInfo = $this->getRouteSource($sendData['new_route']); 284 $sourceInfo = $this->getRouteSource($sendData['new_route']);
@@ -303,11 +303,11 @@ class TranslateLogic extends BaseLogic @@ -303,11 +303,11 @@ class TranslateLogic extends BaseLogic
303 //写日志 303 //写日志
304 $userLogModel = new UserLog(); 304 $userLogModel = new UserLog();
305 $userLogModel->add(['model'=>'translate/save','remark'=>json_encode($this->param,true),'type'=>0,'operator_id'=>$this->user['id'],'project_id'=>$this->user['project_id']]); 305 $userLogModel->add(['model'=>'translate/save','remark'=>json_encode($this->param,true),'type'=>0,'operator_id'=>$this->user['id'],'project_id'=>$this->user['project_id']]);
306 -// DB::commit();  
307 -// }catch (\Exception $e){  
308 -// DB::rollback();  
309 -// $this->fail('系统错误请联系管理员');  
310 -// } 306 + DB::commit();
  307 + }catch (\Exception $e){
  308 + DB::rollback();
  309 + $this->fail('系统错误请联系管理员');
  310 + }
311 $this->sendMessage($sendData); 311 $this->sendMessage($sendData);
312 return $this->success(); 312 return $this->success();
313 } 313 }