hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化上传通用返回方法，增加额外属性返回

pull/516/MERGE
Karson 2025-12-18 15:13:58 +08:00
parent 5631ca6dec
commit cee5f9b252
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Ajax.php
View File

@ -96,7 +96,7 @@ class Ajax extends Backend
} catch (UploadException $e) { } catch (UploadException $e) {
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
$this->success(__('Uploaded successful'), '', ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); $this->success(__('Uploaded successful'), '', $attachment->getBaseData());
} elseif ($method == 'clean') { } elseif ($method == 'clean') {
//删除冗余的分片文件 //删除冗余的分片文件
try { try {
@ -129,7 +129,7 @@ class Ajax extends Backend
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
$this->success(__('Uploaded successful'), '', ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); $this->success(__('Uploaded successful'), '', $attachment->getBaseData());
} }
} }

4
application/api/controller/Common.php
View File

@ -106,7 +106,7 @@ class Common extends Api
} catch (UploadException $e) { } catch (UploadException $e) {
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
$this->success(__('Uploaded successful'), ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); $this->success(__('Uploaded successful'), $attachment->getBaseData());
} elseif ($method == 'clean') { } elseif ($method == 'clean') {
//删除冗余的分片文件 //删除冗余的分片文件
try { try {
@ -141,7 +141,7 @@ class Common extends Api
$this->error($e->getMessage()); $this->error($e->getMessage());
} }
$this->success(__('Uploaded successful'), ['url' => $attachment->url, 'fullurl' => cdnurl($attachment->url, true)]); $this->success(__('Uploaded successful'), $attachment->getBaseData());
} }
} }

16
application/common/model/Attachment.php
View File

@ -95,4 +95,20 @@ class Attachment extends Model
$data['unclassed'] = __('Unclassed'); $data['unclassed'] = __('Unclassed');
return $data; return $data;
} }
/**
* 返回上传文件的相关信息
*/
public function getBaseData()
{
$data = [
'url' => $this->url,
'fullurl' => cdnurl($this->url, true),
'category' => $this->category,
'filename' => $this->filename,
'filesize' => $this->filesize,
'mimetype' => $this->mimetype,
];
return $data;
}
} }