From 4512521e285711e4c19fa5e510eaeeedd986cdc8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Nov 2019 17:56:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Conf/config.php | 3 ++ .../Controller/FengHuoApiController.class.php | 5 +-- .../GetInfoBaseController.class.php | 39 +++++++++++++++++++ .../Controller/OAController.class.php | 4 +- 4 files changed, 46 insertions(+), 5 deletions(-) rename Application/{Sdk => Admin}/Controller/FengHuoApiController.class.php (99%) create mode 100644 Application/Admin/Controller/GetInfoBaseController.class.php rename Application/{Sdk => Admin}/Controller/OAController.class.php (96%) diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index f0c3cb65..37e092b0 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -17,6 +17,9 @@ return array( 'DATA_CACHE_TYPE' => 'File', // 数据缓存类型 'URL_MODEL' => 3, //URL模式 + /*获取信息加密KEY*/ + 'GET_INFO_KEY' => 'wmkjtx_kj213', + /* 文件上传相关配置 */ 'DOWNLOAD_UPLOAD' => array( 'mimes' => '', //允许上传的文件MiMe类型 diff --git a/Application/Sdk/Controller/FengHuoApiController.class.php b/Application/Admin/Controller/FengHuoApiController.class.php similarity index 99% rename from Application/Sdk/Controller/FengHuoApiController.class.php rename to Application/Admin/Controller/FengHuoApiController.class.php index 264aa544..01272abb 100644 --- a/Application/Sdk/Controller/FengHuoApiController.class.php +++ b/Application/Admin/Controller/FengHuoApiController.class.php @@ -5,11 +5,11 @@ * Date: 2019/8/5 * Time: 16:04 */ -namespace SDK\Controller; +namespace Admin\Controller; use Think\Controller; use Think\Log; -class FengHuoApiController extends Controller{ +class FengHuoApiController extends GetInfoBaseController{ // protected function _initialize(){ // // 制定允许其他域名访问 // header("Access-Control-Allow-Origin:*"); @@ -57,7 +57,6 @@ class FengHuoApiController extends Controller{ * @param */ public function registerDetail(){ - $time = $_REQUEST['time']; $page = $_REQUEST['page']; $pageSize = $_REQUEST['page_size']; diff --git a/Application/Admin/Controller/GetInfoBaseController.class.php b/Application/Admin/Controller/GetInfoBaseController.class.php new file mode 100644 index 00000000..635a617b --- /dev/null +++ b/Application/Admin/Controller/GetInfoBaseController.class.php @@ -0,0 +1,39 @@ + $data['time_stamp']) { + $result = [ + 'ResultCode' => 2001, + 'ResultMessage' => "链接已过期", + 'Data' => 'null', + ]; + return $this->ajaxReturn($result); + } else { + $sign = $data['sign']; + unset($data['sign']); + ksort($data); + reset($data); + $str = ""; + foreach ($data as $k => $v) { + $str = $str . $k . "=" . $v; + } + $str = $str . 'key=' . C('GET_INFO_KEY'); + if (md5($str) != $sign) { + $result = [ + 'ResultCode' => 2001, + 'ResultMessage' => "参数错误", + 'Data' => 'null', + ]; + return $this->ajaxReturn($result); + } + } + } +} diff --git a/Application/Sdk/Controller/OAController.class.php b/Application/Admin/Controller/OAController.class.php similarity index 96% rename from Application/Sdk/Controller/OAController.class.php rename to Application/Admin/Controller/OAController.class.php index 07961413..cead68d8 100644 --- a/Application/Sdk/Controller/OAController.class.php +++ b/Application/Admin/Controller/OAController.class.php @@ -5,10 +5,10 @@ * Date: 2016/11/4 * Time: 16:04 */ -namespace SDK\Controller; +namespace Admin\Controller; use Think\Controller; -class OAController extends Controller{ +class OAController extends GetInfoBaseController{ /** * 游戏列表接口 From 68f562b91046dad62f79c58303b2109ea4f5056e Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Tue, 5 Nov 2019 18:24:16 +0800 Subject: [PATCH 2/4] order_status --- .../Sdk/Controller/UserController.class.php | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index dca5a34b..de0a92a8 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -3227,6 +3227,43 @@ class UserController extends BaseController exit; } + /** + * 订单状态 + */ + public function order_status() { + + $request = json_decode(base64_decode(file_get_contents("php://input")), true); + if (I("debug")) { + $request['orderno'] = "SP_20191105154135nTcz"; + } + if (!$request['orderno']) return ; + + $pay_where = substr($orderno, 0, 2); + $map['pay_order_number'] = $orderno; + + switch ($pay_where) { + case 'SP' : + $result = M('Spend', 'tab_')->field("*")->where($map)->find(); + break; + case 'PF' : + $result = M('deposit', 'tab_')->field('*')->where($map)->find(); + break; + case 'TB' : + $result = M('balance', 'tab_')->field('*')->where($map)->find(); + break; + case 'BR' : + $result = M('bind_recharge', 'tab_')->field('*')->where($map)->find(); + break; + } + // 支付成功跳转页面 + if ($result['pay_status'] == 1) { + $this->new_set_message(200, "支付成功"); + // $this->success("支付成功", U("userH/get_user_money", ['user_token' => $userToken])); + } else { + $this->new_set_message(0, "支付失败"); + } + + } } From 7c78b7d97cc683d35565b2876354c4609708a45a Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Nov 2019 19:04:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/BaseController.class.php | 2 +- Application/Sdk/Controller/GameController.class.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index 8af0c5c2..f57a6f33 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -11,7 +11,7 @@ class BaseController extends RestController{ 'Apple.apple_platform_pay','Spend.notice','Apple.apple_union_pay','WapPay.wap_shortcut_pay', 'WapPay.shortcut_pay','WapPay.android_shortcut_pay','WapPay.wap_shortcut_pay','WapPay.wap_shortcut_pay', 'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','get_user_money', - 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk', + 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk','get_suspend' // 'test','Game.get_suspend', ]; diff --git a/Application/Sdk/Controller/GameController.class.php b/Application/Sdk/Controller/GameController.class.php index 9643432e..745c581a 100644 --- a/Application/Sdk/Controller/GameController.class.php +++ b/Application/Sdk/Controller/GameController.class.php @@ -105,7 +105,9 @@ class GameController extends BaseController{ } $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find(); $menus = json_decode($sdkMenus['config'],true); - foreach($menus as $k => &$v) { + foreach($menus as $k => $v) { + if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']) + unset($menus[$k]); $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon']; // die; if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") { @@ -128,7 +130,10 @@ class GameController extends BaseController{ } $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config'); $personalMenu = json_decode($personalMenu, true); - foreach($personalMenu as $k => &$v) { + foreach($personalMenu as $k => $v) { + if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){ + unset($personalMenu[$k]); + } $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon']; // die; if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") { From f252305fdc5139abaad741e32875dd535f8c74ae Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 5 Nov 2019 19:07:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/BaseController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index f57a6f33..8af0c5c2 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -11,7 +11,7 @@ class BaseController extends RestController{ 'Apple.apple_platform_pay','Spend.notice','Apple.apple_union_pay','WapPay.wap_shortcut_pay', 'WapPay.shortcut_pay','WapPay.android_shortcut_pay','WapPay.wap_shortcut_pay','WapPay.wap_shortcut_pay', 'Apple.apple_weixin_pay','Ipa365','User.user_login','platform_coin_deduction','get_user_money', - 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk','get_suspend' + 'file_pay','pay','GameGiftPage','UserH', 'PayH5','init_sdk', // 'test','Game.get_suspend', ];