Merge branch 'akun' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -160,6 +160,7 @@ class DomainInfo extends Command
             "domain" => $param['domain'],
             "domain" => $param['domain'],
             "rewrite" => $extend_config ?? [],
             "rewrite" => $extend_config ?? [],
             'other_domain' => [$top_domain, '*.' . $top_domain],
             'other_domain' => [$top_domain, '*.' . $top_domain],
+            'is_https' => $param['is_https'],
             'private_key' => '',
             'private_key' => '',
             'cert' => ''
             'cert' => ''
         ];
         ];

@@ -50,7 +50,7 @@ class MinorLanguagesController extends BaseController
      */
      */
     public function getLanguages(){
     public function getLanguages(){
         $webLanguageModel = new WebLanguage();
         $webLanguageModel = new WebLanguage();
-        $lists = $webLanguageModel->list($this->map,'id',['short','chinese']);
+        $lists = $webLanguageModel->list($this->map,'id',['short','chinese'],'asc');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -472,7 +472,7 @@ class RankDataLogic extends BaseLogic
         }
         }
 
 
         //关键词达标天数
         //关键词达标天数
-        if($model->updated_date != date('Y-m-d')){
+        if($model->updated_date != date('Y-m-d') || empty($model->is_compliance)){
             //保证关键词数
             //保证关键词数
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $keyword_num = DeployBuild::where('project_id', $project_id)->value('keyword_num');
             $type = Project::where('id', $project_id)->value('type');
             $type = Project::where('id', $project_id)->value('type');

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\Setting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Project\Country as CountryModel;
 use App\Models\Project\Country as CountryModel;
+use App\Models\WebSetting\WebLanguage;
 
 
 class ProjectCountryLogic extends BaseLogic
 class ProjectCountryLogic extends BaseLogic
 {
 {
@@ -41,6 +42,11 @@ class ProjectCountryLogic extends BaseLogic
             $this->param['country_lists'] = '';
             $this->param['country_lists'] = '';
         }
         }
         $this->param['country_lists'] = $this->countryListsFormat($this->param['country_lists']);
         $this->param['country_lists'] = $this->countryListsFormat($this->param['country_lists']);
+        if(!isset($this->param['country_sort']) || empty($this->param['country_sort'])){
+            $webLanguageModel = new WebLanguage();
+            $all_language_ids = array_column($webLanguageModel->list([],'id',['id'],'asc'),'id');
+            $this->param['country_sort'] = implode(',',$all_language_ids);
+        }
         $info = $this->model->read(['project_id'=>$this->user['project_id']]);
         $info = $this->model->read(['project_id'=>$this->user['project_id']]);
         if($info === false){
         if($info === false){
             $this->param['project_id'] = $this->user['project_id'];
             $this->param['project_id'] = $this->user['project_id'];