wesmiler 11 godzin temu
rodzic
commit
22aa7aa403

+ 5 - 5
app/Http/Controllers/Api/v1/LoginController.php

@@ -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);
             }
 

+ 1 - 0
app/Http/Validator/MemberValidator.php

@@ -56,6 +56,7 @@ class MemberValidator extends BaseValidator
         'info'=> ['id'],
         'mp'=> ['code'],
         'login'=> ['code'],
+        'register'=> ['code','nickname','avatar'],
         'sms'=> ['mobile','scene'],
         'auth'=> ['realname','idcard'],
         'reset_password'=> ['mobile','password','sms_code'],

+ 2 - 2
app/Services/Api/MemberService.php

@@ -66,7 +66,7 @@ class MemberService extends BaseService
      * @param array $params
      * @return array|false
      */
-    public function check($code, $params = [])
+    public function login($code, $params = [])
     {
         // 账号登录
         if (empty($code)) {
@@ -148,7 +148,7 @@ class MemberService extends BaseService
      * @param array $params
      * @return array|false
      */
-    public function login($code, $params = [])
+    public function register($code, $params = [])
     {
         $openid = isset($params['openid'])? $params['openid'] : '';
         $mobile = isset($params['mobile'])? $params['mobile'] : '';

+ 1 - 1
routes/api.php

@@ -19,7 +19,7 @@ use Illuminate\Support\Facades\Route;
 Route::prefix('v1')->group(function() {
     // 登录
     Route::post('/login', [\App\Http\Controllers\Api\v1\LoginController::class, 'login']);
-    Route::post('/login/check', [\App\Http\Controllers\Api\v1\LoginController::class, 'check']);
+    Route::post('/register', [\App\Http\Controllers\Api\v1\LoginController::class, 'register']);
     Route::post('/sms/send', [\App\Http\Controllers\Api\v1\LoginController::class, 'smsSend']);
     Route::post('/user/setProfile', [\App\Http\Controllers\Api\v1\MemberController::class, 'setProfile']);
     Route::post('/user/getPhoneNumber', [\App\Http\Controllers\Api\v1\MemberController::class, 'getPhoneNumber']);