优化s3链接逻辑

Controller/FeedBack.py

@@ -318,29 +318,21 @@ class FeedBackView(View):
             return response.json(444)
         if CONFIG_INFO == CONFIG_TEST or CONFIG_INFO == CONFIG_CN:  # 国内
             region_name = AWS_IOT_SES_ACCESS_CHINA_REGION
-            s3 = AmazonS3Util(
-                aws_access_key_id=AWS_ACCESS_KEY_ID[0],
-                secret_access_key=AWS_SECRET_ACCESS_KEY[0],
-                region_name=region_name
-            )
-        elif CONFIG_INFO == CONFIG_US:  # 国外
+            aws_access_key_id = AWS_ACCESS_KEY_ID[0]
+            secret_access_key = AWS_SECRET_ACCESS_KEY[0]
+        else:  # 国外
             region_name = AWS_SES_ACCESS_REGION
-            s3 = AmazonS3Util(
-                aws_access_key_id=AWS_ACCESS_KEY_ID[1],
-                secret_access_key=AWS_SECRET_ACCESS_KEY[1],
-                region_name=region_name
-            )
-        else:
-            region_name = ''
-            s3 = AmazonS3Util(
-                aws_access_key_id=AWS_ACCESS_KEY_ID[1],
-                secret_access_key=AWS_SECRET_ACCESS_KEY[1],
-                region_name=region_name
-            )
+            aws_access_key_id = AWS_ACCESS_KEY_ID[1]
+            secret_access_key = AWS_SECRET_ACCESS_KEY[1]
         equipment_info_id = equipment_info_id[1:]
         now_time = int(time.time())
         is_st = int(is_st)
         try:
+            s3 = AmazonS3Util(
+                aws_access_key_id=aws_access_key_id,
+                secret_access_key=secret_access_key,
+                region_name=region_name
+            )
             if is_st != 3:
                 file_path = '{uid}/{channel}/{event_time}.jpeg'.format(uid=uid,
                                                                        channel=channel,