作者 lyh

gx

@@ -207,8 +207,9 @@ class ImageController extends Controller @@ -207,8 +207,9 @@ class ImageController extends Controller
207 $fileName = $this->getOnlyFilename($name,$param['project_id'] ?? 0); 207 $fileName = $this->getOnlyFilename($name,$param['project_id'] ?? 0);
208 //上传到cos 208 //上传到cos
209 if($this->upload_location == 0){ 209 if($this->upload_location == 0){
  210 + $watermarkOptions = $this->getProjectConfig($this->cache['project_id'] ?? 0);
210 $cosService = new CosService(); 211 $cosService = new CosService();
211 - $cosService->uploadFile($files,$this->path,$fileName); 212 + $cosService->uploadFile($file,$this->path,$fileName,$watermarkOptions);
212 }else{ 213 }else{
213 //TODO::上传亚马逊 214 //TODO::上传亚马逊
214 $amazonS3Service = new AmazonS3Service(); 215 $amazonS3Service = new AmazonS3Service();