From b23bedd9866ddcd050555ba0ac0ccf4063bea83a Mon Sep 17 00:00:00 2001
From: wuhao <15392746632@qq.com>
Date: Tue, 20 Oct 2020 13:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4debug=E5=8C=BA=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py                   | 3 ++-
 update_data/update_pay.py | 3 +++
 utils/get_server.py       | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index bcde1b6..62d0355 100644
--- a/main.py
+++ b/main.py
@@ -14,7 +14,7 @@ loop = asyncio.get_event_loop()
 
 async def main():
     tasks = []
-    server_df = get_server_list()
+    server_df, game_df = get_server_list()
 
     # gm_db  pool
     gm_db_pool = await aiomysql.create_pool(**settings.GAME_MANA_MYSQLDB, maxsize=100, autocommit=True)
@@ -46,6 +46,7 @@ async def main():
         task = asyncio.create_task(LoadPayData(pay_db_conf=pay_db_conf,
                                                gm_db_pool=gm_db_pool,
                                                game_name=game_name,
+                                               serverid_list=list(game_df.get_group(game_name)['serverid'].unique())
                                                ).run())
         tasks.append(task)
 
diff --git a/update_data/update_pay.py b/update_data/update_pay.py
index 562ab9c..c9712c9 100644
--- a/update_data/update_pay.py
+++ b/update_data/update_pay.py
@@ -13,6 +13,7 @@ class LoadPayData(LoadData):
         super().__init__(*args, **kwargs)
         self.pay_mysql_conf = kwargs.get('pay_db_conf')
         self.game_name = kwargs.get('game_name')
+        self.serverid_list = kwargs.get('serverid_list')
 
     async def get_data(self):
         # 获取充值数据 所有区服
@@ -31,6 +32,8 @@ class LoadPayData(LoadData):
         await cur.execute(sql, (self.last_act_time - 3600,))
         rss = await cur.fetchall()
         for p in rss:
+            if p.get('serverid') not in self.serverid_list:
+                continue
             p['data'] = p['data2']
         await cur.close()
         pay_mysql.close()
diff --git a/utils/get_server.py b/utils/get_server.py
index 2de757f..3cfeee4 100644
--- a/utils/get_server.py
+++ b/utils/get_server.py
@@ -8,7 +8,7 @@ from config import settings
 但以db host同步 lastActTime_**_host 并不会停止
 导致 该区服丢失一次数据
 """
-def get_server_list() -> pd.DataFrame:
+def get_server_list():
     server_df = pd.read_json(settings.SERVER_LIST_URL)
     server_df = server_df[
         (server_df['debug'] != '1')
@@ -18,4 +18,4 @@ def get_server_list() -> pd.DataFrame:
         & (~server_df['game'].isin(['xiyou', 'fengshen', 'hommh5', 'sanguo', 'gods']))
         ]
 
-    return server_df.groupby(['game', 'dbhost', 'dbport', 'dbuser', 'dbpwd'])
+    return server_df.groupby(['game', 'dbhost', 'dbport', 'dbuser', 'dbpwd']), server_df.groupby('game')