wuhao/data_cleaning
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
kf_wuhao 2021-01-14 17:29:29 +08:00
parent 407f2e3075
commit b4cbb033da
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
task/owner_channel_server.py
View File

@ -80,8 +80,15 @@ class OwnerChannelServer(Task):
# 将 owner_channel_server_data 合并到 select_map_data # 将 owner_channel_server_data 合并到 select_map_data
for owner, channels in owner_channel_server_data.items(): for owner, channels in owner_channel_server_data.items():
for channel, svr in channels.items(): for channel, svr in channels.items():
old_svr = select_map_data.get(owner, {}).get(channel, []) old_svr_tmp = select_map_data.get(owner, {}).get(channel, [])
old_svr = map(lambda x: int(x), old_svr) # old_svr = map(lambda x: int(x), old_svr)
old_svr = []
for sid in old_svr_tmp:
if isinstance(sid, int):
old_svr.append(sid)
elif isinstance(sid, str) and sid.isdigit():
old_svr.append(int(sid))
svr.update(old_svr) svr.update(old_svr)
tmp_owner = select_map_data.setdefault(owner, {}) tmp_owner = select_map_data.setdefault(owner, {})
tmp_owner[channel] = list(svr) tmp_owner[channel] = list(svr)
@ -126,4 +133,11 @@ class OwnerChannelServer(Task):
{'$set': {'data': new_owner_channel_select_data}}, {'$set': {'data': new_owner_channel_select_data}},
upsert=True) upsert=True)
self.local_db[self.dest_coll].update_one({'pname': 'district_server_map'},
{'$set': {'data': server_alias}},
upsert=True)
self.remote_db[self.dest_coll].update_one({'pname': 'district_server_map'},
{'$set': {'data': server_alias}},
upsert=True)
self.set_cursor(cursor_st=ts['cursor_st'], cursor_et=ts['cursor_et']) self.set_cursor(cursor_st=ts['cursor_st'], cursor_et=ts['cursor_et'])

6
utils/dd_msg.py
View File

@ -5,12 +5,15 @@ import urllib.parse
import base64 import base64
import requests import requests
from logger import logger
from db import get_local_db from db import get_local_db
__all__ = ('ddsend_msg',) __all__ = ('ddsend_msg',)
from settings import settings
local_db = get_local_db('admin_game') local_db = get_local_db('admin_game')
dd_conf = local_db['game'].find_one() or {} dd_conf = local_db['game'].find_one() or {}
@ -31,6 +34,9 @@ def get_sign():
def ddsend_msg(msg): def ddsend_msg(msg):
if settings.run_model != 'production':
logger.error(msg)
return
hash_msg = hmac.new(msg.encode('utf-8'), digestmod=hashlib.sha256).digest() hash_msg = hmac.new(msg.encode('utf-8'), digestmod=hashlib.sha256).digest()
if hash_msg not in msg_set: if hash_msg not in msg_set: