测试服头像S3区域使用us-west-1

Ansjer/cn_config/config_test.py

@@ -16,6 +16,7 @@ AWS相关
 # SECRET_ACCESS_KEY = 'aI9gxcAKPmiGgPy9axrtFKzjYGbvpuytEX4xWweL'
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
+REGION_NAME2 = 'us-west-1'
 ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
 SECRET_ACCESS_KEY = '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'
 

Controller/TestApi.py

@@ -20,6 +20,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
+from Ansjer.cn_config.config_test import REGION_NAME2
 from Ansjer.config import CONFIG_INFO, REGION_NAME, AVATAR_BUCKET, ACCESS_KEY_ID, SECRET_ACCESS_KEY
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, \
     AWS_SECRET_ACCESS_KEY, SERVER_TYPE, AWS_SES_ACCESS_REGION
@@ -921,13 +922,13 @@ class testView(View):
     def ali_image_review(request_dict, response):
         aws_s3_client = boto3.client(
             's3',
-            region_name=REGION_NAME,
+            region_name=REGION_NAME2,
             aws_access_key_id=ACCESS_KEY_ID,
             aws_secret_access_key=SECRET_ACCESS_KEY,
             config=botocore.client.Config(signature_version='s3v4'),
         )
         # default/default.png
-        params = {'Bucket': AVATAR_BUCKET, 'Key': '100/习大大.jpg'}
+        params = {'Bucket': AVATAR_BUCKET, 'Key': 'default/default.png'}
         try:
             image_url = aws_s3_client.generate_presigned_url('get_object', Params=params)
             print(image_url)

Controller/UserManger.py

@@ -10,6 +10,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, View
 
+from Ansjer.cn_config.config_test import REGION_NAME2
 from Ansjer.config import BASE_DIR, ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, AVATAR_BUCKET, CONFIG_INFO, \
     CONFIG_CN, CONFIG_TEST, LOGGER
 from Ansjer.config import SERVER_DOMAIN
@@ -175,6 +176,16 @@ class perfectUserInfoView(TemplateView):
 
             #  测试/国内服,验证头像是否合规
             if CONFIG_INFO == CONFIG_CN or CONFIG_INFO == CONFIG_TEST:
+                # 测试服头像地区为us-west-1
+                if CONFIG_INFO == CONFIG_TEST:
+                    aws_s3_client = boto3.client(
+                        's3',
+                        region_name=REGION_NAME2,
+                        aws_access_key_id=ACCESS_KEY_ID,
+                        aws_secret_access_key=SECRET_ACCESS_KEY,
+                        config=botocore.client.Config(signature_version='s3v4'),
+                    )
+
                 params = {'Bucket': AVATAR_BUCKET, 'Key': Key}
                 image_url = aws_s3_client.generate_presigned_url('get_object', Params=params)
                 service = 'profilePhotoCheck'