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

@@ -86,19 +86,16 @@ class QuanqiusouApi
         $key = "quanqiusou_api_rank_{$api_no}_{$lang}_{$day}_" . date('Y-m-d');
         $key = "quanqiusou_api_rank_{$api_no}_{$lang}_{$day}_" . date('Y-m-d');
         $res = Cache::get($key);
         $res = Cache::get($key);
         if (!$res || $force) {
         if (!$res || $force) {
-            $param = [
-                'key' => '289c1fc81c89d79c04ed4fd72822948e',
-                'w' => $api_no,
-                'type' => $day
-            ];
             if ($lang) {
             if ($lang) {
-                $param['lang'] = $lang;
+                $api_no = $api_no . '_' . $lang;
             }
             }
-
-            $api_url = $this->url . '/api';
-
+            $today = date('Y-m-d');
+            $startDay = date('Y-m-d', strtotime('-'.$day.' day'));
+            $endDay = date('Y-m-d', strtotime('-1 day'));
+            //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";
             try {
             try {
-                $res = HttpUtils::get($api_url, $param);
+                $res = HttpUtils::get($api_url, []);
                 if($res){
                 if($res){
                     $res = Arr::s2a($res);
                     $res = Arr::s2a($res);
                     Cache::put($key, $res, 2 * 3600);
                     Cache::put($key, $res, 2 * 3600);

@@ -392,7 +392,7 @@ class RankDataLogic extends BaseLogic
             if (!empty($lang_list[$api_no])) {
             if (!empty($lang_list[$api_no])) {
                 $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
                 $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
                 if (!$model || $model->updated_date != date('Y-m-d') || $force) {
                 if (!$model || $model->updated_date != date('Y-m-d') || $force) {
-                    $res = $api->getGoogleRank($api_no, 1, 7, $force);
+                    $res = $api->getGoogleRank($api_no, $model->lang, 7, $force);
                     if (!$res) {
                     if (!$res) {
                         throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
                         throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
                     }
                     }