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

@@ -375,6 +375,11 @@ class RelayInquiry extends Command
             $pre = 0;
             $pre = 0;
             $start_time = time();
             $start_time = time();
             $seconds = rand(300, 3000);   // 开始时间 从5-50分钟后开始
             $seconds = rand(300, 3000);   // 开始时间 从5-50分钟后开始
+            $exists = ReInquiryDetail::where('re_website', $domain)->where('email', $form->email)->first();
+            if($exists){
+                $this->output('转发站点邮件已存在');
+                continue;
+            }
             // 写入推送详情
             // 写入推送详情
             $re_detail = ReInquiryDetail::createInquiry($task['id'], $form->id, $domain, $country_name, $ip, $form->full_name, $form->email, $form->phone, $message, $message_id, $device_port,
             $re_detail = ReInquiryDetail::createInquiry($task['id'], $form->id, $domain, $country_name, $ip, $form->full_name, $form->email, $form->phone, $message, $message_id, $device_port,
                 $user_agent, $referrer, $urls, $is_v6, date('Y-m-d H:i:s', $start_time + $seconds));
                 $user_agent, $referrer, $urls, $is_v6, date('Y-m-d H:i:s', $start_time + $seconds));

@@ -93,7 +93,10 @@ class ReplaceHtml extends Command
     public function createReplacePageHtmlLog($info){
     public function createReplacePageHtmlLog($info){
         $saveData = [];
         $saveData = [];
         $customTemplateModel = new BCustomTemplate();
         $customTemplateModel = new BCustomTemplate();
-        $list = $customTemplateModel->list(['status'=>BCustomTemplate::STATUS_ACTIVE]);
+        $list = $customTemplateModel->list(['status'=>BCustomTemplate::STATUS_ACTIVE,'html'=>['like','%'.trim($info['old_html']).'%']]);
+        if(empty($list)){
+            return 0;
+        }
         foreach ($list as $v){
         foreach ($list as $v){
             $saveData[] = [
             $saveData[] = [
                 'replace_id'=>$info['id'],
                 'replace_id'=>$info['id'],

@@ -9,6 +9,7 @@
 
 
 namespace App\Console\Commands\ReplaceHtml;
 namespace App\Console\Commands\ReplaceHtml;
 
 
+use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtml;
 use App\Models\Template\TemplateReplaceHtmlLog;
 use App\Models\Template\TemplateReplaceHtmlLog;
@@ -87,12 +88,20 @@ class ReplaceHtmlLog extends Command
         if($info['template_id'] == 0){
         if($info['template_id'] == 0){
             $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
             $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
         }else{
         }else{
+            if($info['source'] == 9 && $info['is_custom'] == 0){
+                (new BCustomTemplate())->formatQuery(['id'=>$source_id])
+                    ->update([
+                        'html' => DB::raw("REPLACE(html, '" . addslashes($old_html) . "', '" . addslashes($html) . "')"),
+                        'updated_at' => now(),
+                    ]);
+            }else{
                 $bTemplateModel->where($condition)
                 $bTemplateModel->where($condition)
                     ->update([
                     ->update([
                         'main_html' => DB::raw("REPLACE(main_html, '" . addslashes($old_html) . "', '" . addslashes($html) . "')"),
                         'main_html' => DB::raw("REPLACE(main_html, '" . addslashes($old_html) . "', '" . addslashes($html) . "')"),
                         'updated_at' => now(),
                         'updated_at' => now(),
                     ]);
                     ]);
             }
             }
+        }
         return true;
         return true;
     }
     }
 
 

@@ -43,7 +43,6 @@ class RankDataLogic extends BaseLogic
     public function index()
     public function index()
     {
     {
         $project_id = $this->user['project_id'];
         $project_id = $this->user['project_id'];
-
         //查数据
         //查数据
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $domain_info = (new DomainInfoLogic)->getDomainInfo($project_id);
         $domain_info = (new DomainInfoLogic)->getDomainInfo($project_id);
@@ -87,6 +86,9 @@ class RankDataLogic extends BaseLogic
         //小语种列表
         //小语种列表
         $quanqiusou_api = new QuanqiusouApi();
         $quanqiusou_api = new QuanqiusouApi();
         $lang_data = $quanqiusou_api->getLangRankData($api_no);
         $lang_data = $quanqiusou_api->getLangRankData($api_no);
+        if(empty($lang_data)){
+            $data['langs_status'] = 1;
+        }
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $data['langs'] = [];
         $data['langs'] = [];
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();