|
@@ -209,7 +209,7 @@ class ImageController extends Controller |
|
@@ -209,7 +209,7 @@ class ImageController extends Controller |
|
209
|
if($this->upload_location == 0){
|
209
|
if($this->upload_location == 0){
|
|
210
|
$watermarkOptions = $this->getProjectConfig($this->cache['project_id'] ?? 0);
|
210
|
$watermarkOptions = $this->getProjectConfig($this->cache['project_id'] ?? 0);
|
|
211
|
$cosService = new CosService();
|
211
|
$cosService = new CosService();
|
|
212
|
- $cosService->uploadFile($file,$this->path,$fileName,$watermarkOptions);
|
212
|
+ $cosService->uploadFile($file,$this->path,$fileName,false,$watermarkOptions);
|
|
213
|
}else{
|
213
|
}else{
|
|
214
|
//TODO::上传亚马逊
|
214
|
//TODO::上传亚马逊
|
|
215
|
$amazonS3Service = new AmazonS3Service();
|
215
|
$amazonS3Service = new AmazonS3Service();
|
|
@@ -343,7 +343,7 @@ class ImageController extends Controller |
|
@@ -343,7 +343,7 @@ class ImageController extends Controller |
|
343
|
if($this->upload_location == 0){
|
343
|
if($this->upload_location == 0){
|
|
344
|
$watermarkOptions = $this->getProjectConfig($this->cache['project_id'] ?? 0);
|
344
|
$watermarkOptions = $this->getProjectConfig($this->cache['project_id'] ?? 0);
|
|
345
|
$cosService = new CosService();
|
345
|
$cosService = new CosService();
|
|
346
|
- $cosService->uploadFile($file,$this->path,$fileName,$watermarkOptions);
|
346
|
+ $cosService->uploadFile($file,$this->path,$fileName,false,$watermarkOptions);
|
|
347
|
}else{
|
347
|
}else{
|
|
348
|
//TODO::上传亚马逊
|
348
|
//TODO::上传亚马逊
|
|
349
|
$amazonS3Service = new AmazonS3Service();
|
349
|
$amazonS3Service = new AmazonS3Service();
|