|
|
@@ -6,7 +6,6 @@
|
|
|
@Email : zhangdongming@asj6.wecom.work
|
|
|
@Software: PyCharm
|
|
|
"""
|
|
|
-import copy
|
|
|
import datetime
|
|
|
import hashlib
|
|
|
import json
|
|
|
@@ -30,7 +29,6 @@ from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID
|
|
|
from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
|
|
|
DeviceChannelUserPermission, UidSetModel, Device_Info, UserAudioVideoPush, PushLog
|
|
|
from Object.ETkObject import ETkObject
|
|
|
-from Object.GlobalThreadPoolObject import GlobalThreadPool
|
|
|
from Object.OCIObjectStorage import OCIObjectStorage
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
|
@@ -250,23 +248,13 @@ class DevicePushService:
|
|
|
params['push_type'] = push_type
|
|
|
params['redis_obj'] = redis_obj
|
|
|
|
|
|
- # 使用 copy.deepcopy 保证每个任务的 params 是独立的
|
|
|
- push_params = copy.copy(params) # 浅拷贝字典结构
|
|
|
- push_params['push_kwargs'] = copy.deepcopy(params['push_kwargs']) # 独立修改的字段再深拷贝
|
|
|
-
|
|
|
- try:
|
|
|
- GlobalThreadPool().submit(cls.send_app_msg_push, **push_params)
|
|
|
- except RuntimeError as e:
|
|
|
- ERROR_INFO_LOGGER.error(
|
|
|
- '推送消息线程池异常uid:{} 线程池已满，触发降级，使用原始线程启动. error_line:{} error_msg:{}'.format(
|
|
|
- uid, e.__traceback__.tb_lineno, repr(e)
|
|
|
- )
|
|
|
- )
|
|
|
- push_thread = threading.Thread(
|
|
|
- target=cls.send_app_msg_push,
|
|
|
- kwargs=push_params
|
|
|
- )
|
|
|
- push_thread.start()
|
|
|
+ # GlobalThreadPool().submit(cls.send_app_msg_push, **params)
|
|
|
+ push_thread = threading.Thread(
|
|
|
+ target=cls.send_app_msg_push,
|
|
|
+ kwargs=params
|
|
|
+ )
|
|
|
+ push_thread.start()
|
|
|
+
|
|
|
# 过滤相同的token_val
|
|
|
push_token_list.append(process_token)
|
|
|
except Exception as e:
|
zhangdongming