Merge remote-tracking branch 'origin/master' into akun

@@ -177,10 +177,10 @@ class RelayInquiry extends Command
             $this->output('开始处理本轮询盘！');
             $this->output('开始处理本轮询盘！');
             foreach ($inquiry as $key=>$val) {
             foreach ($inquiry as $key=>$val) {
                 $this->output('询盘ID：' . $val->id);
                 $this->output('询盘ID：' . $val->id);
-                //询盘时间超过半小时 就不处理了
-                if(time() - strtotime($val->inquiry_date) > 1800){
+                //询盘时间超过90分钟 就不处理了
+                if(time() - strtotime($val->inquiry_date) > 90 * 60){
                     $val->status = ReInquiryForm::STATUS_FORGO;
                     $val->status = ReInquiryForm::STATUS_FORGO;
-                    $val->remark = '超时30分钟未处理！';
+                    $val->remark = '超时90分钟未处理！';
                     $val->save();
                     $val->save();
                     continue;
                     continue;
                 }
                 }
@@ -325,7 +325,7 @@ class RelayInquiry extends Command
 
 
             $pre = 0;
             $pre = 0;
             $start_time = time();
             $start_time = time();
-            $seconds = rand(300, 900);   // 开始时间 从5-15分钟后开始
+            $seconds = rand(300, 3000);   // 开始时间 从5-50分钟后开始
             // 写入推送详情
             // 写入推送详情
             $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));

