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

+<?php
+
+namespace App\Console\Commands\Inquiry;
+
+
+use App\Helper\Arr;
+use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\ReInquiryForm;
+use App\Models\Inquiry\ReInquiryTask;
+use App\Utils\HttpUtils;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Console\Command;
+
+/**
+ * Class SyncInquiry
+ * @package App\Console\Commands\Inquiry
+ */
+class UpdateSiteVersion extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update_site_version';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '更新关联网站版本';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+    public function handle()
+    {
+        while (true) {
+            $list = ReInquiryTask::select(['target', 'id'])->get();
+            foreach ($list as $item){
+                $this->output('sync task :' . $item['id']);
+                if(empty($item['target'])){
+                    continue;
+                }
+                $update = false;
+                $target = $item['target'];
+                foreach ($target as &$site){
+                    if(!$site['is_v6']){
+                        $domain_info = DomainInfo::where('domain', $site['url'])->first();
+                        if($domain_info){
+                            $site['is_v6'] = "1";
+                            $update = true;
+
+                            echo date('Y-m-d H:i:s') . ' | ' . $site['url'] . ' 升级到V6' . PHP_EOL;
+                        }
+                    }
+                }
+                if($update){
+                    $item->target = $target;
+                    $item->save();
+                }
+            }
+            $this->output('sleep');
+            sleep(300);
+        }
+    }
+
+
+    public function output($message)
+    {
+        echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :PayStripeApi.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/12/24 10:35
+ */
+
+namespace App\Helper;
+
+class PayStripeApi
+{
+    private $secretKey;
+    //币种对应支付方式
+    public $currency_types = [
+        'usd' => ['card', 'alipay', 'wechat_pay', 'cashapp', 'link', 'afterpay_clearpay'],
+        'eur' => ['card', 'ideal', 'giropay', 'sofort', 'bancontact', 'klarna', 'link'],
+        'gbp' => ['card', 'apple_pay', 'google_pay', 'klarna', 'link', 'afterpay_clearpay'],
+        'aud' => ['card', 'afterpay_clearpay', 'apple_pay', 'google_pay'],
+        'cad' => ['card', 'apple_pay', 'google_pay', 'link'],
+        'sgd' => ['card', 'grabpay', 'fpx', 'wechat_pay', 'apple_pay', 'google_pay'],
+        'jpy' => ['card', 'apple_pay', 'google_pay'],
+        'cny' => ['alipay', 'wechat_pay'],
+        'brl' => ['card', 'boleto', 'pix'],
+        'mxn' => ['card', 'oxxo'],
+        'inr' => ['card', 'upi', 'netbanking'],
+        'php' => ['card', 'paymaya', 'gcash'],
+        'myr' => ['card', 'fpx'],
+        'thb' => ['card', 'promptpay'],
+        'idr' => ['card', 'bank_transfer'],
+        'zar' => ['card'],
+        'ngn' => ['card'],
+        'aed' => ['card', 'apple_pay', 'google_pay']
+    ];
+
+    // 构造函数设置密钥
+    public function __construct($secretKey)
+    {
+        $this->secretKey = 'sk_test_51MyseXIWCYVeLww1tbPZzRe1Qk4lS5d2VLiDjpju7G0ToiX1RJcFinQXNlftq9eCjZE0n2gjaz1mfy1g0mxTusdf00m636Gv62';
+    }
+
+    /**
+     * @remark :通用的 cURL 请求方法
+     * @name   :sendRequest
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:38
+     */
+    private function sendRequest($url, $method = 'POST', $data = [])
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            "Authorization: Bearer {$this->secretKey}",
+            "Content-Type: application/x-www-form-urlencoded"
+        ]);
+        if ($method === 'POST') {
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
+        } elseif ($method === 'GET') {
+            curl_setopt($ch, CURLOPT_HTTPGET, true);
+        } elseif ($method === 'DELETE') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        }
+        $response = curl_exec($ch);
+        if (curl_errno($ch)) {
+            throw new Exception('cURL Error: ' . curl_error($ch));
+        }
+        curl_close($ch);
+        return json_decode($response, true);
+    }
+
+    /**
+     * @remark :创建支付意图
+     * @name   :createPaymentIntent
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:38
+     */
+    public function createPaymentIntent($amount, $currency = 'usd')
+    {
+        $url = "https://api.stripe.com/v1/payment_intents";
+        $data = [
+            'amount' => $amount,
+            'currency' => $currency,
+            'payment_method_types[]' => $this->currency_types[$currency],
+        ];
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :查询支付意图
+     * @name   :retrievePaymentIntent
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:38
+     */
+    public function retrievePaymentIntent($paymentIntentId)
+    {
+        $url = "https://api.stripe.com/v1/payment_intents/{$paymentIntentId}";
+        return $this->sendRequest($url, 'GET');
+    }
+
+    /**
+     * @remark :创建客户
+     * @name   :createCustomer
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:41
+     */
+    public function createCustomer($name, $email, $description = '')
+    {
+        $url = "https://api.stripe.com/v1/customers";
+        $data = [
+            'name' => $name,
+            'email' => $email,
+            'description' => $description
+        ];
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :查询客户
+     * @name   :retrieveCustomer
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:41
+     */
+    public function retrieveCustomer($customerId)
+    {
+        $url = "https://api.stripe.com/v1/customers/{$customerId}";
+        return $this->sendRequest($url, 'GET');
+    }
+
+    /**
+     * @remark :删除客户
+     * @name   :deleteCustomer
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function deleteCustomer($customerId)
+    {
+        $url = "https://api.stripe.com/v1/customers/{$customerId}";
+        return $this->sendRequest($url, 'DELETE');
+    }
+
+    /**
+     * @remark :创建支付方法
+     * @name   :createPaymentMethod
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function createPaymentMethod($cardNumber, $expMonth, $expYear, $cvc)
+    {
+        $url = "https://api.stripe.com/v1/payment_methods";
+        $data = [
+            'type' => 'card',
+            'card[number]' => $cardNumber,
+            'card[exp_month]' => $expMonth,
+            'card[exp_year]' => $expYear,
+            'card[cvc]' => $cvc,
+        ];
+
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :绑定支付方法到客户
+     * @name   :attachPaymentMethodToCustomer
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function attachPaymentMethodToCustomer($paymentMethodId, $customerId)
+    {
+        $url = "https://api.stripe.com/v1/payment_methods/{$paymentMethodId}/attach";
+        $data = [
+            'customer' => $customerId,
+        ];
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :创建退款
+     * @name   :createRefund
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function createRefund($chargeId, $amount = null)
+    {
+        $url = "https://api.stripe.com/v1/refunds";
+        $data = ['charge' => $chargeId];
+        if ($amount) {
+            $data['amount'] = $amount;
+        }
+
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :查询退款
+     * @name   :retrieveRefund
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function retrieveRefund($refundId)
+    {
+        $url = "https://api.stripe.com/v1/refunds/{$refundId}";
+        return $this->sendRequest($url, 'GET');
+    }
+
+    /**
+     * @remark :创建订阅
+     * @name   :createSubscription
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:42
+     */
+    public function createSubscription($customerId, $priceId)
+    {
+        $url = "https://api.stripe.com/v1/subscriptions";
+        $data = [
+            'customer' => $customerId,
+            'items[0][price]' => $priceId,
+        ];
+        return $this->sendRequest($url, 'POST', $data);
+    }
+
+    /**
+     * @remark :取消订阅
+     * @name   :cancelSubscription
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:43
+     */
+    public function cancelSubscription($subscriptionId)
+    {
+        $url = "https://api.stripe.com/v1/subscriptions/{$subscriptionId}";
+        return $this->sendRequest($url, 'DELETE');
+    }
+
+    /**
+     * @remark :处理 Webhook
+     * @name   :handleWebhook
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/24 10:43
+     */
+    public static function handleWebhook($payload, $sigHeader, $endpointSecret)
+    {
+        try {
+            $event = json_decode($payload, true);
+            // 检查事件类型
+            return $event; // 返回解析后的事件
+        } catch (Exception $e) {
+            throw new Exception('Webhook Error: ' . $e->getMessage());
+        }
+    }
+}

@@ -49,12 +49,6 @@ class OptimizeController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             $rankDataModel = new RankData();
             $rankDataModel = new RankData();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>''],['first_page_num','indexed_pages_num']);
