批量更新

2026-02-24 10:12:05 +08:00
parent 0ed654b5b8
commit 0bf9b77aed
4 changed files with 157 additions and 97 deletions
@@ -32,69 +32,105 @@ class LoginController extends BaseController
     */
    public function login(): Json
    {
-        $data = $this->request->param();
-
-        if (isset($data['email'])) {
-            $data['account'] = $data['email'];
-        } elseif (isset($data['phone'])) {
-            $data['account'] = $data['phone'];
-        }
-
        try {
-            $this->validate($data, [
-                'account|账号' => 'require|length:3,32',
-                'password|密码' => 'require|length:6,32'
-            ]);
-        } catch (ValidateException $e) {
-            $this->logFail('登录管理', '登录', $e->getMessage());
+            $data = $this->request->param();
+
+            if (isset($data['email'])) {
+                $data['account'] = $data['email'];
+            } elseif (isset($data['phone'])) {
+                $data['account'] = $data['phone'];
+            }
+
+            try {
+                $this->validate($data, [
+                    'account|账号' => 'require|length:3,32',
+                    'password|密码' => 'require|length:6,32'
+                ]);
+            } catch (ValidateException $e) {
+                $this->logFail('登录管理', '登录', $e->getMessage());
+                return json([
+                    'code' => 400,
+                    'msg' => $e->getError()
+                ]);
+            }
+
+            $user = AdminUser::where('account', $data['account'])
+                ->where('status', 1)
+                ->where('delete_time', null)
+                ->find();
+
+            if (!$user) {
+                return json([
+                    'code' => 401,
+                    'msg' => '账号不存在或已禁用'
+                ]);
+            }
+
+            if (md5($data['password']) !== $user['password']) {
+                return json([
+                    'code' => 401,
+                    'msg' => '密码错误'
+                ]);
+            }
+
+            // 更新登录次数和IP，确保 login_count 不为 null
+            try {
+                $loginCount = isset($user['login_count']) && $user['login_count'] !== null ? (int)$user['login_count'] : 0;
+                AdminUser::where('id', $user['id'])->update([
+                    'login_count' => $loginCount + 1,
+                    'last_login_ip' => $this->request->ip()
+                ]);
+            } catch (\Exception $e) {
+                // 更新登录信息失败不影响登录流程
+                error_log('更新登录信息失败: ' . $e->getMessage());
+            }
+
+            $userInfo = [
+                'id' => $user['id'],
+                'account' => $user['account'],
+                'name' => $user['name'],
+                'group_id' => $user['group_id']
+            ];
+
+            try {
+                $token = $this->generateToken($userInfo);
+            } catch (\Exception $e) {
+                $this->logFail('登录管理', '登录', 'Token生成失败: ' . $e->getMessage());
+                return json([
+                    'code' => 500,
+                    'msg' => '登录失败，请稍后重试'
+                ]);
+            }
+
+            // 记录日志，但不影响登录流程
+            try {
+                $this->logSuccess('登录管理', '登录', ['id' => $user['id']], $userInfo);
+            } catch (\Exception $e) {
+                // 日志记录失败不影响登录
+                error_log('登录日志记录失败: ' . $e->getMessage());
+            }
+
            return json([
-                'code' => 400,
-                'msg' => $e->getError()
+                'code' => 200,
+                'msg' => '登录成功',
+                'data' => [
+                    'token' => $token,
+                    'user' => $userInfo
+                ]
+            ]);
+        } catch (\Exception $e) {
+            // 捕获所有未预期的错误
+            error_log('登录失败: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
+            try {
+                $this->logFail('登录管理', '登录', $e->getMessage());
+            } catch (\Exception $logError) {
+                error_log('记录登录失败日志也失败: ' . $logError->getMessage());
+            }
+            return json([
+                'code' => 500,
+                'msg' => '登录失败，请稍后重试'
            ]);
        }
-
-        $user = AdminUser::where('account', $data['account'])
-            ->where('status', 1)
-            ->where('delete_time', null)
-            ->find();
-
-        if (!$user) {
-            return json([
-                'code' => 401,
-                'msg' => '账号不存在或已禁用'
-            ]);
-        }
-
-        if (md5($data['password']) !== $user['password']) {
-            return json([
-                'code' => 401,
-                'msg' => '密码错误'
-            ]);
-        }
-
-        AdminUser::where('id', $user['id'])->update([
-            'login_count' => $user['login_count'] + 1,
-            'last_login_ip' => $this->request->ip()
-        ]);
-
-        $userInfo = [
-            'id' => $user['id'],
-            'account' => $user['account'],
-            'name' => $user['name'],
-            'group_id' => $user['group_id']
-        ];
-
-        $token = $this->generateToken($userInfo);
-
-        $this->logSuccess('登录管理', '登录', ['id' => $user['id']], $userInfo);
-        return json([
-            'code' => 200,
-            'msg' => '登录成功',
-            'data' => [
-                'token' => $token,
-                'user' => $userInfo
-            ]
-        ]);
    }

    /**