Merge branch 'feature/ru' into develop

# Conflicts:
#	app/controller/UserController.php
#	config/constants/Constants.php

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']);

app/controller/UserController.php

@@ -330,7 +330,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 = [

config/constants/Constants.php

@@ -98,4 +98,6 @@ class Constants
         ['id' => 'xinyouhe', 'name' => '新友合'],
         ['id' => 'mbaf', 'name' => 'MAGIC BRIDGE AUTO FZE']
     ];
+
+   public const LANGUAGE = ['en', 'zh_CN','ru'];
 }