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

config/config.php

@@ -3,7 +3,7 @@
 const DBNAME_PREFIX = 'gamedb2006_dev_';
 const GLOBAL_TIME_OFFSET_KEY = 'gamedb2006_dev_:global_time_offset:';
 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_PKEY1 = '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)';
 const LISTING_SWITCH = 0;

third_party/phpcommon

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

webapp/controller/BaseAuthedController.class.php

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

webapp/controller/CallbackController.class.php

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

webapp/controller/ShopController.class.php

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

webapp/services/LogService.php

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