diff --git a/app/common.php b/app/common.php index a4b5b6d2..9dfd5f18 100755 --- a/app/common.php +++ b/app/common.php @@ -22,7 +22,7 @@ function is_login() { $module = ""; } $user = Session::get(strtolower($module) . 'Info'); - return $user['uid']; + return isset($user['uid']) ? $user['uid'] : false; } /** diff --git a/app/controller/Upload.php b/app/controller/Upload.php index cf537639..4be98a0a 100644 --- a/app/controller/Upload.php +++ b/app/controller/Upload.php @@ -153,18 +153,19 @@ class Upload extends Base { protected function save($request, $upload_type){ $data = []; $file= $request->file('file'); - $data['savename'] = $request->param('name'); - $data['name'] = $request->param('name'); $data['type'] = $upload_type; $data['mime'] = $request->param('type'); $data['size'] = $file->getSize(); //文件大小,单位字节 $data['md5'] = md5_file($file->getPathname()); $data['sha1'] = sha1_file($file->getPathname()); - $data['ext'] = pathinfo($data['savename'], PATHINFO_EXTENSION); //文件扩展名 - $data['savepath'] = Filesystem::disk('public')->putFile($upload_type, $file, 'md5'); + $data['savepath'] = str_replace("\\", "/", Filesystem::disk('public')->putFile($upload_type, $file, 'md5')); + $data['ext'] = pathinfo($data['savepath'], PATHINFO_EXTENSION); //文件扩展名 $data['location'] = "/uploads/"; $data['url'] = $data['location'] . $data['savepath']; + $data['real_url'] = $request->domain() . $data['url']; $data['create_time'] = time(); + $data['savename'] = $request->param('name', $data['savepath']); + $data['name'] = $request->param('name', $data['savepath']); $attach = Attach::create($data); $data['id'] = $attach->id; return $data;