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

@@ -114,7 +114,7 @@ class AiBlogAuthorTask extends Command
             return true;
             return true;
         }
         }
         $aiBlogAuthorModel = new AiBlogAuthor();
         $aiBlogAuthorModel = new AiBlogAuthor();
-        $info = $aiBlogAuthorModel->count(['project_id'=>$project_id]);
+        $info = $aiBlogAuthorModel->counts(['project_id'=>$project_id]);
         if($info === false){
         if($info === false){
             foreach ($data as $v){
             foreach ($data as $v){
                 $param = [
                 $param = [

@@ -107,7 +107,7 @@ class SyncInquiryProject extends Command
             }
             }
 
 
             // 保存项目 以及 获取路由信息
             // 保存项目 以及 获取路由信息
-            $project = InquiryProject::saveProject($date, $val['v'], $val['postid'], $val['company'], implode(',', $channel_tmp), $val['main_url'], $recent_inquiry, '', $val['is_split'], $val['test_url']);
+            $project = InquiryProject::saveProject($date, $val['v'], $val['postid'], $val['company'], implode(',', $channel_tmp), $val['main_url'], $recent_inquiry, $val['notice'], $val['is_split'], $val['test_url']);
             $route_domain = $val['is_split'] && $val['test_url'] ? $val['test_url'] : $val['main_url'];
             $route_domain = $val['is_split'] && $val['test_url'] ? $val['test_url'] : $val['main_url'];
             try {
             try {
                 $result = http_get($route_domain . 'k_u_api.php');
                 $result = http_get($route_domain . 'k_u_api.php');

@@ -67,7 +67,7 @@ class GeneratePage extends Command
                     $this->output($c_url . ' | 请求成功');
                     $this->output($c_url . ' | 请求成功');
                 } else {
                 } else {
                     $noticeModel->edit(['status'=>2],['id'=>$noticeInfo['id']]);
                     $noticeModel->edit(['status'=>2],['id'=>$noticeInfo['id']]);
-                    $this->output($c_url . ' | ' . ($re['message'] ?? '未返回失败原因'));
+                    $this->output($c_url . ' | ' . (json_encode($re,true) ?? '未返回失败原因'));
                 }
                 }
                 $this->output(' taskID: ' . $noticeInfo['id'] . ' end');
                 $this->output(' taskID: ' . $noticeInfo['id'] . ' end');
             } catch (\Exception $e) {
             } catch (\Exception $e) {

@@ -81,7 +81,7 @@ class InquiryController extends BaseController
             foreach ($data['list'] as $key => $value){
             foreach ($data['list'] as $key => $value){
                 $value['phone_data'] = [];
                 $value['phone_data'] = [];
                 foreach ($phoneDataList as  $valuePhone){
                 foreach ($phoneDataList as  $valuePhone){
-                    if($value['phone'] == $valuePhone['num_phone']){
+                    if($value['phone'] == $valuePhone['phone']){
                         $value['phone_data'] = $valuePhone;
                         $value['phone_data'] = $valuePhone;
                         break;
                         break;
                     }
                     }
@@ -300,9 +300,9 @@ class InquiryController extends BaseController
      */
      */
     public function tranCountry(InquiryLogic $logic){
     public function tranCountry(InquiryLogic $logic){
         $this->request->validate([
         $this->request->validate([
-            'phone_region' => 'required',
+            'country_code' => 'required',
         ],[
         ],[
-            'phone_region.required' => '国家译文不能为空'
+            'country_code.required' => '国家译文不能为空'
         ]);
         ]);
         $data = $logic->tranCountry();
         $data = $logic->tranCountry();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -196,7 +196,7 @@ class InquiryLogic extends BaseLogic
     public function sendMobileVerifyData($phone){
     public function sendMobileVerifyData($phone){
         $phoneDataModel = new PhoneData();
         $phoneDataModel = new PhoneData();
         $num_phone = preg_replace('/\D/', '',$phone) ?? ''; // \D 匹配所有非数字字符
         $num_phone = preg_replace('/\D/', '',$phone) ?? ''; // \D 匹配所有非数字字符
-        $data = $phoneDataModel->read(['num_phone'=>$num_phone]);
+        $data = $phoneDataModel->read(['phone'=>$phone]);
         if($data === false){
         if($data === false){
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$num_phone;
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$num_phone;
             $data = http_get($url);
             $data = http_get($url);