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

doc/AAMarket.py

@@ -130,10 +130,11 @@ class AAMarket(object):
                 ]
             },
             {
+                'method': 'GET',
                 'name': '/api/listing/:net_id/:account_address',
-                'desc': '获取账号资产',
+                'desc': '获取自己上链商品',
                 'group': '!AAMarket',
-                'url': 'https://market-test.kingsome.cn/api/asset/:net_id/:account_address',
+                'url': 'https://market-test.kingsome.cn/api/listing/:net_id/:account_address',
                 'params': [
                     [':net_id', 0, '链id'],
                     [':account_address', '', '钱包地址'],

webapp/controller/InGameMallController.class.php

@@ -425,8 +425,8 @@ After selling {$itemName}, you received {$falGold} gold
 EOD;
         $attachments = array(
             array(
-                'item_id' => V_ITEM_GOLD,
-                'item_num' => $falGold
+                'itemid' => V_ITEM_GOLD,
+                'itemnum' => $falGold
             )
         );
         $this->mailApiService->sendSellMail(

webapp/controller/MailController.class.php

@@ -33,6 +33,7 @@ class MailController extends BaseAuthedController {
             myself()->_rspErr(500,  'server internal error 4, url:');
             return;
         }
+        error_log(json_encode($dataJson));
         if ($dataJson['account_id'] != myself()->_getAccountId()) {
             myself()->_rspErr(500,  'server internal error 2, url:');
             return;