作者 lyh

修复可视化bug

@@ -516,6 +516,26 @@ class ImageController extends Controller @@ -516,6 +516,26 @@ class ImageController extends Controller
516 } 516 }
517 517
518 /** 518 /**
  519 + * @remark :覆盖原图
  520 + * @name :coverOriginalImage
  521 + * @author :lyh
  522 + * @method :post
  523 + * @time :2024/8/21 11:45
  524 + */
  525 + public function coverOriginalImage(){
  526 + $this->request->validate([
  527 + 'url'=>['required'],
  528 + 'saveUrl'=>['required'],
  529 + ],[
  530 + 'url.required'=>'请填写预览的链接',
  531 + 'saveUrl.required'=>'保存的路径',
  532 + ]);
  533 + $cos = new CosService();
  534 + $url = $cos->coverOriginalImage($this->param['url'],$this->param['saveUrl']);
  535 + $this->response('success',Code::SUCCESS,['url'=>$url]);
  536 + }
  537 +
  538 + /**
519 * @remark :设置图片水印 539 * @remark :设置图片水印
520 * @name :setWatermark 540 * @name :setWatermark
521 * @author :lyh 541 * @author :lyh
@@ -187,13 +187,13 @@ class CosService @@ -187,13 +187,13 @@ class CosService
187 $url = $domain . $cdnUrl; 187 $url = $domain . $cdnUrl;
188 if($is_image){ 188 if($is_image){
189 $param = [ 189 $param = [
190 - 'image/'.$this->urlSafeBase64Encode($domain.$data['image'] ?? ''),//文字水印名称 190 + 'image/'.$this->urlSafeBase64Encode($domain.$data['image'] ?? ''),//图片
191 'gravity/'.($data['gravity'] ?? 'SouthEast'), 191 'gravity/'.($data['gravity'] ?? 'SouthEast'),
192 'dx/'.($data['dx'] ?? 0), 192 'dx/'.($data['dx'] ?? 0),
193 'dy/'. ($data['dy'] ?? 0), 193 'dy/'. ($data['dy'] ?? 0),
194 'batch/'.($data['batch'] ?? 0),//平铺水印功能 194 'batch/'.($data['batch'] ?? 0),//平铺水印功能
195 'dissolve/'.($data['dissolve'] ?? 50),//透明度 195 'dissolve/'.($data['dissolve'] ?? 50),//透明度
196 - 'degree/'.($data['degree'] ?? 0),//文字水印的旋转角度设置,取值范围为0 - 360,默认0 196 + 'degree/'.($data['degree'] ?? 0),//旋转角度设置,取值范围为0 - 360,默认0
197 ]; 197 ];
198 $url = $url.'?watermark/1/'.implode('/',$param); 198 $url = $url.'?watermark/1/'.implode('/',$param);
199 }else{ 199 }else{
@@ -216,13 +216,13 @@ class CosService @@ -216,13 +216,13 @@ class CosService
216 } 216 }
217 217
218 /** 218 /**
219 - * @remark :添加水印后保存图片(覆盖) 219 + * @remark :添加水印后保存图片(覆盖/非覆盖的文件未存入数据库
220 * @name :uploadImages 220 * @name :uploadImages
221 * @author :lyh 221 * @author :lyh
222 * @method :post 222 * @method :post
223 * @time :2024/8/19 17:06 223 * @time :2024/8/19 17:06
224 */ 224 */
225 - public function uploadImages($url,$cdnUrl){ 225 + public function coverOriginalImage($url,$cdnUrl){
226 // 获取水印后的图片内容 226 // 获取水印后的图片内容
227 $imageContent = file_get_contents($url); 227 $imageContent = file_get_contents($url);
228 // 使用 COS SDK 将图片重新上传并覆盖原图 228 // 使用 COS SDK 将图片重新上传并覆盖原图
@@ -319,6 +319,7 @@ Route::middleware(['bloginauth'])->group(function () { @@ -319,6 +319,7 @@ Route::middleware(['bloginauth'])->group(function () {
319 Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont'); 319 Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont');
320 Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition'); 320 Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition');
321 Route::post('/setWatermark', [\App\Http\Controllers\File\ImageController::class, 'setWatermark'])->name('images_setWatermark'); 321 Route::post('/setWatermark', [\App\Http\Controllers\File\ImageController::class, 'setWatermark'])->name('images_setWatermark');
  322 + Route::post('/coverOriginalImage', [\App\Http\Controllers\File\ImageController::class, 'coverOriginalImage'])->name('images_coverOriginalImage');
322 Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList'); 323 Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
323 }); 324 });
324 //文件操作 325 //文件操作