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

@@ -101,9 +101,9 @@ class UserController extends Controller
     public function update(Request $request, $id)
     public function update(Request $request, $id)
     {
     {
         $validator = Validator::make($request->all(), [
         $validator = Validator::make($request->all(), [
-            'avatar' => 'required|string',
-            'email' => 'required|string',
-            'nickname' => 'required|string',
+            'avatar' => 'sometimes|string',
+            'email' => 'sometimes|string',
+            'nickname' => 'sometimes|string',
             'gender' => 'sometimes|integer',
             'gender' => 'sometimes|integer',
         ]);
         ]);
 
 
@@ -115,10 +115,18 @@ class UserController extends Controller
             $user = User::query()->find($id);
             $user = User::query()->find($id);
             if ($user->id != $request->user()->id) return Response::fail('不可修改他人信息',500);
             if ($user->id != $request->user()->id) return Response::fail('不可修改他人信息',500);
 
 
-            $user->email = $request->email;
-            $user->avatar = $request->avatar;
-            $user->nickname = $request->nickname;
-            $user->gender = $request->gender ?? 0;
+            $data = $validator->validated();
+            foreach ($data as $key => $value) {
+                $user->$key = $value;
+                if (isset($data['gender'])) {
+                    $user->gender = $value ?? 0;
+                }
+            }
+
+//            $user->email = $request->email;
+//            $user->avatar = $request->avatar;
+//            $user->nickname = $request->nickname;
+//            $user->gender = $request->gender ?? 0;
 
 
             $user->save();
             $user->save();