正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
@@ -115,7 +115,7 @@ class RestBaseController | @@ -115,7 +115,7 @@ class RestBaseController | ||
115 | ->where(['token' => $token, 'device_type' => $deviceType]) | 115 | ->where(['token' => $token, 'device_type' => $deviceType]) |
116 | ->join('__USER__ b', 'a.user_id = b.id') | 116 | ->join('__USER__ b', 'a.user_id = b.id') |
117 | ->find(); | 117 | ->find(); |
118 | - | 118 | + $this->success($user); |
119 | if (!empty($user)) { | 119 | if (!empty($user)) { |
120 | $this->user = $user; | 120 | $this->user = $user; |
121 | $this->userId = $user['id']; | 121 | $this->userId = $user['id']; |
@@ -294,7 +294,7 @@ class RestBaseController | @@ -294,7 +294,7 @@ class RestBaseController | ||
294 | $this->error(['code' => 10003, 'msg' => '用户未填写注册信息']); | 294 | $this->error(['code' => 10003, 'msg' => '用户未填写注册信息']); |
295 | } | 295 | } |
296 | return $this->userId; | 296 | return $this->userId; |
297 | -return 2; | 297 | +//return 2; |
298 | } | 298 | } |
299 | 299 | ||
300 | 300 |
-
请 注册 或 登录 后发表评论