修改获取sts域名问题

Controller/CloudStorage.py

@@ -22,7 +22,7 @@ from django.views.generic.base import View
 
 from AdminController.CloudServiceManage.AgentOrderController import AgentOrderView
 from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
-    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE
+    AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE, CONFIG_US
 from Controller.CheckUserData import DataValid
 from Controller.CloudPhoto.CloudServiceController import CloudServiceController
 from Controller.PaymentCycle import Paypal
@@ -743,7 +743,10 @@ class CloudStorageView(View):
         uid_obj = UidTokenObject()
         uid_obj.generate(data={'uid': uid, 'channel': channel})
 
-        urls = 'http://vod.neutral2.com/'   # SERVER_DOMAIN_SSL,美洲暂用此域名请求到aws,解决设备获取sts超时问题
+        urls = SERVER_DOMAIN_SSL
+        # 美洲暂用此域名请求到aws, 解决设备获取sts超时问题
+        if CONFIG_INFO == CONFIG_US:
+            urls = 'http://vod.neutral2.com/'
         # 欧洲域名固定返回欧洲域名
         if domain_name in ['api.zositeche.com', 'api.loocam3.com', 'common.neutral3.com']:
             urls = 'https://api.zositeche.com/'