@@ -100,13 +100,18 @@ class postInquiry extends Command
         }else{
         }else{
             //v4 v5分离项目 往测试链接推
             //v4 v5分离项目 往测试链接推
             $website = $detail['re_website'];
             $website = $detail['re_website'];
-            $site_array = file_get_contents('https://www.quanqiusou.cn/extend_api/saas/split.php');
+            $client = new \GuzzleHttp\Client();
+            $site_array = $client->request('GET', "https://www.quanqiusou.cn/extend_api/saas/split.php", [
+                'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+            ])->getBody()->getContents();
             $site_array = json_decode($site_array, true);
             $site_array = json_decode($site_array, true);
             $mail_urls = array_column($site_array, 'main_url');
             $mail_urls = array_column($site_array, 'main_url');
-            $key = array_search($detail['re_website'], $mail_urls);
+            $key = array_search('https://' . $detail['re_website'] . '/', $mail_urls);
             if ($key !== false) {
             if ($key !== false) {
                 // 分离项目 推送到测试链接
                 // 分离项目 推送到测试链接
                 $website = $site_array[$key]['test_url'];
                 $website = $site_array[$key]['test_url'];
+            }else{
+                $website = 'https://' . $website . '/';
             }
             }
 
 
             $data = [
             $data = [
@@ -171,7 +176,7 @@ class postInquiry extends Command
             ];
             ];
 
 
             $res = Http::withoutVerifying()->post('https://form.globalso.com/api/external-interface/add/fa043f9cbec6b38f', $data)->json();
             $res = Http::withoutVerifying()->post('https://form.globalso.com/api/external-interface/add/fa043f9cbec6b38f', $data)->json();
-            if(empty($res['code']) || $res['code'] != 200){
+            if(empty($res['data'][0]['code']) || $res['data'][0]['code'] != 200){
                 $log->status = ReInquiryDetailLog::STATUS_FAIL;
                 $log->status = ReInquiryDetailLog::STATUS_FAIL;
                 $log->remark = $res['message'] ?? '';
                 $log->remark = $res['message'] ?? '';
                 $log->save();
                 $log->save();

@@ -156,10 +156,22 @@ class AdsController extends BaseController
     public function fbInquiryList(Request $request)
     public function fbInquiryList(Request $request)
     {
     {
         $status = intval($request->input('status'));
         $status = intval($request->input('status'));
+        $ad_name = $request->input('ad_name');
+        $ad_id = $request->input('ad_id');
+        $country = $request->input('country');
         $result = ReInquiryForm::when($status, function ($query, $status) {
         $result = ReInquiryForm::when($status, function ($query, $status) {
                 return $query->where('status', $status);
                 return $query->where('status', $status);
             })
             })
-            ->orderBy('id', 'desc')
+            ->when($ad_name, function ($query, $ad_name) {
+                return $query->where('ad_name', 'like', '%' . $ad_name . '%');
+            })
+            ->when($ad_id, function ($query, $ad_id) {
+                return $query->where('ad_id', 'like', '%' . $ad_id . '%');
+            })
+            ->when($country, function ($query, $country) {
+                return $query->where('country', 'like', '%' . $country . '%');
+            })
+            ->orderBy('inquiry_date', 'desc')
             ->paginate();
             ->paginate();
         return $this->response('success', Code::SUCCESS, $result);
         return $this->response('success', Code::SUCCESS, $result);
     }
     }
@@ -171,8 +183,11 @@ class AdsController extends BaseController
      */
      */
     public function fbRelayDetail(Request $request)
     public function fbRelayDetail(Request $request)
     {
     {
+        //广告ID、询盘ID、国家、状态
         $status = intval($request->input('status'));
         $status = intval($request->input('status'));
+        $task_id = intval($request->input('task_id'));
         $form_id = intval($request->input('form_id'));
         $form_id = intval($request->input('form_id'));
+        $country = intval($request->input('country'));
         $result = ReInquiryDetail::with('detailLog')
         $result = ReInquiryDetail::with('detailLog')
             ->when($status, function ($query, $status) {
             ->when($status, function ($query, $status) {
                 return $query->where('status', $status);
                 return $query->where('status', $status);
@@ -180,6 +195,12 @@ class AdsController extends BaseController
             ->when($form_id, function ($query, $form_id) {
             ->when($form_id, function ($query, $form_id) {
                 return $query->where('form_id', $form_id);
                 return $query->where('form_id', $form_id);
             })
             })
+            ->when($task_id, function ($query, $task_id) {
+                return $query->where('task_id', $task_id);
+            })
+            ->when($country, function ($query, $country) {
+                return $query->where('country', 'like', '%'.$country.'%');
+            })
             ->orderBy('id', 'desc')
             ->orderBy('id', 'desc')
             ->paginate();
             ->paginate();
         return $this->response('success', Code::SUCCESS, $result);
         return $this->response('success', Code::SUCCESS, $result);

@@ -15,7 +15,6 @@ use App\Models\RouteMap\RouteMap;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User;
 use App\Models\User\User;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 
 
 /***
 /***

@@ -13,8 +13,6 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\MonthCount;
 use App\Models\HomeCount\MonthCount;
-use App\Models\Inquiry\InquiryIP;
-use App\Models\Inquiry\InquirySet;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Product\Product;
 use App\Models\Product\Product;

@@ -8,10 +8,8 @@ use App\Http\Logic\Bside\Blog\BlogLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory;
 use App\Models\Blog\BlogCategory;
-use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
-use App\Models\Template\Setting;
 use App\Models\User\User;
 use App\Models\User\User;
 use App\Models\WebSetting\SettingNum;
 use App\Models\WebSetting\SettingNum;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;

@@ -7,7 +7,6 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Blog\BlogLabelLogic;
 use App\Http\Logic\Bside\Blog\BlogLabelLogic;
 use App\Http\Requests\Bside\Blog\BlogLabelRequest;
 use App\Http\Requests\Bside\Blog\BlogLabelRequest;
 use App\Models\Blog\BlogLabel as BlogLabelModel;
 use App\Models\Blog\BlogLabel as BlogLabelModel;
-use Illuminate\Http\Request;
 
 
 class BlogLabelController extends BaseController
 class BlogLabelController extends BaseController
 {
 {

@@ -12,12 +12,10 @@ namespace App\Http\Controllers\Bside\CustomModule;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleCategoryLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleCategoryLogic;
-use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
 use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
-use App\Models\User\User;
 
 
 class CustomModuleCategoryController extends BaseController
 class CustomModuleCategoryController extends BaseController
 {
 {

@@ -13,8 +13,6 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtend;
-use App\Models\CustomModule\CustomModuleExtentContent;
-use App\Models\Product\Extend;
 
 
 class CustomModuleExtentController extends BaseController
 class CustomModuleExtentController extends BaseController
 {
 {

@@ -11,12 +11,8 @@ namespace App\Http\Controllers\Bside\ExtensionModule;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Bside\ExtensionModule\ExtensionModuleFieldLogic;
 use App\Models\ExtentModule\Extension2205ModuleValueLog;
 use App\Models\ExtentModule\Extension2205ModuleValueLog;
-use App\Models\ExtentModule\ExtensionModule;
 use App\Models\ExtentModule\ExtensionModuleField;
 use App\Models\ExtentModule\ExtensionModuleField;
-use App\Models\ExtentModule\ExtensionModuleValue;
-use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @remark :单独处理2205项目扩展
  * @remark :单独处理2205项目扩展

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Bside\FileManage;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Helper\Translate;
 use App\Helper\Translate;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
-use App\Models\File\File;
 use App\Models\FileManage\FileManage;
 use App\Models\FileManage\FileManage;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Services\CosService;
 use App\Services\CosService;

@@ -3,12 +3,8 @@
 namespace App\Http\Controllers\Bside\HomeCount;
 namespace App\Http\Controllers\Bside\HomeCount;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Helper\FormGlobalsoApi;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\HomeCount\MonthCountLogic;
 use App\Http\Logic\Bside\HomeCount\MonthCountLogic;
-use App\Models\Project\DeployBuild;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @remark :月统计报告
  * @remark :月统计报告

@@ -8,7 +8,6 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Nav\NavLogic;
 use App\Http\Logic\Bside\Nav\NavLogic;
 use App\Http\Requests\Bside\Nav\NavRequest;
 use App\Http\Requests\Bside\Nav\NavRequest;
 use App\Models\Nav\BNav;
 use App\Models\Nav\BNav;
-use App\Models\Nav\BNavGroup;
 
 
 /**
 /**
  * 导航栏目 b端编辑 c端显示
  * 导航栏目 b端编辑 c端显示

@@ -8,10 +8,8 @@ use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Models\News\News as NewsModel;
 use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory;
 use App\Models\News\NewsCategory;
-use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
-use App\Models\Template\Setting;
 use App\Models\User\User;
 use App\Models\User\User;
 use App\Models\WebSetting\SettingNum;
 use App\Models\WebSetting\SettingNum;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;

@@ -7,9 +7,6 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\CategoryLogic;
 use App\Http\Logic\Bside\Product\CategoryLogic;
 use App\Http\Requests\Bside\Product\CategoryRequest;
 use App\Http\Requests\Bside\Product\CategoryRequest;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
-use App\Models\Product\CategoryRelated;
-use App\Models\Product\Product;
-use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Rules\Ids;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

@@ -8,7 +8,6 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\DescribeLogic;
 use App\Http\Logic\Bside\Product\DescribeLogic;
 use App\Http\Requests\Bside\Product\DescribeRequest;
 use App\Http\Requests\Bside\Product\DescribeRequest;
 use App\Models\Product\Describe;
 use App\Models\Product\Describe;
-use App\Rules\Ids;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 /**
 /**

@@ -3,16 +3,12 @@
 namespace App\Http\Controllers\Bside\Product;
 namespace App\Http\Controllers\Bside\Product;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Requests\Bside\Product\KeywordRequest;
 use App\Http\Requests\Bside\Product\KeywordRequest;
-use App\Models\Com\NoticeLog;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordPage;
 use App\Models\Product\KeywordPage;
-use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
-use App\Models\RouteMap\RouteMap;
 use App\Rules\Ids;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 

@@ -12,12 +12,7 @@ namespace App\Http\Controllers\Bside\Scoring;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Scoring\RatingLogic;
 use App\Http\Logic\Bside\Scoring\RatingLogic;
-use App\Models\Scoring\RatingQuestion;
-use App\Models\Scoring\ScoringSystem;
 use App\Models\Sms\SmsLog;
 use App\Models\Sms\SmsLog;
-use App\Models\User\User;
-use Illuminate\Support\Facades\Cache;
-use Mrgoon\AliSms\AliSms;
 
 
 /**
 /**
  * @remark :评分系统问题管理
  * @remark :评分系统问题管理

@@ -12,7 +12,6 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\WebSetting\LanguageTxt;
 use App\Models\WebSetting\LanguageTxt;
-use App\Models\WebSetting\WebLanguage;
 
 
 class LanguageTxtController extends BaseController
 class LanguageTxtController extends BaseController
 {
 {

@@ -6,7 +6,6 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Bside\Setting\ProjectCountryLogic;
 use App\Http\Logic\Bside\Setting\ProjectCountryLogic;
-use App\Models\WebSetting\LanguageTxt;
 
 
 /**
 /**
  * @name:项目配置多语言设置
  * @name:项目配置多语言设置

@@ -13,7 +13,6 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
-use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
@@ -21,7 +20,6 @@ use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\WebSetting\SettingNum;
 use App\Models\WebSetting\SettingNum;
 use App\Models\WebSetting\Translate;
 use App\Models\WebSetting\Translate;
-use App\Models\WebSetting\WebLanguage;
 
 
 class TranslateController extends BaseController
 class TranslateController extends BaseController
 {
 {

@@ -5,8 +5,6 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\WebSettingLogic;
 use App\Http\Logic\Bside\Setting\WebSettingLogic;
-use App\Models\Com\UpdateNotify;
-use Illuminate\Http\Request;
 
 
 /**
 /**
  * @name:项目首页设置
  * @name:项目首页设置