|
|
@@ -152,8 +152,8 @@ class NotificationView(View):
|
|
|
detect_interval = 60
|
|
|
redisObj.set_data(key=dkey, val=1, expire=detect_interval)
|
|
|
|
|
|
- if is_st == 1 or is_st == 3: # 使用aws s3
|
|
|
- aws_s3_client = s3_client(region=region)
|
|
|
+ # if is_st == 1 or is_st == 3: # 使用aws s3
|
|
|
+ aws_s3_client = s3_client(region=region)
|
|
|
kwag_args = {
|
|
|
'uid': uid,
|
|
|
'channel': channel,
|
|
|
@@ -244,9 +244,9 @@ class NotificationView(View):
|
|
|
try:
|
|
|
# 推送消息
|
|
|
if not have_dkey:
|
|
|
- if (is_st == 1 or is_st == 3) and (push_type == 0 or push_type == 1):
|
|
|
- push_thread = threading.Thread(target=self.push_thread_test, args=(push_type, aws_s3_client, uid, appBundleId, token_val, event_type, n_time, msg_title, msg_text))
|
|
|
- push_thread.start()
|
|
|
+ # if (is_st == 1 or is_st == 3) and (push_type == 0 or push_type == 1):
|
|
|
+ push_thread = threading.Thread(target=self.push_thread_test, args=(push_type, aws_s3_client, uid, appBundleId, token_val, event_type, n_time, msg_title, msg_text))
|
|
|
+ push_thread.start()
|
|
|
if push_type == 0: # ios apns
|
|
|
do_apns_code = self.do_apns(**kwag_args)
|
|
|
logger.info('进入do_apns,uid={}'.format(uid))
|
