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

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

Browse Source
This commit is contained in:
hujiabin 2024-09-27 15:58:34 +08:00
commit d4dab57ffd
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.php
View File

@ -3,7 +3,7 @@
const DBNAME_PREFIX = 'gamedb2006_dev_'; const DBNAME_PREFIX = 'gamedb2006_dev_';
const GLOBAL_TIME_OFFSET_KEY = 'gamedb2006_dev_:global_time_offset:'; const GLOBAL_TIME_OFFSET_KEY = 'gamedb2006_dev_:global_time_offset:';
const NET_ID = 13473; const NET_ID = 13473;
const BUY_SERVER_PKEY = 'iG4Rpsa)6U31$H#^T85$^^3'; const BUY_SERVER_PKEY = '6KJSOy=0oKbf@U^xtIR3';
const OUTAPP_PKEY = 'e58f(1dcf22245985c21ff31f2f66ec4a^^TDAFF(Adaf)'; const OUTAPP_PKEY = 'e58f(1dcf22245985c21ff31f2f66ec4a^^TDAFF(Adaf)';
const OUTAPP_PKEY1 = '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)'; const OUTAPP_PKEY1 = '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)';
const LISTING_SWITCH = 0; const LISTING_SWITCH = 0;

2
third_party/phpcommon vendored

@ -1 +1 @@
Subproject commit cdb9b1af750831d5d278f8069d57abf3d19e1c07 Subproject commit 5979f4656e7d27d8934db06039e9306ff6307a0c

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

@ -130,7 +130,8 @@ class BaseAuthedController extends BaseController {
} }
} }
if (!(myself()->_getChannel() == IMTBL_CHANNEL || if (!(myself()->_getChannel() == IMTBL_CHANNEL ||
myself()->_getChannel() == GUEST_CHANNEL)) { myself()->_getChannel() == GUEST_CHANNEL ||
myself()->_getChannel() == POLY_CHANNEL)) {
phpcommon\sendError(1001, 'session expiration'); phpcommon\sendError(1001, 'session expiration');
die(); die();
} }

1
webapp/controller/CallbackController.class.php
View File

@ -13,6 +13,7 @@ class CallbackController extends BaseController {
public function dispatch() public function dispatch()
{ {
error_log(json_encode($_REQUEST));
$cbService = new CallBackService(); $cbService = new CallBackService();
$action = getReqVal('action', ''); $action = getReqVal('action', '');
$cbService->dispatch($action); $cbService->dispatch($action);

7
webapp/controller/ShopController.class.php
View File

@ -29,7 +29,6 @@ use models\ShopBuyRecord;
use models\OrderId; use models\OrderId;
use models\InAppRecord; use models\InAppRecord;
use models\InAppOrder; use models\InAppOrder;
use services\LogService; use services\LogService;
use services\ShopService; use services\ShopService;
@ -294,6 +293,12 @@ class ShopController extends BaseAuthedController {
} }
$dailyBalance = max(0, $upLimit - $todayAmount); $dailyBalance = max(0, $upLimit - $todayAmount);
$totalBalance = max(0, $totalUpLimit - $totalAmount); $totalBalance = max(0, $totalUpLimit - $totalAmount);
error_log(json_encode(array(
'dailyBalance' => $dailyBalance,
'totalBalance' => $totalBalance,
'totalAmount' => $todayAmount,
'todayAmount' => $todayAmount
)));
return min($dailyBalance, $totalBalance); return min($dailyBalance, $totalBalance);
} }

1
webapp/services/LogService.php
View File

@ -11,6 +11,7 @@ use mt;
use models\User; use models\User;
use phpcommon\TGLog; use phpcommon\TGLog;
use phpcommon; use phpcommon;
use phpcommon\SqlHelper;
class LogService extends BaseService class LogService extends BaseService
{ {