jsasg/orico-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix: 上传图片水印处理

Browse Source
This commit is contained in:
jsasg
2025-06-11 16:51:13 +08:00
parent aa4d5b5f31
commit adbfc34f9d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/controller/v1/Upload.php
View File

@@ -42,7 +42,7 @@ class Upload
$filemd5 = $file->md5(); $filemd5 = $file->md5();
$filesha1 = $file->sha1(); $filesha1 = $file->sha1();
$image_model = SysImageUploadRecordModel::md5($filemd5)->find(); $image_model = null; // SysImageUploadRecordModel::md5($filemd5)->find();
if (is_null($image_model)) { if (is_null($image_model)) {
$filename = Filesystem::disk('image')->putFile($param['module'], $file); $filename = Filesystem::disk('image')->putFile($param['module'], $file);
// 处理图片 // 处理图片
@@ -62,7 +62,7 @@ class Upload
// 读取水印图片 // 读取水印图片
$watermark_image = $image_manager->read(public_path() . $image_options['image']); $watermark_image = $image_manager->read(public_path() . $image_options['image']);
// 缩放水印图片 // 缩放水印图片
$watermark_image->scale((int)$image_options['width'], (int)$image_options['height']); $watermark_image->scale($image_options['width'], $image_options['height']);
// 绘制水印图片 // 绘制水印图片
$image->place( $image->place(
$watermark_image, $watermark_image,
@@ -170,8 +170,8 @@ class Upload
], ],
'image_options' => [ 'image_options' => [
'image' => data_get($watermark_config, 'watermark_image_value.value', ''), 'image' => data_get($watermark_config, 'watermark_image_value.value', ''),
'width' => data_get($watermark_config, 'watermark_image_width.value', null), 'width' => (int)data_get($watermark_config, 'watermark_image_width.value')?:null,
'height' => data_get($watermark_config, 'watermark_image_height.value', null), 'height' => (int)data_get($watermark_config, 'watermark_image_height.value')?:null,
'position' => data_get($watermark_config, 'watermark_position.value', 'top-left'), 'position' => data_get($watermark_config, 'watermark_position.value', 'top-left'),
'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0), 'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0),
'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0), 'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),