Showing
3 changed files
with
9 additions
and
5 deletions
... | @@ -40,7 +40,7 @@ class SettingController extends Controller | ... | @@ -40,7 +40,7 @@ class SettingController extends Controller |
40 | public function upload(Request $request) | 40 | public function upload(Request $request) |
41 | { | 41 | { |
42 | $validator = Validator::make($request->all(),[ | 42 | $validator = Validator::make($request->all(),[ |
43 | - 'image' => 'mimes:jpeg,png,bmp,gif' | 43 | + 'image' => 'required|mimes:jpeg,png,bmp,gif' |
44 | ]); | 44 | ]); |
45 | 45 | ||
46 | if ($validator->fails()){ | 46 | if ($validator->fails()){ |
... | @@ -68,7 +68,7 @@ class SettingController extends Controller | ... | @@ -68,7 +68,7 @@ class SettingController extends Controller |
68 | 68 | ||
69 | return Response::success([ | 69 | return Response::success([ |
70 | 'relative_path' => $file, | 70 | 'relative_path' => $file, |
71 | - 'absolute_path' => Storage::disk('public')->url('file.jpg'), | 71 | + 'absolute_path' => Storage::disk('public')->url($file), |
72 | ]); | 72 | ]); |
73 | } | 73 | } |
74 | } | 74 | } | ... | ... |
... | @@ -126,10 +126,14 @@ class UserController extends Controller | ... | @@ -126,10 +126,14 @@ class UserController extends Controller |
126 | return Response::success(['avatar' => $user->avatar]); | 126 | return Response::success(['avatar' => $user->avatar]); |
127 | } | 127 | } |
128 | 128 | ||
129 | - public function user() | 129 | + public function user(Request $request) |
130 | { | 130 | { |
131 | $user = Auth::user(); | 131 | $user = Auth::user(); |
132 | - $user->profile; | 132 | + |
133 | + if ($request->get('profile') == 1){ | ||
134 | + $user->profile; | ||
135 | + } | ||
136 | + | ||
133 | return Response::success($user); | 137 | return Response::success($user); |
134 | } | 138 | } |
135 | } | 139 | } | ... | ... |
... | @@ -60,5 +60,5 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route | ... | @@ -60,5 +60,5 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route |
60 | $api->apiResource('/membership', 'MembershipController'); | 60 | $api->apiResource('/membership', 'MembershipController'); |
61 | 61 | ||
62 | /** 文件上传 */ | 62 | /** 文件上传 */ |
63 | - $api->post('/upload', 'SettingController@upload'); | 63 | + $api->post('/upload/image', 'SettingController@upload'); |
64 | }); | 64 | }); |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment