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

@@ -126,11 +126,11 @@ class DomainInfo extends Command
             $data = [];
             $data = [];
             $ssl = $this->updateDomainSsl($amp_domain);
             $ssl = $this->updateDomainSsl($amp_domain);
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
             $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
-            $ssl['to'] && $data['amp_certificate_start_time'] = $ssl['to'];
+            $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
 
 
             $domainModel->edit($data, ['id' => $v['id']]);
             $domainModel->edit($data, ['id' => $v['id']]);
 
 
-            if ($v['amp_type'] == 1 && ($data['amp_certificate_start_time'] ?? '') < $end_day) {
+            if ($v['amp_type'] == 1 && ($data['amp_certificate_end_time'] ?? '') < $end_day) {
                 //申请免费证书
                 //申请免费证书
                 $this->updateAmpPrivate($v['domain']);
                 $this->updateAmpPrivate($v['domain']);
             }
             }

@@ -389,9 +389,10 @@ class RankDataLogic extends BaseLogic
             //有小语种的
             //有小语种的
             $lang_list = $api->getLangList();
             $lang_list = $api->getLangList();
             if (!empty($lang_list[$api_no])) {
             if (!empty($lang_list[$api_no])) {
-                $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
+                foreach ($lang_list[$api_no] as $lang){
+                    $model = RankData::where('project_id', $project_id)->where('lang', $lang)->first();
                     if (!$model || $model->updated_date != date('Y-m-d') || $force) {
                     if (!$model || $model->updated_date != date('Y-m-d') || $force) {
-                    $res = $api->getGoogleRank($api_no, $lang_list[$api_no], 7, $force);
+                        $res = $api->getGoogleRank($api_no, $lang, 7, $force);
                         if (!$res) {
                         if (!$res) {
                             throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
                             throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
                         }
                         }
@@ -407,6 +408,7 @@ class RankDataLogic extends BaseLogic
                 }
                 }
             }
             }
         }
         }
+    }
 
 
 
 
     /**
     /**