|
@@ -10,7 +10,6 @@ import base64
|
|
import json
|
|
import json
|
|
import logging
|
|
import logging
|
|
import os
|
|
import os
|
|
-import threading
|
|
|
|
import time
|
|
import time
|
|
|
|
|
|
import apns2
|
|
import apns2
|
|
@@ -19,9 +18,11 @@ import jpush
|
|
from boto3.session import Session
|
|
from boto3.session import Session
|
|
from django.views.generic.base import View
|
|
from django.views.generic.base import View
|
|
from pyfcm import FCMNotification
|
|
from pyfcm import FCMNotification
|
|
-from AnsjerPush.config import SERVER_TYPE, AI_IDENTIFICATION_TAGS_DICT
|
|
|
|
|
|
+
|
|
|
|
+from AnsjerPush.config import AI_IDENTIFICATION_TAGS_DICT, CONFIG_US, CONFIG_EUR
|
|
from AnsjerPush.config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, APNS_MODE, APNS_CONFIG, BASE_DIR, \
|
|
from AnsjerPush.config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, APNS_MODE, APNS_CONFIG, BASE_DIR, \
|
|
JPUSH_CONFIG, FCM_CONFIG
|
|
JPUSH_CONFIG, FCM_CONFIG
|
|
|
|
+from AnsjerPush.config import CONFIG_INFO
|
|
from Model.models import UidPushModel, AiService
|
|
from Model.models import UidPushModel, AiService
|
|
from Object import MergePic
|
|
from Object import MergePic
|
|
from Object.ETkObject import ETkObject
|
|
from Object.ETkObject import ETkObject
|
|
@@ -163,8 +164,8 @@ class AiView(View):
|
|
# 上传缩略图到s3
|
|
# 上传缩略图到s3
|
|
file_dict = {}
|
|
file_dict = {}
|
|
for i, val in enumerate(file_path_list):
|
|
for i, val in enumerate(file_path_list):
|
|
- file_dict[val] = "{uid}/{channel}/{n_time}_{i}.jpeg".format(uid=uid, channel=channel, # 封面图
|
|
|
|
- n_time=n_time, i=i)
|
|
|
|
|
|
+ file_dict[val] = "{uid}/{channel}/{n_time}_{i}.jpeg".format(uid=uid, channel=channel, # 封面图
|
|
|
|
+ n_time=n_time, i=i)
|
|
self.upload_s3(file_dict, dir_path)
|
|
self.upload_s3(file_dict, dir_path)
|
|
# time.sleep(10)
|
|
# time.sleep(10)
|
|
# 存储消息以及推送
|
|
# 存储消息以及推送
|
|
@@ -360,11 +361,10 @@ class AiView(View):
|
|
return {'eventType': eventType, 'label_list': label_list,
|
|
return {'eventType': eventType, 'label_list': label_list,
|
|
'new_bounding_box_dict': new_bounding_box_dict}
|
|
'new_bounding_box_dict': new_bounding_box_dict}
|
|
|
|
|
|
-
|
|
|
|
def upload_s3(self, file_dict, dir_path):
|
|
def upload_s3(self, file_dict, dir_path):
|
|
try:
|
|
try:
|
|
- if SERVER_TYPE == "Ansjer.formal_settings" or SERVER_TYPE == 'Ansjer.eur_formal_settings':
|
|
|
|
- #存国外
|
|
|
|
|
|
+ if CONFIG_INFO == CONFIG_US or CONFIG_INFO == CONFIG_EUR:
|
|
|
|
+ # 存国外
|
|
aws_key = AWS_ACCESS_KEY_ID[1]
|
|
aws_key = AWS_ACCESS_KEY_ID[1]
|
|
aws_secret = AWS_SECRET_ACCESS_KEY[1]
|
|
aws_secret = AWS_SECRET_ACCESS_KEY[1]
|
|
session = Session(aws_access_key_id=aws_key,
|
|
session = Session(aws_access_key_id=aws_key,
|
|
@@ -373,7 +373,7 @@ class AiView(View):
|
|
s3 = session.resource("s3")
|
|
s3 = session.resource("s3")
|
|
bucket = "foreignpush"
|
|
bucket = "foreignpush"
|
|
else:
|
|
else:
|
|
- #存国内
|
|
|
|
|
|
+ # 存国内
|
|
aws_key = AWS_ACCESS_KEY_ID[0]
|
|
aws_key = AWS_ACCESS_KEY_ID[0]
|
|
aws_secret = AWS_SECRET_ACCESS_KEY[0]
|
|
aws_secret = AWS_SECRET_ACCESS_KEY[0]
|
|
session = Session(aws_access_key_id=aws_key,
|
|
session = Session(aws_access_key_id=aws_key,
|