新增KVS地区配置

Ansjer/cn_config/config_formal.py

@@ -12,6 +12,7 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws-cn:s3'
 REGION_NAME = 'cn-northwest-1'
+KVS_REGION = 'cn-north-1'
 ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
 SECRET_ACCESS_KEY = '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'
 

Ansjer/cn_config/config_test.py

@@ -13,6 +13,7 @@ AWS相关
 AWS_ARN_S3 = 'arn:aws-cn:s3'
 REGION_NAME = 'cn-northwest-1'
 REGION_NAME2 = 'cn-north-1'
+KVS_REGION = 'cn-north-1'
 ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
 SECRET_ACCESS_KEY = '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'
 # AWS_ARN_S3 = 'arn:aws:s3'
@@ -45,9 +46,6 @@ DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
 DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
 TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
 
-# AWS域名节点
-KVS_ENDPOINT = 'kinesisvideo.cn-north-1.amazonaws.com.cn'
-
 # token的secret
 OAUTH_ACCESS_TOKEN_SECRET = 'test_a+jbgnw%@1%zy^=@dn62%'
 OAUTH_REFRESH_TOKEN_SECRET = 'test_r+jbgnw%@1%zy^=@dn62%'

Ansjer/eur_config/config_formal.py

@@ -12,6 +12,7 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
+KVS_REGION = 'eu-west-1'
 ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
 SECRET_ACCESS_KEY = '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'
 

Ansjer/us_config/config_formal.py

@@ -12,6 +12,7 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
+KVS_REGION = 'us-east-1'
 ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
 SECRET_ACCESS_KEY = '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'
 

Controller/AWS/KVSController.py

@@ -7,7 +7,6 @@
 import base64
 import hashlib
 import json
-import pickle
 import time
 import uuid
 import datetime
@@ -15,7 +14,6 @@ import datetime
 import boto3
 import botocore
 import requests
-from botocore.awsrequest import AWSRequest
 from django.http import HttpResponse
 from django.views import View
 
@@ -23,7 +21,7 @@ from Model.models import KVS, Device_User, Device_Info
 from Object.AWS.AmazonKinesisVideoUtil import AmazonKinesisVideoObject, AmazonKVAMObject
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
-from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, SERVER_DOMAIN, KVS_ENDPOINT, LOGGER
+from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, SERVER_DOMAIN, LOGGER, KVS_REGION
 from Object.TokenObject import TokenObject
 from botocore.auth import SigV4Auth
 from botocore.awsrequest import AWSRequest
@@ -304,7 +302,7 @@ class KVSView(View):
             kinesis_video_obj = AmazonKinesisVideoObject(
                 aws_access_key_id=ACCESS_KEY_ID,
                 secret_access_key=SECRET_ACCESS_KEY,
-                region_name=REGION_NAME
+                region_name=KVS_REGION
             )
             stream_arn = kinesis_video_obj.create_stream(stream_name=serial_number)
             if stream_arn:
@@ -340,7 +338,7 @@ class KVSView(View):
             kinesis_video_obj = AmazonKinesisVideoObject(
                 aws_access_key_id=ACCESS_KEY_ID,
                 secret_access_key=SECRET_ACCESS_KEY,
-                region_name=REGION_NAME
+                region_name=KVS_REGION
             )
             now_time = int(time.time())
             data_retention_change_in_hours = int(data_retention_change_in_hours)
@@ -507,7 +505,7 @@ class KVSView(View):
                 'sts',
                 aws_access_key_id=ACCESS_KEY_ID,
                 aws_secret_access_key=SECRET_ACCESS_KEY,
-                region_name=REGION_NAME
+                region_name=KVS_REGION
             )
             sts_obj = sts_client_conn.get_session_token(DurationSeconds=129600)
             res = {
@@ -537,7 +535,7 @@ class KVSView(View):
             sts_client_conn = AmazonKinesisVideoObject(
                 aws_access_key_id=ACCESS_KEY_ID,
                 secret_access_key=SECRET_ACCESS_KEY,
-                region_name=REGION_NAME
+                region_name=KVS_REGION
             )
             sts_client_conn.create_signaling_channel(channel_name=uid)
             return response.json(0)
@@ -572,7 +570,7 @@ class KVSView(View):
                 aws_access_key_id=ACCESS_KEY_ID,
                 aws_secret_access_key=SECRET_ACCESS_KEY,
                 config=botocore.client.Config(signature_version='s3v4'),
-                region_name='cn-north-1'
+                region_name=KVS_REGION
             )
             res = client.get_signaling_channel_endpoint(
                 ChannelARN=channel_arn,
@@ -602,7 +600,7 @@ class KVSView(View):
             # 构造 AWSRequest 并签名
             req = AWSRequest(method='POST', url=url, data=json.dumps(payload))
             credentials = Credentials(ACCESS_KEY_ID, SECRET_ACCESS_KEY)
-            SigV4Auth(credentials, 'kinesisvideo', 'cn-north-1').add_auth(req)
+            SigV4Auth(credentials, 'kinesisvideo', KVS_REGION).add_auth(req)
 
             # 使用 requests 发送签名后的请求
             headers = dict(req.headers)