Merge branch 'master' of http://gitlab.mofune.cn/OnePoem/OnePoem-Server

@@ -40,7 +40,7 @@ class SettingController extends Controller
     public function upload(Request $request)
     public function upload(Request $request)
     {
     {
         $validator = Validator::make($request->all(),[
         $validator = Validator::make($request->all(),[
-            'image' => 'mimes:jpeg,png,bmp,gif'
+            'image' => 'required|mimes:jpeg,png,bmp,gif'
         ]);
         ]);
 
 
         if ($validator->fails()){
         if ($validator->fails()){
@@ -68,7 +68,7 @@ class SettingController extends Controller
 
 
         return Response::success([
         return Response::success([
             'relative_path' => $file,
             'relative_path' => $file,
-            'absolute_path' => Storage::disk('public')->url('file.jpg'),
+            'absolute_path' => Storage::disk('public')->url($file),
         ]);
         ]);
     }
     }
 }
 }

@@ -126,10 +126,14 @@ class UserController extends Controller
         return Response::success(['avatar' => $user->avatar]);
         return Response::success(['avatar' => $user->avatar]);
     }
     }
 
 
-    public function user()
+    public function user(Request $request)
     {
     {
         $user = Auth::user();
         $user = Auth::user();
-        $user->profile;
+
+        if ($request->get('profile') == 1){
+            $user->profile;
+        }
+
         return Response::success($user);
         return Response::success($user);
     }
     }
 }
 }

@@ -60,5 +60,5 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route
     $api->apiResource('/membership', 'MembershipController');
     $api->apiResource('/membership', 'MembershipController');
 
 
     /** 文件上传 */
     /** 文件上传 */
-    $api->post('/upload', 'SettingController@upload');
+    $api->post('/upload/image', 'SettingController@upload');
 });
 });
\ No newline at end of file