阿里云KEY重命名

AnsjerPush/cn_config/cn_formal_config.py

@@ -58,8 +58,6 @@ AuthCode_Expire = 600
 UID_TOKEN_KEY = 'c+565*j@%^'
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/cn_config/cn_formal_settings.py

@@ -14,8 +14,8 @@ SECRET_ACCESS_KEY = os.getenv('SECRET_ACCESS_KEY', default='')
 AWS_ACCESS_KEY_ID = get_list('AWS_ACCESS_KEY_ID', default=[])
 AWS_SECRET_ACCESS_KEY = get_list('AWS_SECRET_ACCESS_KEY', default=[])
 
-OSS_STS_ACCESS_KEY = os.getenv('OSS_STS_ACCESS_KEY', default='')
-OSS_STS_ACCESS_SECRET = os.getenv('OSS_STS_ACCESS_SECRET', default='')
+ALICLOUD_AK = os.getenv('ALICLOUD_AK', default='')
+ALICLOUD_SK = os.getenv('ALICLOUD_SK', default='')
 OSS_ROLE_ARN = os.getenv('OSS_ROLE_ARN', default='')
 
 HUAWEICLOUD_AK = os.getenv('HUAWEICLOUD_AK', default='')

AnsjerPush/config.py

@@ -27,8 +27,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 JPUSH_UID_LIST = 'jpush_uid_list'
 
 # 华为云配置
-HUAWEICLOUD_AK = 'TN9T7ZPN3QRBBQ9NQHNB'
-HUAWEICLOUD_SK = 'rIlTBJ85MUC1WNLyJBZM2077HTsQ0qJaJf4IpTjU'
 HUAWEICLOUD_OBS_SERVER = 'https://obs.cn-east-3.myhuaweicloud.com'
 HUAWEICLOUD_PUSH_BUKET = 'asj-push'
 
@@ -63,8 +61,6 @@ AuthCode_Expire = 600
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # aws api key

AnsjerPush/dev_config/local_config.py

@@ -52,8 +52,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 UID_TOKEN_KEY = 'c+565*j@%^'
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/eur_config/eur_formal_config.py

@@ -58,8 +58,6 @@ AuthCode_Expire = 600
 UID_TOKEN_KEY = 'c+565*j@%^'
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/eur_config/eur_formal_settings.py

@@ -13,8 +13,8 @@ SECRET_ACCESS_KEY = env('SECRET_ACCESS_KEY', default='')
 AWS_ACCESS_KEY_ID = env.list('AWS_ACCESS_KEY_ID', default=[])
 AWS_SECRET_ACCESS_KEY = env.list('AWS_SECRET_ACCESS_KEY', default=[])
 
-OSS_STS_ACCESS_KEY = env('OSS_STS_ACCESS_KEY', default='')
-OSS_STS_ACCESS_SECRET = env('OSS_STS_ACCESS_SECRET', default='')
+ALICLOUD_AK = env('ALICLOUD_AK', default='')
+ALICLOUD_SK = env('ALICLOUD_SK', default='')
 OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')

AnsjerPush/test_config/test_config.py

@@ -48,8 +48,6 @@ AuthCode_Expire = 600
 UID_TOKEN_KEY = 'c+565*j@%^'
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/test_config/test_settings.py

@@ -13,8 +13,8 @@ SECRET_ACCESS_KEY = env('SECRET_ACCESS_KEY', default='')
 AWS_ACCESS_KEY_ID = env.list('AWS_ACCESS_KEY_ID', default=[])
 AWS_SECRET_ACCESS_KEY = env.list('AWS_SECRET_ACCESS_KEY', default=[])
 
-OSS_STS_ACCESS_KEY = env('OSS_STS_ACCESS_KEY', default='')
-OSS_STS_ACCESS_SECRET = env('OSS_STS_ACCESS_SECRET', default='')
+ALICLOUD_AK = env('ALICLOUD_AK', default='')
+ALICLOUD_SK = env('ALICLOUD_SK', default='')
 OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')

AnsjerPush/us_config/formal_config.py

@@ -55,8 +55,6 @@ AuthCode_Expire = 600
 UID_TOKEN_KEY = 'c+565*j@%^'
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/us_config/formal_settings.py

@@ -13,8 +13,8 @@ SECRET_ACCESS_KEY = env('SECRET_ACCESS_KEY', default='')
 AWS_ACCESS_KEY_ID = env.list('AWS_ACCESS_KEY_ID', default=[])
 AWS_SECRET_ACCESS_KEY = env.list('AWS_SECRET_ACCESS_KEY', default=[])
 
-OSS_STS_ACCESS_KEY = env('OSS_STS_ACCESS_KEY', default='')
-OSS_STS_ACCESS_SECRET = env('OSS_STS_ACCESS_SECRET', default='')
+ALICLOUD_AK = env('ALICLOUD_AK', default='')
+ALICLOUD_SK = env('ALICLOUD_SK', default='')
 OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
 
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')

Controller/DetectController.py

@@ -11,8 +11,8 @@ from Object.RedisObject import RedisObject
 from Service.DevicePushService import DevicePushService
 
 from django.conf import settings
-OSS_STS_ACCESS_KEY = settings.OSS_STS_ACCESS_KEY
-OSS_STS_ACCESS_SECRET = settings.OSS_STS_ACCESS_SECRET
+ALICLOUD_AK = settings.ALICLOUD_AK
+ALICLOUD_SK = settings.ALICLOUD_SK
 
 V1_PUSH_LOGGER = logging.getLogger('v1_push')
 
@@ -115,7 +115,7 @@ class NotificationView(View):
             # 旧模式并且没有pkey,重新创建一个
             if not detect_group and not have_pkey:
                 redis_obj.set_data(key=pkey, val=1, expire=60)
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
 
             # 推送相关参数

Service/DevicePushService.py

@@ -47,8 +47,8 @@ from django.conf import settings
 AWS_ACCESS_KEY_ID = settings.AWS_ACCESS_KEY_ID
 AWS_SECRET_ACCESS_KEY = settings.AWS_SECRET_ACCESS_KEY
 
-OSS_STS_ACCESS_KEY = settings.OSS_STS_ACCESS_KEY
-OSS_STS_ACCESS_SECRET = settings.OSS_STS_ACCESS_SECRET
+ALICLOUD_AK = settings.ALICLOUD_AK
+ALICLOUD_SK = settings.ALICLOUD_SK
 
 HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
 HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
@@ -950,7 +950,7 @@ class DevicePushService:
         try:
             if storage_reg == 1:
                 # 阿里云
-                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
                 oss_img_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
                 image_url = oss_img_bucket.sign_url('GET', key, 300)
             elif storage_reg in [3, 4]: