Merge branch 'james_bc' of git.kingsome.cn:server/game2006api into james_bc
This commit is contained in:
commit
f28b65b7bd
@ -191,12 +191,12 @@ class BagController extends BaseAuthedController {
|
|||||||
$errMsg = 'Parameter error name length must not be greater than 12';
|
$errMsg = 'Parameter error name length must not be greater than 12';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(!preg_match("/^[a-z\d]*$/i",$name))
|
/*if(!preg_match("/^[a-z\d]*$/i",$name))
|
||||||
{
|
{
|
||||||
$errCode = 5;
|
$errCode = 5;
|
||||||
$errMsg = 'Excuse me , the name you entered is in the wrong format.';
|
$errMsg = 'Excuse me , the name you entered is in the wrong format.';
|
||||||
return;
|
return;
|
||||||
}
|
}*/
|
||||||
$nameService = new services\NameService();
|
$nameService = new services\NameService();
|
||||||
if (!$nameService->verifyNameSign($name, $nameSign)){
|
if (!$nameService->verifyNameSign($name, $nameSign)){
|
||||||
$errCode = 5;
|
$errCode = 5;
|
||||||
|
@ -41,6 +41,7 @@ class BlockChainController extends BaseAuthedController {
|
|||||||
)));
|
)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
error_log(json_encode($_REQUEST));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getTransactionList()
|
public function getTransactionList()
|
||||||
@ -266,6 +267,9 @@ class BlockChainController extends BaseAuthedController {
|
|||||||
myself()->_rspErr(1, 'num paramater error');
|
myself()->_rspErr(1, 'num paramater error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
error_log(json_encode(
|
||||||
|
$_REQUEST
|
||||||
|
));
|
||||||
if (!$itemDb || $itemDb['item_num'] < $num) {
|
if (!$itemDb || $itemDb['item_num'] < $num) {
|
||||||
myself()->_rspErr(1, 'item not enough');
|
myself()->_rspErr(1, 'item not enough');
|
||||||
return;
|
return;
|
||||||
|
@ -162,7 +162,9 @@ class ShopController extends BaseAuthedController {
|
|||||||
|
|
||||||
$itemMeta = mt\Item::get($row['goods_id']);
|
$itemMeta = mt\Item::get($row['goods_id']);
|
||||||
$propertyChgService = new services\PropertyChgService();
|
$propertyChgService = new services\PropertyChgService();
|
||||||
$this->internalAddItem($propertyChgService, $itemMeta);
|
for ($i = 0; $i<$goods_num; $i++) {
|
||||||
|
$this->internalAddItem($propertyChgService, $itemMeta);
|
||||||
|
}
|
||||||
$awardService = new services\AwardService();
|
$awardService = new services\AwardService();
|
||||||
$awardService->addItem($row['goods_id'], $goods_num);
|
$awardService->addItem($row['goods_id'], $goods_num);
|
||||||
ShopBuyRecord::add($id, $goods_num);
|
ShopBuyRecord::add($id, $goods_num);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user