合并分支 'develop' 到 'master'

gx



查看合并请求 !495

@@ -2,6 +2,7 @@
 
 
 namespace App\Http\Logic\Aside\Project;
 namespace App\Http\Logic\Aside\Project;
 
 
+use App\Console\Commands\Languages;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Events\CopyImageFile;
 use App\Events\CopyImageFile;
 use App\Events\CopyProject;
 use App\Events\CopyProject;
@@ -19,6 +20,7 @@ use App\Models\Project\WebTrafficConfig;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectRole;
 use App\Models\User\ProjectRole;
+use App\Models\WebSetting\WebLanguage;
 use App\Services\SyncService;
 use App\Services\SyncService;
 use App\Utils\HttpUtils;
 use App\Utils\HttpUtils;
 use App\Utils\LogUtils;
 use App\Utils\LogUtils;
@@ -327,10 +329,16 @@ class ProjectLogic extends BaseLogic
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();
         $languageModel->del(['project_id'=>$this->param['id']]);
         $languageModel->del(['project_id'=>$this->param['id']]);
         if(!empty($minor_language)){
         if(!empty($minor_language)){
+            $webLanguageModel = new WebLanguage();
             $result = [];
             $result = [];
             foreach ($minor_language as $k => $v){
             foreach ($minor_language as $k => $v){
                 if(!empty($v['lang'])){
                 if(!empty($v['lang'])){
-                    $result['language'] = $v['lang'];
+                    $zh = $webLanguageModel->read(['short'=>$v['lang']],['chinese']);
+                    if(empty($zh)){
+                        continue;
+                    }
+                    $result['language'] = $zh['chinese'];
+                    $result['lang'] = $v['lang'];
                     $result['created_at'] = date('Y-m-d H:i:s');
                     $result['created_at'] = date('Y-m-d H:i:s');
                     $result['updated_at'] = date('Y-m-d H:i:s');
                     $result['updated_at'] = date('Y-m-d H:i:s');
                     $result['project_id'] = $this->param['id'];
                     $result['project_id'] = $this->param['id'];