作者 lyh

gx

@@ -378,6 +378,7 @@ class ImageController extends Controller @@ -378,6 +378,7 @@ class ImageController extends Controller
378 } 378 }
379 $image_data[$k] = $arr; 379 $image_data[$k] = $arr;
380 } 380 }
  381 + return $image_data;
381 } 382 }
382 if($settingInfo['status'] == 2 && !empty($settingInfo['str_data'])){ 383 if($settingInfo['status'] == 2 && !empty($settingInfo['str_data'])){
383 $str_data = json_decode($settingInfo['str_data'],true); 384 $str_data = json_decode($settingInfo['str_data'],true);
@@ -395,6 +396,7 @@ class ImageController extends Controller @@ -395,6 +396,7 @@ class ImageController extends Controller
395 $str_data[$k] = $arr; 396 $str_data[$k] = $arr;
396 } 397 }
397 } 398 }
  399 + return $str_data;
398 } 400 }
399 return null; 401 return null;
400 } 402 }
@@ -40,6 +40,7 @@ class CosService @@ -40,6 +40,7 @@ class CosService
40 'Key' => $key, 40 'Key' => $key,
41 'Body' => $Body, 41 'Body' => $Body,
42 ]; 42 ];
  43 + @file_put_contents(storage_path('logs/lyh_error.log'), var_export($watermarkOptions, true) . PHP_EOL, FILE_APPEND);
43 //水印 44 //水印
44 if ($watermarkOptions) { 45 if ($watermarkOptions) {
45 $options['Pic-Operations'] = json_encode([ 46 $options['Pic-Operations'] = json_encode([