diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index c039e2f..0fc38a4 100644 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -259,7 +259,7 @@ class Common extends BaseController $data['action'] = app('request')->action(); $data['uploadip'] = app('request')->ip(); $data['create_time'] = time(); - $data['user_id'] = get_login_admin('id') ? get_login_admin('id') : 0; + $data['user_id'] = JWT_UID ? JWT_UID : 0; if ($data['module'] = 'admin') { //通过后台上传的文件直接审核通过 $data['status'] = 1; @@ -271,7 +271,7 @@ class Common extends BaseController $res['filepath'] = $data['filepath']; $res['name'] = $data['name']; $res['filename'] = $data['filename']; - add_log('upload', $data['user_id'], $data); +// add_log('upload', $data['user_id'], $data); if($sourse == 'editormd'){ //editormd编辑器上传返回 return json(['success'=>1,'message'=>'上传成功','url'=>$data['filepath']]); @@ -282,7 +282,10 @@ class Common extends BaseController } else{ //普通上传返回 - return to_assign(0, '上传成功', $res); +// return to_assign(0, '上传成功', $res); + $this->apiSuccess('上传成功', [ + 'url' =>$data['filepath'], + ]); } } else { return to_assign(1, '上传失败,请重试');