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

config/accountdb.mysql.cluster.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'instance_id' => 1,
+    'host' => 'mysql-host',
+    'port' => 3306,
+    'user' => 'root',
+    'passwd' => 'keji178',
+    'dbname' => 'accountdb1',
+);
+

config/game2006api.mysql.cluster.php

@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    array(
+        'instance_id' => 1,
+        'host' => 'mysql-host',
+        'port' => 3306,
+        'user' => 'root',
+        'passwd' => 'keji178',
+    )
+);

config/game2006api.redis.cluster.php

@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    array(
+        'instance_id' => 1,
+        'host' => 'redis-host',
+        'port' => 6379,
+        'passwd' => '',
+    ),
+    array(
+        'instance_id' => 2,
+        'host' => 'redis-host',
+        'port' => 6379,
+        'passwd' => '',
+    ),
+);

config/game2006market.mysql.cluster.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+    'instance_id' => 1,
+    'host' => 'mysql-host',
+    'port' => 3306,
+    'user' => 'root',
+    'passwd' => 'keji178',
+    'dbname' => 'bcnft_dev',
+);

config/game2006relation.mysql.cluster.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+    'instance_id' => 1,
+    'host' => 'mysql-host',
+    'port' => 3306,
+    'user' => 'root',
+    'passwd' => 'root',
+    'dbname' => 'frienddb_dev_new',
+);

config/mail.mysql.cluster.php

@@ -0,0 +1,10 @@
+<?php
+
+return  array(
+        'instance_id' => 1,
+        'host' => 'mysql-host',
+        'port' => 3306,
+        'user' => 'root',
+        'passwd' => 'keji178',
+        'dbname' => 'maildb_dev_1'
+    );

config/marketserver.cluster.php

@@ -0,0 +1,7 @@
+<?php
+
+return array(
+    'instance_id' => 1,
+    'host' => '127.0.0.1',
+    'port' => 7521
+);

config/routes.php

@@ -0,0 +1,9 @@
+<?php
+
+$gOnlyRoutes1 = array(
+    'Ops' => 1,
+    'Market' => 1,
+);
+
+$gExcludeRoutes = array(
+);

config/web3service.cluster.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'http://10.10.9.15:7672/webapp/index.php'
+);

doc/AAMarket.py

@@ -317,6 +317,22 @@ class AAMarket(object):
                     ['contribution_point', 0, '贡献点'],
                 ]
             },
+            {
+                'method': 'GET',
+                'name': '/api/activity/stacking/history/:account_address',
+                'desc': '质押活动-获取每日所得历史记录',
+                'group': '!AAMarket',
+                'url': '/api/activity/stacking/history/:account_address',
+                'params': [
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['!rows', [
+                        ['date', 0, '日期utc时间'],
+                        ['contribution_point', 0, '贡献点'],
+                    ], '数据'],
+                ]
+            },
             {
                 'method': 'GET',
                 'name': '/api/chain/txhash/:net_id/:txhash',