-                $v['first_page_num'] = $data['first_page_num'] ?? 0;
-                $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
-                $v['g'] = $this->getGNum($v['id']);
-                $v = $this->handleParam($v);
-
                 //特殊项目 两个api_no
                 //特殊项目 两个api_no
                 if($v['id'] == 2104){
                 if($v['id'] == 2104){
                     $keyword_num_map = [10690=>100, 11201 => 50];
                     $keyword_num_map = [10690=>100, 11201 => 50];
@@ -70,8 +64,13 @@ class OptimizeController extends BaseController
                     $v['indexed_pages_num'] = implode(',', $v['indexed_pages_num']);
                     $v['indexed_pages_num'] = implode(',', $v['indexed_pages_num']);
                     $v['g'] = implode(',', $v['g']);
                     $v['g'] = implode(',', $v['g']);
                     $v['keyword_num'] = implode(',', $v['keyword_num']);
                     $v['keyword_num'] = implode(',', $v['keyword_num']);
+                }else{
+                    $data = $rankDataModel->read(['project_id'=>$v['id'],'lang'=>''],['first_page_num','indexed_pages_num']);
+                    $v['first_page_num'] = $data['first_page_num'] ?? 0;
+                    $v['indexed_pages_num'] = $data['indexed_pages_num'] ?? 0;
+                    $v['g'] = $this->getGNum($v['id']);
                 }
                 }
-
+                $v = $this->handleParam($v);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -224,6 +223,7 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.start_date AS start_date',
             'gl_project_deploy_optimize.start_date AS start_date',
             'gl_project_deploy_optimize.backlink AS backlink',
             'gl_project_deploy_optimize.backlink AS backlink',
             'gl_project_deploy_optimize.ai_video AS ai_video',
             'gl_project_deploy_optimize.ai_video AS ai_video',
+            'gl_project_deploy_optimize.api_no AS api_no',
             'gl_domain_info.amp_status AS amp_status',
             'gl_domain_info.amp_status AS amp_status',
             'gl_domain_info.domain AS domain',
             'gl_domain_info.domain AS domain',
         ];
         ];

@@ -10,6 +10,7 @@
 namespace App\Http\Controllers\Bside;
 namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
+use App\Helper\PayStripeApi;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
@@ -34,7 +35,9 @@ class TestController extends BaseController
      * @time   :2024/11/11 14:51
      * @time   :2024/11/11 14:51
      */
      */
     public function ceshi(){
     public function ceshi(){
-        $this->response('success',Code::SUCCESS,[]);
+        $pay = new PayStripeApi();
+        $data = $pay->createPaymentIntent(5000,'cny');
+        $this->response('success',Code::SUCCESS,$data);
     }
     }