From ab018802019c828e601ff5838de0a9c9ef472b4c Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 20 Nov 2019 18:32:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E5=BF=BD=E7=95=A5sdk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/GameGiftController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Sdk/Controller/GameGiftController.class.php b/Application/Sdk/Controller/GameGiftController.class.php index b1f96320..f9448c8c 100644 --- a/Application/Sdk/Controller/GameGiftController.class.php +++ b/Application/Sdk/Controller/GameGiftController.class.php @@ -14,6 +14,7 @@ class GameGiftController extends BaseController{ $gift = M("Giftbag","tab_"); $map['game_id'] = $request['game_id']; $map['status']=1; + $map['giftbag_name'] = ['NEQ','超级签专属礼包']; $row = $request['row']?:10; $page = $request['p']?:1; switch ($request['sdk_version']) { From f98c1427a6afd103b25520e0147f1a1a27f25f3d Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Wed, 20 Nov 2019 20:07:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/Notify2Controller.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php index 2c7e99c0..3b37f6cd 100644 --- a/Application/Callback/Controller/Notify2Controller.class.php +++ b/Application/Callback/Controller/Notify2Controller.class.php @@ -3,6 +3,7 @@ namespace Callback\Controller; use Org\UcenterSDK\Ucservice; +use Think\Log; /** @@ -40,7 +41,8 @@ class Notify2Controller extends BaseController $aop = new \AopClient(); $aop->alipayrsaPublicKey = file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"); $result = $aop->rsaCheckV1($notify,'','RSA2'); - + Log::write(json_encode($notify),Log::DEBUG); + Log::write(json_encode($result),Log::DEBUG); if ($result) { //获取回调订单信息 if (I('get.methodtype') == "notify") { From 798552ce56c62175c49affc1c026bdce981f4cdb Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Wed, 20 Nov 2019 20:17:35 +0800 Subject: [PATCH 3/5] 0.4 --- Application/Callback/Controller/Notify2Controller.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php index 3b37f6cd..2d27c16a 100644 --- a/Application/Callback/Controller/Notify2Controller.class.php +++ b/Application/Callback/Controller/Notify2Controller.class.php @@ -42,6 +42,7 @@ class Notify2Controller extends BaseController $aop->alipayrsaPublicKey = file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"); $result = $aop->rsaCheckV1($notify,'','RSA2'); Log::write(json_encode($notify),Log::DEBUG); + Log::write(file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"),Log::DEBUG); Log::write(json_encode($result),Log::DEBUG); if ($result) { //获取回调订单信息 From d952801915357b06eb50a997749a59c4da34c384 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Wed, 20 Nov 2019 20:26:45 +0800 Subject: [PATCH 4/5] 1.0 --- Application/Callback/Controller/Notify2Controller.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php index 2d27c16a..1bd66ece 100644 --- a/Application/Callback/Controller/Notify2Controller.class.php +++ b/Application/Callback/Controller/Notify2Controller.class.php @@ -41,9 +41,6 @@ class Notify2Controller extends BaseController $aop = new \AopClient(); $aop->alipayrsaPublicKey = file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"); $result = $aop->rsaCheckV1($notify,'','RSA2'); - Log::write(json_encode($notify),Log::DEBUG); - Log::write(file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"),Log::DEBUG); - Log::write(json_encode($result),Log::DEBUG); if ($result) { //获取回调订单信息 if (I('get.methodtype') == "notify") { From a7cf4dfe429ca13d3a1023aac0a06e207887c8d9 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 21 Nov 2019 09:22:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=B8=81=E5=85=85=E5=80=BC=E6=8F=90=E7=A4=BA=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/ChangyanController.class.php | 4 ++-- .../View/default/UserH/platform_pay_show.html | 2 +- Public/Sdk/images/erroricon2.png | Bin 0 -> 59248 bytes 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 Public/Sdk/images/erroricon2.png diff --git a/Application/Sdk/Controller/ChangyanController.class.php b/Application/Sdk/Controller/ChangyanController.class.php index fa7c401d..af297a28 100644 --- a/Application/Sdk/Controller/ChangyanController.class.php +++ b/Application/Sdk/Controller/ChangyanController.class.php @@ -48,8 +48,8 @@ class ChangyanController extends Controller { // $this->assign('game_id',"1"); // $this->display("WapPay/wap_shortcut_pay"); - $this->display("UserH/platform_pay"); - // $this->display("Spend/paycallback"); + // $this->display("UserH/platform_pay"); + $this->display("UserH/platform_pay_show"); # code... } diff --git a/Application/Sdk/View/default/UserH/platform_pay_show.html b/Application/Sdk/View/default/UserH/platform_pay_show.html index 9cbcdfe9..55210dd7 100644 --- a/Application/Sdk/View/default/UserH/platform_pay_show.html +++ b/Application/Sdk/View/default/UserH/platform_pay_show.html @@ -17,7 +17,7 @@