角色相关（列表和下拉框）、用户查询、项目部分API

app/Service/LoginService.php

@@ -39,7 +39,7 @@ class LoginService
      */
     public function login($account, $password)
     {
-        $userModel = UserModel::where('account', $account)->first();
+        $userModel = UserModel::with(['roles:id,name,value'])->where('account', $account)->first();
         if (empty($userModel)) {
             UtilsService::getInstance()->errorThrow('用户或密码错误！');
 //            return $this->register($account, $password);
@@ -72,6 +72,8 @@ class LoginService
             'nick_name' => $userModel->nick_name,
             'avatar' => $userModel->avatar,
             'email' => $userModel->email,
+            'role_name' => $userModel->roles->name,
+            'role_value' => $userModel->roles->value,
             'ip' => $userModel->ip,
             'ip_table' => $userModel->ip_table,
         ];
@@ -99,6 +101,7 @@ class LoginService
             'password' => password_hash($password, PASSWORD_DEFAULT),
             'nick_name' => '新用户'. Str::random(),
             'avatar' => 'https://pic.rmb.bdstatic.com/bjh/80852bfe7c321988191838517ba64e309354.jpeg@h_1280',
+            'role_id' => 2,
             'ip' => get_ip(),
             'ip_table' => json_encode([get_ip()]),
             'created_at' => get_time()
@@ -114,6 +117,8 @@ class LoginService
             'nick_name' => $createModel->nick_name,
             'avatar' => $createModel->avatar,
             'email' => $userModel->email?? '',
+            'role_name' => $userModel->roles->name,
+            'role_value' => $userModel->roles->value,
             'ip' => $createModel->ip,
             'ip_table' => $createModel->ip_table,
         ];