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

@@ -67,7 +67,7 @@ class SyncSubmitTask extends Command
                 $task_info->remark = $e->getMessage();
                 $task_info->remark = $e->getMessage();
                 $task_info->save();
                 $task_info->save();
 
 
-                $this->output('任务完成');
+                $this->output('任务完成' . $e->getMessage());
             } catch (\Exception $e) {
             } catch (\Exception $e) {
 
 
                 $task_info->retry = $task_info->retry + 1;
                 $task_info->retry = $task_info->retry + 1;

@@ -90,7 +90,7 @@ class SyncSubmitTaskService
             }
             }
             //直接根据 语种缩写 去匹配 国家简码  不搞麻烦了，将就用
             //直接根据 语种缩写 去匹配 国家简码  不搞麻烦了，将就用
             $tran_country = WordCountry::getCountryByIso2($tran_visit)['chinese_name'] ?? '';
             $tran_country = WordCountry::getCountryByIso2($tran_visit)['chinese_name'] ?? '';
-            if ($tran_visit !='en' && ($checkIpCountry['country'] == '美国' || $tran_country != $checkIpCountry['country'])) {
+            if ($tran_visit && $tran_visit !='en' && ($checkIpCountry['country'] == '美国' || $tran_country != $checkIpCountry['country'])) {
                 throw new InquiryFilterException( '判定为蜘蛛爬取小语种');
                 throw new InquiryFilterException( '判定为蜘蛛爬取小语种');
             }
             }
         }
         }