...
|
...
|
@@ -115,7 +115,7 @@ class RestBaseController |
|
|
->where(['token' => $token, 'device_type' => $deviceType])
|
|
|
->join('__USER__ b', 'a.user_id = b.id')
|
|
|
->find();
|
|
|
|
|
|
$this->success($user);
|
|
|
if (!empty($user)) {
|
|
|
$this->user = $user;
|
|
|
$this->userId = $user['id'];
|
...
|
...
|
@@ -294,7 +294,7 @@ class RestBaseController |
|
|
$this->error(['code' => 10003, 'msg' => '用户未填写注册信息']);
|
|
|
}
|
|
|
return $this->userId;
|
|
|
return 2;
|
|
|
//return 2;
|
|
|
}
|
|
|
|
|
|
|
...
|
...
|
|