|
@@ -53,9 +53,7 @@ class AuthController extends BaseController
|
|
'avatar' => $data['avatarUrl']
|
|
'avatar' => $data['avatarUrl']
|
|
]);
|
|
]);
|
|
$user->updateToken();
|
|
$user->updateToken();
|
|
- $user = User::find($user->id);
|
|
|
|
- $user->topRole = $user->getTopRole();
|
|
|
|
- $user->session_key = $session_key;
|
|
|
|
|
|
+ $user = $user->getUserInfo($session_key);
|
|
return $this->success(['data' => $user]);
|
|
return $this->success(['data' => $user]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -72,10 +70,16 @@ class AuthController extends BaseController
|
|
}
|
|
}
|
|
if($session_key) {
|
|
if($session_key) {
|
|
$data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
|
|
$data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
|
|
- $data['session_key'] = $session_key;
|
|
|
|
- return $this->success(['data' => $data]);
|
|
|
|
|
|
+ if(isset($data['phoneNumber'])) {
|
|
|
|
+ $user = Auth::guard('mini')->user();
|
|
|
|
+ $user->update(['phone' => $data['phoneNumber']]);
|
|
|
|
+ $user = $user->getUserInfo($session_key);
|
|
|
|
+ return $this->success(['data' => $user]);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return $this->error(['msg' => '获取失败']);
|
|
}
|
|
}
|
|
- return $this->error(['msg' => '登陆失败']);
|
|
|
|
|
|
+ return $this->error(['msg' => '获取失败']);
|
|
}
|
|
}
|
|
|
|
|
|
public function reset(Request $request)
|
|
public function reset(Request $request)
|