|
|
@@ -19,7 +19,7 @@ class LoginController extends webApp
|
|
|
* 登录验证
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function check(MemberValidator $validator)
|
|
|
+ public function login(MemberValidator $validator)
|
|
|
{
|
|
|
try {
|
|
|
$params = request()->all();
|
|
|
@@ -29,7 +29,7 @@ class LoginController extends webApp
|
|
|
return showJson($params, false);
|
|
|
}
|
|
|
|
|
|
- if (!$result = MemberService::make()->check($code, $params)) {
|
|
|
+ if (!$result = MemberService::make()->login($code, $params)) {
|
|
|
return showJson(MemberService::make()->getError(), false);
|
|
|
}
|
|
|
|
|
|
@@ -44,17 +44,17 @@ class LoginController extends webApp
|
|
|
* 账号登录
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function login(MemberValidator $validator)
|
|
|
+ public function register(MemberValidator $validator)
|
|
|
{
|
|
|
try {
|
|
|
$params = request()->all();
|
|
|
$code = request()->post('code', '');
|
|
|
- $params = $validator->check($params, 'login');
|
|
|
+ $params = $validator->check($params, 'register');
|
|
|
if (!is_array($params)) {
|
|
|
return showJson($params, false);
|
|
|
}
|
|
|
|
|
|
- if (!$result = MemberService::make()->login($code, $params)) {
|
|
|
+ if (!$result = MemberService::make()->register($code, $params)) {
|
|
|
return showJson(MemberService::make()->getError(), false);
|
|
|
}
|
|
|
|