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

@@ -70,7 +70,12 @@ class SyncProject extends Command
                     $is_update = $item['data']['is_update']??0;//是否是4.0或5.0更新到6.0
                     $is_update = $item['data']['is_update']??0;//是否是4.0或5.0更新到6.0
                     $order_id = $item['data']['order_id'];
                     $order_id = $item['data']['order_id'];
                     if($is_update == 1){
                     if($is_update == 1){
-                        $data = http_get('https://quanqiusou.cn/extend_api/v6/update.php?postid='.$order_id, ['charset' => 'UTF-8']);
+//                        $data = http_get('https://quanqiusou.cn/extend_api/v6/update.php?postid='.$order_id, ['charset' => 'UTF-8']);
+                        $client = new \GuzzleHttp\Client();
+                        $data = $client->request('GET', 'https://quanqiusou.cn/extend_api/v6/update.php?postid='.$order_id, [
+                            'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+                        ])->getBody()->getContents();
+                        $data = json_decode($data, true);
                     }else{
                     }else{
                         $api = new OaGlobalsoApi();
                         $api = new OaGlobalsoApi();
                         $data = $api->order_info($order_id);
                         $data = $api->order_info($order_id);

@@ -64,7 +64,7 @@ class RankData extends BaseCommands
             foreach ($list as $item) {
             foreach ($list as $item) {
                 Log::channel('rank_data')->info('项目开始:ID' . $item['project_id'] .' - '. $item['api_no']) . '';
                 Log::channel('rank_data')->info('项目开始:ID' . $item['project_id'] .' - '. $item['api_no']) . '';
                 try {
                 try {
-                    (new RankDataLogic())->syncRankData($item['api_no'], $site_res, true);
+                    (new RankDataLogic())->syncRankData($item['api_no'], $site_res);
                 } catch (\Exception $e) {
                 } catch (\Exception $e) {
                     Log::channel('rank_data')->error('RankData：失败 ' . $item['api_no'] . $e->getMessage());
                     Log::channel('rank_data')->error('RankData：失败 ' . $item['api_no'] . $e->getMessage());
                     $error++;
                     $error++;

@@ -38,7 +38,12 @@ class SyncMobile extends Command
      */
      */
     public function handle(){
     public function handle(){
         $url = 'https://www.quanqiusou.cn/extend_api/saas/get_phone.php';
         $url = 'https://www.quanqiusou.cn/extend_api/saas/get_phone.php';
-        $data = curlGet($url);//TODO::获取号码库
+//        $data = curlGet($url);//TODO::获取号码库
+        $client = new \GuzzleHttp\Client();
+        $data = $client->request('GET', $url, [
+            'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+        ])->getBody()->getContents();
+        $data = json_decode($data, true);
         DB::table('gl_mobile')->delete();
         DB::table('gl_mobile')->delete();
         $create_time = date('Y-m-d H:i:s');
         $create_time = date('Y-m-d H:i:s');
         foreach ($data as $v){
         foreach ($data as $v){

@@ -4,6 +4,7 @@
 namespace App\Helper;
 namespace App\Helper;
 
 
 use App\Utils\HttpUtils;
 use App\Utils\HttpUtils;
+use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
@@ -95,7 +96,12 @@ class QuanqiusouApi
             //8918_kr_2024-02-19_2024-02-25.json  8918_2024-02-19_2024-02-25.json
             //8918_kr_2024-02-19_2024-02-25.json  8918_2024-02-19_2024-02-25.json
             $api_url = "https://quanqiusou.cn/google-rank/data_json/{$today}/{$api_no}_{$startDay}_{$endDay}.json";
             $api_url = "https://quanqiusou.cn/google-rank/data_json/{$today}/{$api_no}_{$startDay}_{$endDay}.json";
             try {
             try {
-                $res = HttpUtils::get($api_url, []);
+ 				//$res = HttpUtils::get($api_url, []);
+                $client = new Client();
+                $res = $client->request('GET', $api_url, [
+                    'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+                    // 其他请求选项
+                ])->getBody()->getContents();
                 if($res){
                 if($res){
                     $res = Arr::s2a($res);
                     $res = Arr::s2a($res);
                     Cache::put($key, $res, 2 * 3600);
                     Cache::put($key, $res, 2 * 3600);

@@ -586,7 +586,11 @@ class RankDataLogic extends BaseLogic
 
 
             //5.0
             //5.0
             try {
             try {
-                $data = HttpUtils::get("https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", []);
+//                $data = HttpUtils::get("https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", []);
+                $client = new \GuzzleHttp\Client();
+                $data = $client->request('GET', "https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", [
+                    'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+                ])->getBody()->getContents();
                 $data = Arr::s2a($data);
                 $data = Arr::s2a($data);
             }catch (\Exception $e){
             }catch (\Exception $e){
                 $data = [];
                 $data = [];
@@ -668,7 +672,11 @@ class RankDataLogic extends BaseLogic
 
 
             //5.0
             //5.0
             try {
             try {
-                $data = HttpUtils::get("https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", []);
+//                $data = HttpUtils::get("https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", []);
+                $client = new \GuzzleHttp\Client();
+                $data = $client->request('GET', "https://www.quanqiusou.cn/semrush-api/data_json/{$api_no}.json", [
+                    'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
+                ])->getBody()->getContents();
                 $data = Arr::s2a($data)['list'];
                 $data = Arr::s2a($data)['list'];
             }catch (\Exception $e){
             }catch (\Exception $e){
                 $data = [];
                 $data = [];