Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -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;
@@ -156,7 +158,7 @@ class ProjectLogic extends BaseLogic
                 $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
                 $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
                 //保存售后信息
                 //保存售后信息
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveProjectAfter($this->param['project_after']);
-                $this->saveMinorLanguages($this->param['minor_language'] ?? []);
+                $this->saveMinorLanguages($this->param['deploy_optimize']['minor_languages'] ?? []);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             }
@@ -327,12 +329,23 @@ 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 = [];
             foreach ($minor_language as $k => $v){
             foreach ($minor_language as $k => $v){
-                if(!empty($v['language'])){
-                    $v['created_at'] = date('Y-m-d H:i:s');
-                    $v['updated_at'] = date('Y-m-d H:i:s');
-                    $v['project_id'] = $this->param['id'];
-                    $data[] = $v;
+                if(!empty($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['updated_at'] = date('Y-m-d H:i:s');
+                    $result['project_id'] = $this->param['id'];
+                    $result['service_day'] = $v['service_day'];
+                    $result['type'] = $v['type'];
+                    $result['keywords'] = $v['keywords'];
+                    $data[] = $result;
                 }
                 }
             }
             }
             if(!empty($data)){
             if(!empty($data)){