作者 刘锟

合并分支 'akun' 到 'master'

update



查看合并请求 !2711
@@ -40,6 +40,7 @@ class ThumbProjectImage extends Command @@ -40,6 +40,7 @@ class ThumbProjectImage extends Command
40 $thumb = $product->thumb; 40 $thumb = $product->thumb;
41 if (isset($thumb['url']) && $thumb['url']) { 41 if (isset($thumb['url']) && $thumb['url']) {
42 $thumb['url'] = thumbImageByUrl($thumb['url']); 42 $thumb['url'] = thumbImageByUrl($thumb['url']);
  43 + $product->timestamps = false;
43 $product->thumb = Arr::a2s($thumb); 44 $product->thumb = Arr::a2s($thumb);
44 $product->save(); 45 $product->save();
45 } 46 }
@@ -52,7 +53,7 @@ class ThumbProjectImage extends Command @@ -52,7 +53,7 @@ class ThumbProjectImage extends Command
52 } else { 53 } else {
53 //所有项目 54 //所有项目
54 $projectModel = new Project(); 55 $projectModel = new Project();
55 - $list = $projectModel->list(['id' => 2, 'delete_status' => 0, 'type' => ['in', [1, 2, 3, 4, 6]]], 'id', ['id'], 'asc'); 56 + $list = $projectModel->list(['delete_status' => 0, 'type' => ['in', [1, 2, 3, 4, 6]]], 'id', ['id'], 'asc');
56 foreach ($list as $k => $v) { 57 foreach ($list as $k => $v) {
57 $project_id = $v['id']; 58 $project_id = $v['id'];
58 59
@@ -65,7 +66,9 @@ class ThumbProjectImage extends Command @@ -65,7 +66,9 @@ class ThumbProjectImage extends Command
65 $thumb = $product->thumb; 66 $thumb = $product->thumb;
66 if (isset($thumb['url']) && $thumb['url']) { 67 if (isset($thumb['url']) && $thumb['url']) {
67 $thumb['url'] = thumbImageByUrl($thumb['url']); 68 $thumb['url'] = thumbImageByUrl($thumb['url']);
68 - Product::where(['id' => $product->id])->update(['thumb' => Arr::a2s($thumb)]); 69 + $product->timestamps = false;
  70 + $product->thumb = Arr::a2s($thumb);
  71 + $product->save();
69 } 72 }
70 } 73 }
71 }); 74 });