|
@@ -21,7 +21,7 @@ class AuthController extends BaseController
|
|
if(Auth::guard('mini')->attempt($credentials)) {
|
|
if(Auth::guard('mini')->attempt($credentials)) {
|
|
$user = Auth::guard('mini')->user();
|
|
$user = Auth::guard('mini')->user();
|
|
$user->updateToken();
|
|
$user->updateToken();
|
|
- $user->avatar = $user->avatar ? $user->avatar : 'https://t18.9026.com/mini/default-user.png';
|
|
|
|
|
|
+ $user->avatar = $user->avatar ? $user->avatar : 'https://rt2.swdz.com/mini/default-user.png';
|
|
$user->topRole = $user->getTopRole();
|
|
$user->topRole = $user->getTopRole();
|
|
return $this->success(['data' => $user]);
|
|
return $this->success(['data' => $user]);
|
|
}
|
|
}
|
|
@@ -81,8 +81,17 @@ class AuthController extends BaseController
|
|
$data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
|
|
$data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
|
|
Log::info('info'.json_encode($data));
|
|
Log::info('info'.json_encode($data));
|
|
$user = User::where("phone","=",$data['phoneNumber'])->first();
|
|
$user = User::where("phone","=",$data['phoneNumber'])->first();
|
|
|
|
+
|
|
if(empty($user)){
|
|
if(empty($user)){
|
|
return $this->error(['msg' => '账号错误,请重新登录']);
|
|
return $this->error(['msg' => '账号错误,请重新登录']);
|
|
|
|
+ } else {
|
|
|
|
+ if(empty($user->open_id)){
|
|
|
|
+ //更新token
|
|
|
|
+ User::where('phone',$data['phoneNumber'] )->update(['session_key'=>$session_key]);
|
|
|
|
+ }
|
|
|
|
+ $user->updateToken();
|
|
|
|
+ $user = $user->getUserInfo($session_key);
|
|
|
|
+ return $this->success(['data' => $user]);
|
|
}
|
|
}
|
|
return $this->success(['data' => $user]);
|
|
return $this->success(['data' => $user]);
|
|
}
|
|
}
|