| xqd
@@ -14,9 +14,9 @@ class AuthController extends BaseController
|
|
|
{
|
|
|
$credentials = $request->only('phone', 'password');
|
|
|
if(Auth::guard('mini')->attempt($credentials)) {
|
|
|
- $admin_user = Auth::guard('mini')->user();
|
|
|
- $admin_user->updateToken();
|
|
|
- return $this->success(['data' => $admin_user]);
|
|
|
+ $user = Auth::guard('mini')->user();
|
|
|
+ $user->updateToken();
|
|
|
+ return $this->success(['data' => $user]);
|
|
|
}
|
|
|
return $this->error(['msg' => '账号或密码错误']);
|
|
|
}
|
| xqd
@@ -27,10 +27,20 @@ class AuthController extends BaseController
|
|
|
if($request->input('code')) {
|
|
|
$res = $app->auth->session($request->input('code'));
|
|
|
if(isset($res['session_key'])) {
|
|
|
- $decryptedData = $app->encryptor->decryptData($res['session_key'], $request->input('iv'), $request->input('encryptedData'));
|
|
|
- return $decryptedData;
|
|
|
+ $data = $app->encryptor->decryptData($res['session_key'], $request->input('iv'), $request->input('encryptedData'));
|
|
|
+ if(isset($data['openId'])) {
|
|
|
+ $user = User::where('open_id', $data['openId'])->first();
|
|
|
+ if(empty($user)) return $this->error(['msg' => '用户不存在,请先绑定账户']);
|
|
|
+ $user->update([
|
|
|
+ 'nickname' => $data['nickName'],
|
|
|
+ 'avatar' => $data['avatarUrl']
|
|
|
+ ]);
|
|
|
+ $user->updateToken();
|
|
|
+ return $this->success(['data' => $user]);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ return $this->error(['msg' => '登陆失败']);
|
|
|
}
|
|
|
|
|
|
public function reset(Request $request)
|