用户相关api、jwt接入

app/Service/LoginService.php

@@ -5,6 +5,7 @@ namespace App\Service;
 use App\Models\UserModel;
 use App\Service\common\JWTService;
 use App\Service\common\UtilsService;
+use Exception;
 use Illuminate\Support\Str;
 
 class LoginService
@@ -29,11 +30,19 @@ class LoginService
         return self::$_instance[$name];
     }
 
+    /**
+     * 登录
+     * @param $account
+     * @param $password
+     * @return array
+     * @throws Exception
+     */
     public function login($account, $password)
     {
         $userModel = UserModel::where('account', $account)->first();
         if (empty($userModel)) {
-            return $this->register($account, $password);
+            UtilsService::getInstance()->errorThrow('用户或密码错误！');
+//            return $this->register($account, $password);
         }
 
         if (!password_verify($password, $userModel->password))  {
@@ -62,6 +71,7 @@ class LoginService
             'account' => $userModel->account,
             'nick_name' => $userModel->nick_name,
             'avatar' => $userModel->avatar,
+            'email' => $userModel->email,
             'ip' => $userModel->ip,
             'ip_table' => $userModel->ip_table,
         ];
@@ -70,7 +80,14 @@ class LoginService
         return $result;
     }
 
-    public function register($account, $password)
+    /**
+     * 注册
+     * @param $account
+     * @param $password
+     * @return array
+     * @throws Exception
+     */
+    public function register($account, $password): array
     {
         $userModel = UserModel::where('account', $account)->first();
         if ($userModel) {
@@ -96,6 +113,7 @@ class LoginService
             'account' => $createModel->account,
             'nick_name' => $createModel->nick_name,
             'avatar' => $createModel->avatar,
+            'email' => $userModel->email?? '',
             'ip' => $createModel->ip,
             'ip_table' => $createModel->ip_table,
         ];