git -C '/home/opc/rocketa.git' show 45de6a1 -- app/Console/Commands/GetResultDatas.php

commit 45de6a1d4fa7ddaa97757ca5d33499b443241a73
Author: Satoshi Ujihara <satoshi_ujihara@fivegate.jp>
Date:   Mon Nov 3 13:50:34 2025 +0900

    画像で文字を表示している部分をCSSに変更
    test click機能追加
    click時のsqlを元に戻した。

diff --git a/app/Console/Commands/GetResultDatas.php b/app/Console/Commands/GetResultDatas.php
index 4e3a8e6..6a298cb 100644
--- a/app/Console/Commands/GetResultDatas.php
+++ b/app/Console/Commands/GetResultDatas.php
@@ -1434,11 +1434,11 @@ class GetResultDatas extends Command
             }
 
             $query = [];
-            $url = explode('?', $media_data['api_url']);
-            $path = $url[0];
-            if (isset($url[1])) {
-                parse_str($url[1], $query);
-            }
+            // $url = explode('?', $media_data['api_url']);
+            // $path = $url[0];
+            // if (isset($url[1])) {
+            //     parse_str($url[1], $query);
+            // }
 
             // パートナー独自パラメータ追加
             if ($media_other_parameters) {
@@ -1642,10 +1642,21 @@ class GetResultDatas extends Command
             $query['date'] = $notice_at;
             $query['stage'] = $insert_result_data['client_stage'];
 
+            $replaced_url = preg_replace_callback('/\{(\w+)\}/', function ($matches) use ($query) {
+                $key = $matches[1];
+                return isset($query[$key]) ? $query[$key] : ''; // 未設定は空文字
+            }, $media_data['api_url']);
+
+            $url = explode('?',  $replaced_url);
+            $path = $url[0];
+            if (isset($url[1])) {
+                parse_str($url[1], $send_query);
+            }
+
             try {
                 $client = new Client();
                 $response = $client->get($path, [
-                    'query' => $query,
+                    'query' => $send_query,
                     'http_errors' => false,
                 ]);
                 $response_result = $response->getStatusCode();
@@ -1664,15 +1675,15 @@ class GetResultDatas extends Command
                     $response_status = Null;
                 }
 
-                $failed_url = $path.'?';
-                foreach ($query as $key => $param) {
-                    if (!$param || $param == '') {
-                        continue;
-                    }
+                // $failed_url = $path.'?';
+                // foreach ($query as $key => $param) {
+                //     if (!$param || $param == '') {
+                //         continue;
+                //     }
 
-                    $failed_url .= $key.'='.$param.'&';
-                }
-                $failed_url = substr($failed_url, 0, -1);
+                //     $failed_url .= $key.'='.$param.'&';
+                // }
+                // $failed_url = substr($failed_url, 0, -1);
 
                 MediaNoticeFailedDatas::create([
                     'result_datas_id' => $new_result_data->id,
@@ -1681,7 +1692,7 @@ class GetResultDatas extends Command
                     'media_id' => $new_result_data->media_id,
                     'media_uid' => $new_result_data->media_uid,
                     'sid' => $new_result_data->sid,
-                    'url' => $failed_url,
+                    'url' => $replaced_url,
                     'response_status' => $response_status
                 ]);
 
@@ -1869,6 +1880,7 @@ class GetResultDatas extends Command
     private function getAirbridgeIps()
     {
         return [
+            '58.81.70.242', //fg
             '18.177.210.124',
             '18.182.81.54',
             '3.113.116.246',