|
|
@@ -232,10 +232,8 @@ class DetectControllerViewV2(View):
|
|
|
etk = etkObj.encrypt(uid)
|
|
|
|
|
|
if company_secrete == 'MTEyMTNB':
|
|
|
- # url = DETECT_PUSH_DOMAIN
|
|
|
- # urls = DETECT_PUSH_DOMAINS
|
|
|
- url = SERVER_DOMAIN
|
|
|
- urls = SERVER_DOMAIN_SSL
|
|
|
+ url = DETECT_PUSH_DOMAIN
|
|
|
+ urls = DETECT_PUSH_DOMAINS
|
|
|
else:
|
|
|
url = DETECT_PUSH_DOMAIN_JIUAN
|
|
|
urls = DETECT_PUSH_DOMAINS_JIUAN
|
|
|
@@ -330,13 +328,13 @@ class DetectControllerViewV2(View):
|
|
|
response_url = oss_img_bucket.sign_url('GET', thumbspng, 300)
|
|
|
p['img'] = response_url
|
|
|
p['img_list'] = [response_url]
|
|
|
- if region == 2 and storage_location == 2: # 2:国内，aws
|
|
|
+ elif region == 2 and storage_location == 2: # 2:国内，aws
|
|
|
response_url = aws_s3_guonei.generate_presigned_url('get_object',
|
|
|
Params={'Bucket': 'push', 'Key': thumbspng},
|
|
|
ExpiresIn=300)
|
|
|
p['img'] = response_url
|
|
|
p['img_list'] = [response_url]
|
|
|
- if region == 1 and storage_location == 2: # 1：国外，aws
|
|
|
+ elif region == 1 and storage_location == 2: # 1：国外，aws
|
|
|
response_url = aws_s3_guowai.generate_presigned_url('get_object',
|
|
|
Params={'Bucket': 'foreignpush', 'Key': thumbspng},
|
|
|
ExpiresIn=300)
|
lhq