新版流量池提交

application/superadmin/controller/auth/AuthLoginController.php

@@ -3,24 +3,13 @@
 namespace app\superadmin\controller\auth;
 
 use app\common\model\Administrator as AdministratorModel;
-use app\superadmin\controller\administrator\DeleteAdministratorController;
+use app\common\util\JwtUtil;
 use library\ResponseHelper;
 use think\Controller;
 use think\Validate;
-use think\facade\Cookie;
 
 class AuthLoginController extends Controller
 {
-    /**
-     * 创建登录令牌
-     * @param DeleteAdministratorController $admin
-     * @return string
-     */
-    protected function createToken(AdministratorModel $admin): string
-    {
-        return md5($admin->id . '|' . $admin->account . 'cunkebao_admin_secret');
-    }
-
     /**
      * 数据验证
      *
@@ -87,57 +76,6 @@ class AuthLoginController extends Controller
         return $this;
     }
 
-    /**
-     * 设置登录Cookie，有效期24小时
-     *
-     * @param AdministratorModel $admin
-     * @return void
-     */
-    protected function setCookie(AdministratorModel $admin): void
-    {
-        // 获取当前环境
-        $env = app()->env->get('APP_ENV', 'production');
-
-        // 获取请求的域名
-        $origin = $this->request->header('origin');
-        $domain = '';
-
-        if ($origin) {
-            // 解析域名
-            $parsedUrl = parse_url($origin);
-            if (isset($parsedUrl['host'])) {
-                // 如果是测试环境，使用完整的域名
-                if ($env === 'testing') {
-                    $domain = $parsedUrl['host'];
-                } else {
-                    // 生产环境使用顶级域名
-                    $parts = explode('.', $parsedUrl['host']);
-                    if (count($parts) > 1) {
-                        $domain = '.' . $parts[count($parts) - 2] . '.' . $parts[count($parts) - 1];
-                    }
-                }
-            }
-        }
-
-        // 设置cookie选项
-        $options = [
-            'expire'   => 86400,
-            'path'     => '/',
-            'httponly' => true,
-            'samesite' => 'None',   // 允许跨域
-            'secure'   => true      // 仅 HTTPS 下有效
-        ];
-
-        // 如果有域名，添加到选项
-        if ($domain) {
-            $options['domain'] = $domain;
-        }
-
-        // 设置cookies
-        Cookie::set('admin_id', $admin->id, $options);
-        Cookie::set('admin_token', $this->createToken($admin), $options);
-    }
-
     /**
      * 管理员登录
      *
@@ -149,16 +87,28 @@ class AuthLoginController extends Controller
             $params = $this->request->only(['account', 'password']);
 
             $admin = $this->dataValidate($params)->getAdministrator($params);
-            $this->saveLoginInfo($admin)->setCookie($admin);
+            $this->saveLoginInfo($admin);
 
-            return ResponseHelper::success(
-                [
-                    'id'      => $admin->id,
-                    'name'    => $admin->username,
-                    'account' => $admin->account,
-                    'token'   => Cookie::get('admin_token')
-                ]
-            );
+            // 生成 JWT 令牌（默认有效期 24 小时）
+            $expire = 86400;
+            $payload = [
+                'id'       => $admin->id,
+                'account'  => $admin->account,
+                'username' => $admin->username,
+                'authId'   => $admin->authId ?? 0,
+                'role'     => 'superadmin',
+            ];
+
+            $token = JwtUtil::createToken($payload, $expire);
+
+            return ResponseHelper::success([
+                'id'            => $admin->id,
+                'name'          => $admin->username,
+                'account'       => $admin->account,
+                'authId'        => $admin->authId ?? 0,
+                'token'         => $token,
+                'token_expired' => time() + $expire,
+            ]);
         } catch (\Exception $e) {
             return ResponseHelper::error($e->getMessage(), $e->getCode());
         }