diff --git a/doc/AALogin.py b/doc/AALogin.py index 7f0209e0..deaa7265 100644 --- a/doc/AALogin.py +++ b/doc/AALogin.py @@ -82,7 +82,7 @@ class AALogin(object): { 'method': 'POST', 'name': 'auth2', - 'desc': '登录验证', + 'desc': '登录验证(errcode == 505 需要验证码)', 'group': '!AALogin', 'url': 'https://login-test.kingsome.cn/webapp/index.php?c=Login&a=auth2', 'is_json_params': True, @@ -97,6 +97,36 @@ class AALogin(object): ['server_time', 0, '回合制专用字段-服务器当前utc时间'], ] }, + { + 'method': 'POST', + 'name': 'verifyAccount', + 'desc': '校验账号信息', + 'group': '!AALogin', + 'url': 'https://login-test.kingsome.cn/webapp/index.php?c=Login&a=verifyAccount', + 'is_json_params': True, + 'params': [ + ['data', '', 'idtoken'], + ], + 'response': [ + _common.RspHead(), + ['state', '', '账号状态 1:可以直接进游戏 2:需要兑换码'], + ] + }, + { + 'method': 'POST', + 'name': 'useExchangeCode', + 'desc': '使用兑换码', + 'group': '!AALogin', + 'url': 'https://login-test.kingsome.cn/webapp/index.php?c=Login&a=useExchangeCode', + 'is_json_params': True, + 'params': [ + ['exchange_code', '', '兑换码'], + ['data', '', 'idtoken'], + ], + 'response': [ + _common.RspHead(), + ] + }, { 'name': 'getSwitch', 'desc': '获取开关', diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php index 2fba8c41..762b492e 100644 --- a/webapp/controller/OutAppNftController.class.php +++ b/webapp/controller/OutAppNftController.class.php @@ -135,6 +135,7 @@ class OutAppNftController extends BaseController { $tokenType = getReqVal('token_type', ''); $tokenId = getReqVal('token_id', ''); $info = array( + "token_id" => '', "name" => "", "description" => "", "image" => "", @@ -151,6 +152,7 @@ class OutAppNftController extends BaseController { } $heroMeta = \mt\Hero::get($heroDb['hero_id']); $NftMeta = \mt\NftDesc::getByItemId($heroDb['hero_id']); + $info['token_id'] = $tokenId; $info['name'] = $heroMeta['name']; $info['description'] = $NftMeta['desc']; $info['image'] = "https://res2.counterfire.games/nft/meta/".$heroDb['hero_id'].'_'.$heroDb['quality'].".gif"; @@ -167,6 +169,7 @@ class OutAppNftController extends BaseController { case Nft::GOLD_BULLION_TYPE: { $nftMeta = \mt\NftDesc::getByItemId($nftDb['item_id']); + $info['token_id'] = $tokenId; $info['name'] = $nftMeta['name']; $info['description'] = $nftMeta['desc']; $info['image'] = "https://res2.counterfire.games/nft/meta/".$nftDb['item_id'].".png"; diff --git a/webapp/controller/ToolsController.class.php b/webapp/controller/ToolsController.class.php index 4e23961e..092077e3 100644 --- a/webapp/controller/ToolsController.class.php +++ b/webapp/controller/ToolsController.class.php @@ -13,10 +13,10 @@ class ToolsController extends BaseController { public function _handlePre() { parent::_handlePre(); -// if (SERVER_ENV == _ONLINE) { -// die("can't create ToolsController"); -// return; -// } + if (SERVER_ENV == _ONLINE) { + die("can't create ToolsController"); + return; + } } public function test()