diff --git a/app/controller/TagGroupController.php b/app/controller/TagGroupController.php index 0b4f5e9..135e70d 100644 --- a/app/controller/TagGroupController.php +++ b/app/controller/TagGroupController.php @@ -5,6 +5,7 @@ namespace app\controller; use app\model\CustomerTag; use app\model\TagGroup; use app\util\Util; +use config\constants\Constants; use support\Request; class TagGroupController @@ -14,7 +15,7 @@ class TagGroupController public function list(Request $request) { $list = TagGroup::with('tags')->get(); - $languageArr = config('translation.fallback_locale'); + $languageArr = Constants::LANGUAGE; $language = $request->user['language']; foreach ($list as &$item) { $item['names'] = unserialize($item['names']); diff --git a/app/controller/UserController.php b/app/controller/UserController.php index f7cfc22..bf243d4 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -9,6 +9,7 @@ use app\model\UserSn; use app\service\MailService; use app\util\JwtUtil; use app\util\Util; +use config\constants\Constants; use support\Redis; use support\Request; @@ -283,7 +284,7 @@ class UserController if (Util::isEmpty($language)) { return Util::fail([], 'language' . trans('not_null')); } - if (!in_array($language, ['en', 'zh_CN','ru'])) { + if (!in_array($language, Constants::LANGUAGE)) { return Util::fail([], trans('param_error')); } $data = [ diff --git a/config/constants/Constants.php b/config/constants/Constants.php index 40e3a16..2b42b94 100644 --- a/config/constants/Constants.php +++ b/config/constants/Constants.php @@ -92,4 +92,6 @@ class Constants self::CUSTOMER_SEX_MAN => 'мужской', self::CUSTOMER_SEX_WOMAN => 'женский', ]; + + public const LANGUAGE = ['en', 'zh_CN','ru']; } \ No newline at end of file