eee
Showing
2 changed files
with
11 additions
and
4 deletions
| ... | @@ -37,8 +37,7 @@ class FileEntryController extends Controller { | ... | @@ -37,8 +37,7 @@ class FileEntryController extends Controller { |
| 37 | return redirect('fileentry'); | 37 | return redirect('fileentry'); |
| 38 | 38 | ||
| 39 | } | 39 | } |
| 40 | 40 | public function getone($folder, $filename){ | |
| 41 | public function get($folder, $filename){ | ||
| 42 | 41 | ||
| 43 | //$entry = Fileentry::where('filename', '=', $filename)->firstOrFail(); | 42 | //$entry = Fileentry::where('filename', '=', $filename)->firstOrFail(); |
| 44 | $file = Storage::disk('public')->get($folder.'/'.$filename); | 43 | $file = Storage::disk('public')->get($folder.'/'.$filename); |
| ... | @@ -46,4 +45,12 @@ class FileEntryController extends Controller { | ... | @@ -46,4 +45,12 @@ class FileEntryController extends Controller { |
| 46 | return (new Response($file, 200)) | 45 | return (new Response($file, 200)) |
| 47 | ->header('Content-Type', 'image/jpeg'); | 46 | ->header('Content-Type', 'image/jpeg'); |
| 48 | } | 47 | } |
| 48 | public function get($filename){ | ||
| 49 | |||
| 50 | $entry = Fileentry::where('filename', '=', $filename)->firstOrFail(); | ||
| 51 | $file = Storage::disk('local')->get($entry->filename); | ||
| 52 | |||
| 53 | return (new Response($file, 200)) | ||
| 54 | ->header('Content-Type', $entry->mime); | ||
| 55 | } | ||
| 49 | } | 56 | } | ... | ... |
| ... | @@ -30,8 +30,8 @@ Route::group(array('prefix' => 'api/v1'), function($json) | ... | @@ -30,8 +30,8 @@ Route::group(array('prefix' => 'api/v1'), function($json) |
| 30 | }); | 30 | }); |
| 31 | 31 | ||
| 32 | Route::get('fileentry', 'FileEntryController@index'); | 32 | Route::get('fileentry', 'FileEntryController@index'); |
| 33 | Route::get('fileentry/get/{folder}/{filename}', [ | 33 | Route::get('fileentry/getone/{folder}/{filename}', 'FileEntryController@getone'); |
| 34 | Route::get('fileentry/get/{filename}', [ | ||
| 34 | 'as' => 'getentry', 'uses' => 'FileEntryController@get']); | 35 | 'as' => 'getentry', 'uses' => 'FileEntryController@get']); |
| 35 | Route::post('fileentry/add',[ | 36 | Route::post('fileentry/add',[ |
| 36 | 'as' => 'addentry', 'uses' => 'FileEntryController@add']); | 37 | 'as' => 'addentry', 'uses' => 'FileEntryController@add']); |
| 37 | ... | ... |
-
Please register or sign in to post a comment