|
|
@@ -10,7 +10,9 @@ import requests
|
|
|
|
|
|
from django.views import View
|
|
|
from Ansjer.config import BASE_DIR, AWS_IOT_GETS3_PULL_CHINA_ID, AWS_IOT_GETS3_PULL_CHINA_SECRET, \
|
|
|
- AWS_IOT_GETS3_PULL_FOREIGN_ID, AWS_IOT_GETS3_PULL_FOREIGN_SECRET, AWS_ARN
|
|
|
+ AWS_IOT_GETS3_PULL_FOREIGN_ID, AWS_IOT_GETS3_PULL_FOREIGN_SECRET, AWS_ARN, AWS_IOT_SES_ACCESS_CHINA_REGION, \
|
|
|
+ AWS_IOT_SES_ACCESS_FOREIGN_REGION_ASIA, AWS_IOT_SES_ACCESS_FOREIGN_REGION_EUROPE, \
|
|
|
+ AWS_IOT_SES_ACCESS_FOREIGN_REGION_AMERICA
|
|
|
from base64 import b64encode, encodebytes
|
|
|
from Controller.DeviceConfirmRegion import Device_Region
|
|
|
from Model.models import Device_User, Device_Info, iotdeviceInfoModel, UIDCompanySerialModel, \
|
|
|
@@ -367,20 +369,28 @@ class IotCoreView(View):
|
|
|
|
|
|
def get_s3_key_return_msg(self,endpoint):
|
|
|
MSG = {}
|
|
|
- if endpoint == 'cn-northwest-1':
|
|
|
+ if 'cn-northwest-1' in endpoint :
|
|
|
key = AWS_IOT_GETS3_PULL_CHINA_ID
|
|
|
secret = AWS_IOT_GETS3_PULL_CHINA_SECRET
|
|
|
arn = AWS_ARN[0]
|
|
|
+ region_name = AWS_IOT_SES_ACCESS_CHINA_REGION
|
|
|
else:
|
|
|
key = AWS_IOT_GETS3_PULL_FOREIGN_ID
|
|
|
secret = AWS_IOT_GETS3_PULL_FOREIGN_SECRET
|
|
|
arn = AWS_ARN[1]
|
|
|
+ if 'ap-southeast-1' in endpoint :
|
|
|
+ region_name = AWS_IOT_SES_ACCESS_FOREIGN_REGION_ASIA
|
|
|
+ if 'eu-west-1' in endpoint :
|
|
|
+ region_name = AWS_IOT_SES_ACCESS_FOREIGN_REGION_EUROPE
|
|
|
+ if 'us-east-1' in endpoint :
|
|
|
+ region_name = AWS_IOT_SES_ACCESS_FOREIGN_REGION_AMERICA
|
|
|
|
|
|
MSG['AccessKeyId'] = key
|
|
|
MSG['AccessKeySecret'] = secret
|
|
|
MSG['endpoint'] = endpoint
|
|
|
MSG['bucket_name'] = 'asj-log'
|
|
|
MSG['arn'] = arn
|
|
|
+ MSG['region_name'] = region_name
|
|
|
return MSG
|
|
|
|
|
|
|
chenshibin