webman迁移-优化

dafuweng-webman/app/common/controller/Backend.php

@@ -105,6 +105,11 @@ class Backend extends Api
      */
     protected string $withJoinType = 'LEFT';
 
+    /**
+     * 输入过滤函数名（如 clean_xss，CRUD 含 editor 字段时自动设置）
+     */
+    protected string $inputFilter = '';
+
     /**
      * 后台初始化（需在控制器方法开头调用，在 initializeApi 之后）
      * @return Response|null 需直接返回时返回 Response，否则 null
@@ -116,6 +121,9 @@ class Backend extends Api
             return $response;
         }
 
+        // 调用子类 initialize（CRUD 生成的控制器在此设置 model）
+        $this->initialize();
+
         $action = $this->getActionFromPath($request->path());
         $needLogin = !action_in_arr($this->noNeedLogin, $action);
         $needPermission = !action_in_arr($this->noNeedPermission, $action);
@@ -207,7 +215,7 @@ class Backend extends Api
     {
         $response = $this->initializeBackend($request);
         if ($response !== null) return $response;
-        $this->select();
+        $this->_select();
         return $this->success();
     }
 

dafuweng-webman/app/common/controller/Frontend.php

@@ -35,7 +35,7 @@ class Frontend extends Api
         $needLogin = !action_in_arr($this->noNeedLogin, $action);
 
         try {
-            $this->auth = Auth::instance();
+            $this->auth = Auth::instance(['request' => $request]);
             $token = get_auth_token(['ba', 'user', 'token'], $request);
             if ($token) $this->auth->init($token);
         } catch (TokenExpirationException) {

dafuweng-webman/app/common/library/Auth.php

@@ -47,7 +47,8 @@ class Auth extends \ba\Auth
 
     public static function instance(array $options = []): Auth
     {
-        $request = function_exists('request') ? request() : null;
+        $request = $options['request'] ?? (function_exists('request') ? request() : null);
+        unset($options['request']);
         if ($request && !isset($request->userAuth)) {
             $request->userAuth = new static($options);
         }
@@ -158,7 +159,8 @@ class Auth extends \ba\Auth
 
         $userLoginRetry = config('buildadmin.user_login_retry');
         if ($userLoginRetry && $this->model->last_login_time) {
-            if ($this->model->login_failure > 0 && time() - strtotime($this->model->last_login_time) >= 86400) {
+            $lastLoginTs = is_numeric($this->model->last_login_time) ? (int)$this->model->last_login_time : strtotime($this->model->last_login_time);
+            if ($this->model->login_failure > 0 && $lastLoginTs > 0 && time() - $lastLoginTs >= 86400) {
                 $this->model->login_failure = 0;
                 $this->model->save();
                 $this->model = User::where($accountType, $username)->find();
@@ -181,8 +183,7 @@ class Auth extends \ba\Auth
         }
 
         if ($keep) $this->setRefreshToken($this->refreshTokenKeepTime);
-        $this->loginSuccessful();
-        return true;
+        return $this->loginSuccessful();
     }
 
     public function direct(int $userId): bool
@@ -201,21 +202,24 @@ class Auth extends \ba\Auth
         if (!$this->model) return false;
         $request = function_exists('request') ? request() : null;
         $ip = $request ? $request->getRealIp() : '0.0.0.0';
+        if (!$this->token) {
+            $this->token = Random::uuid();
+            Token::set($this->token, self::TOKEN_TYPE, $this->model->id, $this->keepTime);
+        }
         $this->model->startTrans();
         try {
             $this->model->login_failure = 0;
-            $this->model->last_login_time = date('Y-m-d H:i:s');
+            $this->model->last_login_time = time();
             $this->model->last_login_ip = $ip;
             $this->model->save();
             $this->loginEd = true;
-
-            if (!$this->token) {
-                $this->token = Random::uuid();
-                Token::set($this->token, self::TOKEN_TYPE, $this->model->id, $this->keepTime);
-            }
             $this->model->commit();
         } catch (Throwable $e) {
             $this->model->rollback();
+            if ($this->token) {
+                Token::delete($this->token);
+                $this->token = '';
+            }
             $this->setError($e->getMessage());
             return false;
         }
@@ -230,7 +234,7 @@ class Auth extends \ba\Auth
         $this->model->startTrans();
         try {
             $this->model->login_failure++;
-            $this->model->last_login_time = date('Y-m-d H:i:s');
+            $this->model->last_login_time = time();
             $this->model->last_login_ip = $ip;
             $this->model->save();
             $this->model->commit();

dafuweng-webman/app/common/middleware/LoadLangPack.php

@@ -25,25 +25,50 @@ class LoadLangPack implements MiddlewareInterface
 
     protected function loadLang(Request $request): void
     {
-        $controllerPath = get_controller_path($request);
-        if (!$controllerPath) {
-            return;
+        // 优先从请求头 think-lang 获取前端选择的语言（与前端 axios 发送的 header 对应）
+        $headerLang = $request->header('think-lang');
+        $allowLangList = config('lang.allow_lang_list', ['zh-cn', 'en']);
+        if ($headerLang && in_array(str_replace('_', '-', strtolower($headerLang)), $allowLangList)) {
+            $langSet = str_replace('_', '-', strtolower($headerLang));
+        } else {
+            $langSet = config('lang.default_lang', config('translation.locale', 'zh-cn'));
+            $langSet = str_replace('_', '-', strtolower($langSet));
         }
 
-        $langSet = config('lang.default_lang', config('translation.locale', 'zh-cn'));
-        $langSet = str_replace('_', '-', strtolower($langSet));
+        // 设置当前请求的翻译语言，使 __() 和 trans() 使用正确的语言
+        if (function_exists('locale')) {
+            locale($langSet);
+        }
 
         $path = trim($request->path(), '/');
         $parts = explode('/', $path);
         $app = $parts[0] ?? 'api';
 
-        $langFile = base_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . $app
-            . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $langSet
-            . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $controllerPath) . '.php';
+        $appLangDir = base_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . $app . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR;
 
-        if (is_file($langFile) && class_exists(\support\Translation::class)) {
-            $translator = \support\Translation::instance();
-            $translator->addResource('phpfile', $langFile, $langSet, $controllerPath);
+        if (!class_exists(\support\Translation::class)) {
+            return;
+        }
+
+        $translator = \support\Translation::instance();
+
+        // 1. 加载根级语言包（zh-cn.php / en.php），供 common 翻译使用
+        $rootLangFile = $appLangDir . $langSet . '.php';
+        if (is_file($rootLangFile)) {
+            $translator->addResource('phpfile', $rootLangFile, $langSet, 'messages');
+        }
+
+        // 2. 加载控制器专用语言包（如 zh-cn/auth/group.php），供 get_route_remark 等使用
+        $controllerPath = get_controller_path($request);
+        if ($controllerPath) {
+            $controllerPathForFile = str_replace('.', '/', $controllerPath);
+            $controllerPathForFile = implode('/', array_map(function ($p) {
+                return strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $p));
+            }, explode('/', $controllerPathForFile)));
+            $controllerLangFile = $appLangDir . $langSet . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $controllerPathForFile) . '.php';
+            if (is_file($controllerLangFile)) {
+                $translator->addResource('phpfile', $controllerLangFile, $langSet, $controllerPath);
+            }
         }
     }
 }