From 92fda9036ba14eed720d26496e0fc9a6aaefd01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 6 Mar 2024 17:09:37 +0800
Subject: [PATCH] =?UTF-8?q?httpPostForJson=20=E5=A2=9E=E5=8A=A0=20options?=
 =?UTF-8?q?=20=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWeChat.php | 17 +++++++++--------
 WeMini/Security.php              |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 09cb1be..1f0724a 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -183,17 +183,18 @@ class BasicWeChat
      * 以POST获取接口数据并转为数组
      * @param string $url 接口地址
      * @param array $data 请求数据
-     * @param bool $buildToJson
+     * @param bool $toJson 转换JSON
+     * @param array $options 请求扩展数据
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    protected function httpPostForJson($url, array $data, $buildToJson = true)
+    protected function httpPostForJson($url, array $data, $toJson = true, array $options = [])
     {
         try {
-            $options = [];
-            if ($buildToJson) $options['headers'] = ['Content-Type: application/json'];
-            return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data, $options));
+            $options['headers'] = isset($options['headers']) ? $options['headers'] : [];
+            if ($toJson) $options['headers'][] = 'Content-Type: application/json';
+            return Tools::json2arr(Tools::post($url, $toJson ? Tools::arr2json($data) : $data, $options));
         } catch (InvalidResponseException $exception) {
             if (!$this->isTry && in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) {
                 [$this->delAccessToken(), $this->isTry = true];
@@ -223,15 +224,15 @@ class BasicWeChat
      * 接口通用POST请求方法
      * @param string $url 接口URL
      * @param array $data POST提交接口参数
-     * @param bool $isBuildJson
+     * @param bool $toJson 是否转换为JSON参数
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function callPostApi($url, array $data, $isBuildJson = true)
+    public function callPostApi($url, array $data, $toJson = true, array $options = [])
     {
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, $data, $isBuildJson);
+        return $this->httpPostForJson($url, $data, $toJson, $options);
     }
 
     /**
diff --git a/WeMini/Security.php b/WeMini/Security.php
index 0a5e731..060729e 100644
--- a/WeMini/Security.php
+++ b/WeMini/Security.php
@@ -36,7 +36,7 @@ class Security extends BasicWeChat
     public function imgSecCheck($media)
     {
         $url = 'https://api.weixin.qq.com/wxa/img_sec_check?access_token=ACCESS_TOKEN';
-        return $this->callPostApi($url, ['media' => $media], false);
+        return $this->callPostApi($url, ['media' => $media], false, ['headers' => ['Content-Type: application/octet-stream']]);
     }
 
     /**