From b4cbb033da7d6daef1b4fed19f6dd3aeb08419da Mon Sep 17 00:00:00 2001
From: kf_wuhao <15392746632@qq.com>
Date: Thu, 14 Jan 2021 17:29:29 +0800
Subject: [PATCH] update

---
 task/owner_channel_server.py | 18 ++++++++++++++++--
 utils/dd_msg.py              |  6 ++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/task/owner_channel_server.py b/task/owner_channel_server.py
index b9dd583..e1c2e8b 100644
--- a/task/owner_channel_server.py
+++ b/task/owner_channel_server.py
@@ -80,8 +80,15 @@ class OwnerChannelServer(Task):
                 # 将 owner_channel_server_data 合并到 select_map_data
                 for owner, channels in owner_channel_server_data.items():
                     for channel, svr in channels.items():
-                        old_svr = select_map_data.get(owner, {}).get(channel, [])
-                        old_svr = map(lambda x: int(x), old_svr)
+                        old_svr_tmp = select_map_data.get(owner, {}).get(channel, [])
+                        # 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)
                         tmp_owner = select_map_data.setdefault(owner, {})
                         tmp_owner[channel] = list(svr)
@@ -126,4 +133,11 @@ class OwnerChannelServer(Task):
                                                               {'$set': {'data': new_owner_channel_select_data}},
                                                               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'])
diff --git a/utils/dd_msg.py b/utils/dd_msg.py
index a366e60..3024dc3 100644
--- a/utils/dd_msg.py
+++ b/utils/dd_msg.py
@@ -5,12 +5,15 @@ import urllib.parse
 import base64
 
 import requests
+from logger import logger
 
 from db import get_local_db
 
 
 __all__ = ('ddsend_msg',)
 
+from settings import settings
+
 local_db = get_local_db('admin_game')
 dd_conf = local_db['game'].find_one() or {}
 
@@ -31,6 +34,9 @@ def get_sign():
 
 
 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()
     if hash_msg not in msg_set: