ouyang/lsky-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
WispX
2020-03-02 07:22:23 +08:00
parent c120f78a67 4af1db0b18
commit 0a254dc22c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/api/controller/Upload.php
+2 -2
View File
@@ -16,7 +16,7 @@ class Upload extends Base
public function initialize()
{
// 是否允许游客上传
$token = $this->request->header('token', $this->request->input('token'));
$token = $this->request->header('token', $this->param('token'));
if (!$this->config['allowed_tourist_upload']) {
$token && $this->auth($token);
} else {
@@ -32,7 +32,7 @@ class Upload extends Base
Db::startTrans();
try {
$data = (action('index/upload/execute'))->execute($this->user);
$data = (new \app\index\controller\Upload)->execute($this->user);
Db::commit();
} catch (Exception $e) {
application/index/controller/Upload.php
+2 -2
View File
@@ -173,8 +173,8 @@ class Upload extends Base
];
if ($this->user) {
$data['quota'] = sprintf('%.2f', (float)$user->quota);
$data['use_quota'] = sprintf('%.2f', (float)$user->use_quota);
$data['quota'] = sprintf('%.2f', (float)$this->user->quota);
$data['use_quota'] = sprintf('%.2f', (float)$this->user->use_quota);
}
return $data;