From 57c6ce8146917b572e71b56299b79babb4e14074 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 23 Jul 2024 15:31:09 +0800 Subject: [PATCH 1/3] 1 --- config/accountdb.mysql.cluster.php | 11 +++++++++++ config/game2006api.mysql.cluster.php | 11 +++++++++++ config/game2006api.redis.cluster.php | 16 ++++++++++++++++ config/game2006market.mysql.cluster.php | 10 ++++++++++ config/game2006relation.mysql.cluster.php | 10 ++++++++++ config/mail.mysql.cluster.php | 10 ++++++++++ config/marketserver.cluster.php | 7 +++++++ config/routes.php | 9 +++++++++ config/web3service.cluster.php | 5 +++++ 9 files changed, 89 insertions(+) create mode 100644 config/accountdb.mysql.cluster.php create mode 100644 config/game2006api.mysql.cluster.php create mode 100644 config/game2006api.redis.cluster.php create mode 100644 config/game2006market.mysql.cluster.php create mode 100644 config/game2006relation.mysql.cluster.php create mode 100644 config/mail.mysql.cluster.php create mode 100644 config/marketserver.cluster.php create mode 100644 config/routes.php create mode 100644 config/web3service.cluster.php diff --git a/config/accountdb.mysql.cluster.php b/config/accountdb.mysql.cluster.php new file mode 100644 index 00000000..389e5695 --- /dev/null +++ b/config/accountdb.mysql.cluster.php @@ -0,0 +1,11 @@ + 1, + 'host' => 'mysql-host', + 'port' => 3306, + 'user' => 'root', + 'passwd' => 'keji178', + 'dbname' => 'accountdb1', +); + diff --git a/config/game2006api.mysql.cluster.php b/config/game2006api.mysql.cluster.php new file mode 100644 index 00000000..5320963c --- /dev/null +++ b/config/game2006api.mysql.cluster.php @@ -0,0 +1,11 @@ + 1, + 'host' => 'mysql-host', + 'port' => 3306, + 'user' => 'root', + 'passwd' => 'keji178', + ) +); diff --git a/config/game2006api.redis.cluster.php b/config/game2006api.redis.cluster.php new file mode 100644 index 00000000..f243310d --- /dev/null +++ b/config/game2006api.redis.cluster.php @@ -0,0 +1,16 @@ + 1, + 'host' => 'redis-host', + 'port' => 6379, + 'passwd' => '', + ), + array( + 'instance_id' => 2, + 'host' => 'redis-host', + 'port' => 6379, + 'passwd' => '', + ), +); diff --git a/config/game2006market.mysql.cluster.php b/config/game2006market.mysql.cluster.php new file mode 100644 index 00000000..a1bc7b4c --- /dev/null +++ b/config/game2006market.mysql.cluster.php @@ -0,0 +1,10 @@ + 1, + 'host' => 'mysql-host', + 'port' => 3306, + 'user' => 'root', + 'passwd' => 'keji178', + 'dbname' => 'bcnft_dev', +); diff --git a/config/game2006relation.mysql.cluster.php b/config/game2006relation.mysql.cluster.php new file mode 100644 index 00000000..3d04a06d --- /dev/null +++ b/config/game2006relation.mysql.cluster.php @@ -0,0 +1,10 @@ + 1, + 'host' => 'mysql-host', + 'port' => 3306, + 'user' => 'root', + 'passwd' => 'root', + 'dbname' => 'frienddb_dev_new', +); diff --git a/config/mail.mysql.cluster.php b/config/mail.mysql.cluster.php new file mode 100644 index 00000000..8208f861 --- /dev/null +++ b/config/mail.mysql.cluster.php @@ -0,0 +1,10 @@ + 1, + 'host' => 'mysql-host', + 'port' => 3306, + 'user' => 'root', + 'passwd' => 'keji178', + 'dbname' => 'maildb_dev_1' + ); diff --git a/config/marketserver.cluster.php b/config/marketserver.cluster.php new file mode 100644 index 00000000..b3567068 --- /dev/null +++ b/config/marketserver.cluster.php @@ -0,0 +1,7 @@ + 1, + 'host' => '127.0.0.1', + 'port' => 7521 +); diff --git a/config/routes.php b/config/routes.php new file mode 100644 index 00000000..10b3dc60 --- /dev/null +++ b/config/routes.php @@ -0,0 +1,9 @@ + 1, + 'Market' => 1, +); + +$gExcludeRoutes = array( +); diff --git a/config/web3service.cluster.php b/config/web3service.cluster.php new file mode 100644 index 00000000..6bae9f06 --- /dev/null +++ b/config/web3service.cluster.php @@ -0,0 +1,5 @@ + Date: Tue, 23 Jul 2024 19:15:38 +0800 Subject: [PATCH 2/3] 1 --- doc/AAMarket.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/AAMarket.py b/doc/AAMarket.py index 4cb2d5a8..80be304d 100644 --- a/doc/AAMarket.py +++ b/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时间'], + ['score', '', '分数'], + ], '数据'], + ] + }, { 'method': 'GET', 'name': '/api/chain/txhash/:net_id/:txhash', From 0dcd21ee52f30ca974605c8caedaeae4e7886cce Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 23 Jul 2024 19:16:54 +0800 Subject: [PATCH 3/3] 1 --- doc/AAMarket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/AAMarket.py b/doc/AAMarket.py index 80be304d..79f3ad0e 100644 --- a/doc/AAMarket.py +++ b/doc/AAMarket.py @@ -329,7 +329,7 @@ class AAMarket(object): _common.RspHead(), ['!rows', [ ['date', 0, '日期utc时间'], - ['score', '', '分数'], + ['contribution_point', 0, '贡献点'], ], '数据'], ] },