server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'james_bc' of git.kingsome.cn:server/game2006api into james_bc

Browse Source
This commit is contained in:
hujiabin 2022-11-24 11:40:24 +08:00
commit a3054bb3ef
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/phpcommon vendored

@ -1 +1 @@
Subproject commit 571b6c46137597d3bede13989e284130a070bea0
Subproject commit daad845e894ca033c4fdd31c9c6f39e1e4040f02

20
webapp/controller/BaseAuthedController.class.php
View File

@ -33,6 +33,18 @@ class BaseAuthedController extends BaseController {
private $sessionId = '';
private $mysqlConn = null;
private function isWhiteList()
{
$whiteList = array(
'0x875835829e95fe87e53a2dfcfd9860a735b70754',
'0x11299400d87f24e79af8cb8cc5661792bea45300',
'0x898a887fa574dd0297f202d66d5a65787acc1316',
'0x9b703a5a094df5b1ba4f3dec15810f7c708e31fa',
'0xef59f6cc4d190a0ae576c46d4583e92b61174340'
);
return in_array(myself()->_getOpenId(), $whiteList);
}
public function _handlePre()
{
$this->accountId = getReqVal('account_id', '');
@ -59,6 +71,14 @@ class BaseAuthedController extends BaseController {
die();
}
}
if (SERVER_ENV == _ONLINE) {
if (phpcommon\cmpVersion(getReqVal('_version', ''), '0.2.0') > 0) {
if (!$this->isWhiteList() || myself()->_getChannel() != BC_CHANNEL) {
phpcommon\sendError(1002, '');
die();
}
}
}
}
protected function updateSession($accountId, $sessionId)

12
webapp/controller/BlockChainController.class.php
View File

@ -860,6 +860,12 @@ class BlockChainController extends BaseAuthedController {
$itemDb['item_uniid'],
$itemDb['item_id']
);
Bag::decItemByUnIid($itemDb['item_uniid'], $num);
TransactionPrefee::add($transId, array(
'item_uniid' => $itemDb['item_uniid'],
'item_id' => $itemDb['item_id'],
'item_num' => $num,
));
myself()->_rspData(array(
'trans_id' => $transId,
'params' => $rspObj['params']
@ -909,6 +915,12 @@ class BlockChainController extends BaseAuthedController {
$itemDb['item_uniid'],
$itemId
);
Bag::decItemByUnIid($itemDb['item_uniid'], $num);
TransactionPrefee::add($transId, array(
'item_uniid' => $itemDb['item_uniid'],
'item_id' => $itemDb['item_id'],
'item_num' => $num,
));
myself()->_rspData(array(
'trans_id' => $transId,
'params' => $rspObj['params']

4
webapp/models/TransactionPrefee.php
View File

@ -17,7 +17,7 @@ class TransactionPrefee extends BaseModel
'trans_id' => $transId,
'target_token_id' => isset($param['token_id']) ? $param['token_id']:0,
'target_token_type' => isset($param['token_type']) ? $param['token_type']:0,
// 'item_uniid' => $transId,
'item_uniid' => isset($param['item_uniid']) ? $param['item_uniid'] : 0,
'item_id' => $param['item_id'],
'item_num' => $param['item_num'],
'done' => 0,
@ -26,4 +26,4 @@ class TransactionPrefee extends BaseModel
)
);
}
}
}