From f5411c2138b35769ab9a76fcb1441515a75daaa0 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Sat, 30 Sep 2017 11:55:59 +0800
Subject: [PATCH] =?UTF-8?q?Alipay=20=E5=BC=82=E6=AD=A5=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97;=E5=88=A0=E9=99=A4JSON=5FUNESCAPED=5FUNICODE?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F,PHP5.4=E4=BB=A5=E4=B8=8B=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php        | 1 +
 webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index 0d4a916f..f4ffba33 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -93,6 +93,7 @@ class AlipayTradeService extends CI_Controller
     public function alipay_notice()
     {
         $resp_arr   = $this->input->post();
+        log_message('error','Alipay Original Notice :'.json_encode($resp_arr));
         $asyns_resp = $this->check($resp_arr);
         // 未得到结果
         if (empty($asyns_resp->data->out_trade_no)) {
diff --git a/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php b/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php
index 6929da92..ed892a77 100644
--- a/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php
+++ b/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php
@@ -24,7 +24,7 @@ class AlipayTradeQueryContentBuilder extends CI_Model
     public function getBizContent()
     {
         if(!empty($this->bizContentarr)){
-            $this->bizContent = json_encode($this->bizContentarr,JSON_UNESCAPED_UNICODE);
+            $this->bizContent = json_encode($this->bizContentarr); // 5.4增加的常量 JSON_UNESCAPED_UNICODE
         }
         return $this->bizContent;
     }