阿里云KEY重命名

AdminController/DeviceManagementController.py

@@ -38,8 +38,8 @@ from Service.VodHlsService import SplitVodHlsObject
 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
 
@@ -460,7 +460,7 @@ class DeviceManagement(View):
                 return response.json(173)
             device_type_list = []
             for device_type in device_type_qs:
-                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', 'ansjer-static-resources')
 
                 icon = device_type['icon']
@@ -500,7 +500,7 @@ class DeviceManagement(View):
             icon = iconFile.name
             now_time = int(time.time())
             # 上传文件到阿里云OSS
-            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', 'ansjer-static-resources')
             key = 'device_type/' + icon  # 图片文件存放于 device_type 目录下
             # https://oss.console.aliyun.com/bucket/oss-cn-shenzhen/ansjer-static-resources/object?path=device_type%2F
@@ -1929,7 +1929,7 @@ class DeviceManagement(View):
             voice_prompt_page = paginator.get_page(page)  # 获取当前页的数据
 
             # 上传文件到阿里云OSS
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'https://oss-cn-shenzhen.aliyuncs.com', 'ansjer-static-resources')
             voice_prompt_list = []
             for voice_prompt in voice_prompt_page:
@@ -2002,7 +2002,7 @@ class DeviceManagement(View):
             else:
                 device_type_list = []
             classification = int(classification)
-            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', 'ansjer-static-resources')
             file_name = voice_file.name
             file_extension = os.path.splitext(file_name)[1]
@@ -2090,7 +2090,7 @@ class DeviceManagement(View):
             classification = voice_prompt_qs[0].classification
             uid = voice_prompt_qs[0].uid
             channel = voice_prompt_qs[0].channel
-            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', 'ansjer-static-resources')
             if classification == 1 and uid:
                 obj = 'voice_prompt/{uid}/{channel}/'.format(uid=uid, channel=channel) + filename

AdminController/MessageMangementController.py

@@ -24,8 +24,8 @@ from Service.VodHlsService import SplitVodHlsObject
 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
 
@@ -137,7 +137,7 @@ class MassageView(View):
             packages_page = paginator.page(page)
 
             # 连接存储桶
-            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')
             # 华为云
             obs_client = ObsClient(

AdminController/UserManageController.py

@@ -27,8 +27,8 @@ from django.views.generic import View
 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
 
 
 # 登录
@@ -585,7 +585,7 @@ class UserManagement(View):
             stat_res_qs = StatResModel.objects.filter(
                 feedbackmodel__id__in=feed_back_id_list).values(
                 'name', 'feedbackmodel__id')
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(
                 auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
             feed_back_list = []
@@ -802,7 +802,7 @@ class UserManagement(View):
                 stat_res_qs = StatResModel.objects.filter(
                     feedbackmodel__id__in=feed_back_id_list).values(
                     'name', 'feedbackmodel__id')
-                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
                 bucket = oss2.Bucket(
                     auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
                 feed_back_list = []

Ansjer/cn_config/formal_settings.py

@@ -21,8 +21,8 @@ AWS_SES_ACCESS_ID = os.getenv('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
 AWS_SES_ACCESS_SECRET = os.getenv('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
 SES_USERNAME_SMTP = os.getenv('SES_USERNAME_SMTP', default='')
 SES_PASSWORD_SMTP = os.getenv('SES_PASSWORD_SMTP', 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='')
 HUAWEICLOUD_AK = os.getenv('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = os.getenv('HUAWEICLOUD_SK', default='')
 

Ansjer/config.py

@@ -55,10 +55,6 @@ HUAWEICLOUD_PUSH_BUKET = 'asj-push'
 HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET = 'baidu-big-model-license'
 HUAWEICLOUD_SERVER_BUKET = 'asj-server'
 
-# 阿里云AccessKey和AccessKeySecret
-ALI_ACCESS_KEY_ID = 'LTAI5t9BXQWTPfBEh2Qu8YNA'
-ALI_ACCESS_KEY_SECRET = '8TcEjHkHGsJaknbHlHzZP4HXQ7GuvT'
-
 # 亚马逊的数据库DynamoDB的密钥
 AWS_DynamoDB_REGION = 'us-west-1'
 AWS_DynamoDB_ACCESS_KEY = 'AKIA2E67UIMD6X23FEBG'

Ansjer/eur_config/formal_settings.py

@@ -20,8 +20,8 @@ AWS_SES_ACCESS_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
 AWS_SES_ACCESS_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
 SES_USERNAME_SMTP = env('SES_USERNAME_SMTP', default='')
 SES_PASSWORD_SMTP = env('SES_PASSWORD_SMTP', 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='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 

Ansjer/test/oss.py

@@ -23,21 +23,21 @@ host = "oss-cn-shenzhen.aliyuncs.com"  # just for example
 # host = 'oss-eu-central-1.aliyuncs.com'
 
 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
 
 
 import oss2
 
 # 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
-auth = Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+auth = Auth(ALICLOUD_AK, ALICLOUD_SK)
 
 # Endpoint以杭州为例，其它Region请按实际情况填写。
 service = oss2.Service(auth, host)
 
 
 bucket_name = "cnvod1"
-auth = Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+auth = Auth(ALICLOUD_AK, ALICLOUD_SK)
 bucket = Bucket(auth, host, bucket_name)
 result = bucket.append_object('mio', 23, '我是追加的噢噢噢噢content of first append')
 # 如果不是首次上传，可以通过bucket.head_object方法或上次追加返回值的next_position属性，得到追加位置。

Ansjer/us_config/formal_settings.py

@@ -20,8 +20,8 @@ AWS_SES_ACCESS_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
 AWS_SES_ACCESS_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
 SES_USERNAME_SMTP = env('SES_USERNAME_SMTP', default='')
 SES_PASSWORD_SMTP = env('SES_PASSWORD_SMTP', 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='')
 HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
 HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 

Controller/AppLogController.py

@@ -16,8 +16,8 @@ from Service.ModelService import ModelService
 from django.conf import settings
 ACCESS_KEY_ID = settings.ACCESS_KEY_ID
 SECRET_ACCESS_KEY = settings.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
 
 
 class AppLogView(View):
@@ -131,7 +131,7 @@ class AppLogView(View):
                                                                 'average_delay', 'status', 'filename', 'add_time')
 
                     res = []
-                    auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                    auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
                     bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
                     for al in al_qs:
                         filename = al['filename']

Controller/CloudStorage.py

@@ -50,8 +50,8 @@ from Service.CommonService import CommonService
 from Service.PayService import PaymentService
 from Service.VodHlsService import SplitVodHlsObject
 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
 
 ssl._create_default_https_context = ssl._create_unverified_context
 LOGGER = logging.getLogger('info')

Controller/CloudVod.py

@@ -24,8 +24,8 @@ from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Service.VodHlsService import SplitVodHlsObject
 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
 
 
 # 设备信息添加
@@ -280,8 +280,8 @@ class CloudVodView(View):
                 storage = '{uid}/vod{channel}/'.format(uid=uid, channel=channel)
                 bucket_name = ubqs[0]['bucket__bucket']
                 endpoint = ubqs[0]['bucket__endpoint']
-                access_key_id = OSS_STS_ACCESS_KEY
-                access_key_secret = OSS_STS_ACCESS_SECRET
+                access_key_id = ALICLOUD_AK
+                access_key_secret = ALICLOUD_SK
                 region_id = ubqs[0]['bucket__region']
                 role_arn = OSS_ROLE_ARN
                 clt = client.AcsClient(access_key_id, access_key_secret, region_id)
@@ -519,7 +519,7 @@ class CloudVodView(View):
         endpoint = vod_bucket_qs[0]["endpoint"]
         vod_play_list = []
         print(vodqs)
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         for vod in vodqs:
             bucket = oss2.Bucket(auth, endpoint, bucket_name)
             m3u8 = '{uid}/vod{channel}/{time}/{time}.m3u8'. \
@@ -562,7 +562,7 @@ class CloudVodView(View):
         endpoint = vod_bucket_qs[0]["endpoint"]
         vod_play_list = []
         print(vodqs)
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         for vod in vodqs:
             bucket = oss2.Bucket(auth, endpoint, bucket_name)
             m3u8 = '{uid}/vod{channel}/{time}/{time}.m3u8'. \

Controller/DetectController.py

@@ -35,8 +35,8 @@ from Service.CommonService import CommonService
 from Service.EquipmentInfoService import EquipmentInfoService
 from Service.VodHlsService import SplitVodHlsObject
 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
 
 
 class DetectControllerView(View):
@@ -125,7 +125,7 @@ class DetectControllerView(View):
             # qr = qs[(page - 1) * line:page * line]
             qr = qs
             res = []
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             img_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
             # vod_time_list = []
             for p in qr:

Controller/DetectControllerV2.py

@@ -30,8 +30,8 @@ from Service.VodHlsService import SplitVodHlsObject
 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
 
@@ -441,7 +441,7 @@ class DetectControllerViewV2(View):
                 access_key_id=HUAWEICLOUD_AK, secret_access_key=HUAWEICLOUD_SK, server=HUAWEICLOUD_OBS_SERVER)
 
             # 阿里云
-            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')
 
             # aws
@@ -742,7 +742,7 @@ class DetectControllerViewV2(View):
             redis_client = redis.Redis(connection_pool=redis.ConnectionPool(host=PUSH_REDIS_ADDRESS, port=6379, db=3))
             msg_data = redis_client.get(msg_key)
 
-            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')
             aws_s3 = boto3.client(
                 's3',
@@ -980,7 +980,7 @@ class PushNotificationView(View):
                 # 修改redis数据，并设置过期时间为10分钟
             if redis_list:
                 redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
-                # 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')
                 aws_s3_guonei = boto3.client(
                     's3',

Controller/DeviceTypeController.py

@@ -12,8 +12,8 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 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
 
 
 class DeviceTypeView(View):
@@ -54,7 +54,7 @@ class DeviceTypeView(View):
         upload_type = request_dict.get('upload_type', None)
 
         if upload_type:
-            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', 'ansjer-static-resources')
             name = CommonService.createOrderID()
             filename = str(name) + '.' + upload_type

Controller/EquipmentManager.py

@@ -22,8 +22,8 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 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
 
 
 #     查询用户设备
@@ -1032,7 +1032,7 @@ def queryInterface(request):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []

Controller/EquipmentManagerV2.py

@@ -13,8 +13,8 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 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
 
 
 class EquipmentManagerV2(View):
@@ -175,7 +175,7 @@ class EquipmentManagerV2(View):
             ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
                 values('bucket__content', 'status', 'channel', 'endTime', 'uid')
             upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
             nowTime = int(time.time())
             data = []
@@ -264,7 +264,7 @@ class EquipmentManagerV2(View):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []

Controller/EquipmentManagerV3.py

@@ -29,8 +29,8 @@ from Service.EquipmentInfoService import EquipmentInfoService
 from Service.ModelService import ModelService
 from Service.UserDeviceService import UserDeviceService
 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
 LOGGER = logging.getLogger('info')
 
 
@@ -838,7 +838,7 @@ class EquipmentManagerV3(View):
         dv_list, uid_list = UserDeviceService.query_device_list(userID, uid, NickName, page, line, group_id)
         ub_qs = UserDeviceService.query_device_uid_bucket(uid_list)  # 根据uid集合查询云存套餐
         up_qs = UserDeviceService.query_device_preview(uid_list)  # 根据uid集合查询设备预览图
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []
@@ -973,7 +973,7 @@ class EquipmentManagerV3(View):
             ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
                 values('bucket__content', 'status', 'channel', 'endTime', 'uid')
             upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
             nowTime = int(time.time())
             data = []

Controller/EquipmentStatus.py

@@ -25,8 +25,8 @@ from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService
 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
 
 
 @csrf_exempt
@@ -158,7 +158,7 @@ def getUploadLogUrl(request):
     eto = ETkObject(etk)
     uid = eto.uid
     if len(uid) == 20:
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         obj = 'log/{uid}/'.format(uid=uid) + str(nowTime) + '.log'

Controller/FeedBack.py

@@ -19,8 +19,8 @@ from Service.EquipmentInfoService import EquipmentInfoService
 from django.conf import settings
 ACCESS_KEY_ID = settings.ACCESS_KEY_ID
 SECRET_ACCESS_KEY = settings.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
 
 
 class FeedBackView(View):
@@ -79,7 +79,7 @@ class FeedBackView(View):
             sid_list.append(fb['id'])
         sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list).values('id', 'name', 'feedbackmodel__id')
         # return response.json(0,list(sm_qs))
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         res = []
         for fb in fb_qs:
@@ -192,7 +192,7 @@ class FeedBackView(View):
         uploadType = json.loads(uploadType)
         if len(uploadType):
             res = []
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
             for upType in uploadType:
                 name = CommonService.createOrderID()
@@ -261,7 +261,7 @@ class FeedBackView(View):
                     sid_list.append(fb['id'])
                 sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list).values('id', 'name',
                                                                                            'feedbackmodel__id')
-                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
                 bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
                 res = []
                 print(sm_qs)
@@ -327,7 +327,7 @@ class FeedBackView(View):
             if name.find(str_prefix) == 0:
                 names.append('feedback/' + name)
 
-        # auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        # auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         # bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         # bucket.batch_delete_objects(names)
         # FeedBackModel.objects.filter(id__in=ids).delete()

Controller/OssCrd.py

@@ -24,8 +24,8 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 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
 
 
 # 设备证书

Controller/SensorGateway/EquipmentFamilyController.py

@@ -23,8 +23,8 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 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
 
 
 # 家庭设备管理
@@ -525,7 +525,7 @@ class EquipmentFamilyView(View):
                         p['vod'].append(dm)
             p['preview'] = []
 
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
 
             for up in uid_preview_qs:

Controller/StsOssController.py

@@ -8,8 +8,8 @@ from Ansjer.config import OSS_ROLE_ARN
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 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
 
 
 class StsOssView(View):
@@ -45,7 +45,7 @@ class StsOssView(View):
         bucket_name = 'apg'
         endpoint = 'oss-cn-shenzhen.aliyuncs.com'
         region_id = 'cn-shenzhen'
-        clt = client.AcsClient(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, region_id)
+        clt = client.AcsClient(ALICLOUD_AK, ALICLOUD_SK, region_id)
         req = AssumeRoleRequest.AssumeRoleRequest()
         req.set_accept_format('json')
         req.set_RoleArn(OSS_ROLE_ARN)

Controller/Test.py

@@ -19,8 +19,8 @@ from alipay import AliPay
 import time
 from django.http import JsonResponse
 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
 
 
 # 测试接口sdk

Controller/TestApi.py

@@ -48,8 +48,8 @@ ACCESS_KEY_ID = settings.ACCESS_KEY_ID
 SECRET_ACCESS_KEY = settings.SECRET_ACCESS_KEY
 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
 
@@ -475,7 +475,7 @@ class testView(View):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []
@@ -688,7 +688,7 @@ class testView(View):
         if not vodqs.exists():
             return response.json(173)
         vod_play_list = []
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket_id = vodqs[0]['bucket_id']
         vod_bucket_qs = VodBucketModel.objects.filter(id=bucket_id).values('bucket', 'endpoint')
         if not vod_bucket_qs.exists():

Controller/UIDPreview.py

@@ -33,8 +33,8 @@ from Object.ResponseObject import ResponseObject
 from Service.ModelService import ModelService
 from Object.TokenObject import TokenObject
 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
 
 
 # 设备信息添加
@@ -74,9 +74,9 @@ class UIDPreview(View):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         if all([uid, channel]):
-            # 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')
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
 
             dvqs = Device_Info.objects.filter(UID=uid, userID_id=userID)

Controller/UidUser.py

@@ -29,8 +29,8 @@ from Object.RedisObject import RedisObject
 import base64
 from Controller.CheckUserData import RandomStr
 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
 
 
 # 添加设备字段
@@ -155,7 +155,7 @@ def queryInterface(request):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []
@@ -510,7 +510,7 @@ def v3queryInterface(request):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
-        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []

Controller/UserExController.py

@@ -26,8 +26,8 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 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
 
 
 class UserExView(View):

Controller/VoicePromptController.py

@@ -11,8 +11,8 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 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
 
 
 class VoicePromptView(View):
@@ -75,7 +75,7 @@ class VoicePromptView(View):
             if count >= 3:
                 return response.json(201)
 
-            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', 'ansjer-static-resources')
             name = CommonService.createOrderID()
             filename = str(name) + '.' + upload_type
@@ -115,7 +115,7 @@ class VoicePromptView(View):
                 'title': title,
                 'type': type,
             }
-            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', 'ansjer-static-resources')
             filename = res['filename']
             obj = 'voice_prompt/{uid}/{channel}/'.format(uid=uid, channel=channel) + filename
@@ -163,7 +163,7 @@ class VoicePromptView(View):
                 channel = voice.channel
                 filename = voice.filename
                 voice_qs.delete()
-                auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
                 bucket = oss2.Bucket(auth, 'http://oss-cn-shenzhen.aliyuncs.com', 'ansjer-static-resources')
                 obj = 'voice_prompt/{uid}/{channel}/'.format(uid=uid, channel=channel) + filename
                 bucket.delete_object(obj)
@@ -234,7 +234,7 @@ class VoicePromptView(View):
 
             res['system'] = {}
             res['custom'] = {}
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            auth = oss2.Auth(ALICLOUD_AK, ALICLOUD_SK)
             bucket = oss2.Bucket(auth, 'https://oss-cn-shenzhen.aliyuncs.com', 'ansjer-static-resources')
             if system_qs.exists():
                 system_qs = system_qs.values('id', 'title', 'filename', 'type')
@@ -290,7 +290,7 @@ class VoicePromptView(View):
         upload_type = request_dict.get('upload_type', None)
 
         if upload_type:
-            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', 'ansjer-static-resources')
             name = CommonService.createOrderID()
             filename = str(name) + '.' + upload_type
@@ -355,7 +355,7 @@ class VoicePromptView(View):
 
             voice_qs = voice_qs.values('id', 'title', 'type', 'language', 'status', 'filename')[start:end]
 
-            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', 'ansjer-static-resources')
 
             for item in voice_qs:

Object/AliSmsObject.py

@@ -5,6 +5,9 @@ from aliyunsdkcore.client import AcsClient
 from aliyunsdkcore.profile import region_provider
 from aliyunsdkdysmsapi.request.v20170525 import SendSmsRequest
 import json
+from django.conf import settings
+ALICLOUD_AK = settings.ALICLOUD_AK
+ALICLOUD_SK = settings.ALICLOUD_SK
 """
 短信业务调用接口示例，版本号：v20170525
 Created on 2017-06-12
@@ -18,13 +21,7 @@ class AliSmsObject(object):
         REGION = "cn-hangzhou"
         PRODUCT_NAME = "Dysmsapi"
         DOMAIN = "dysmsapi.aliyuncs.com"
-        aliSms = {
-            'ACCESS_KEY_ID': 'LTAIDFtlwLdttWiX',
-            'ACCESS_KEY_SECRET': 'Siu6SolsTN5A3evXUkFLyyr0QZ3iiT',
-        }
-        # self.ACCESS_KEY_ID = 'LTAIDFtlwLdttWiX'
-        # self.ACCESS_KEY_SECRET = 'Siu6SolsTN5A3evXUkFLyyr0QZ3iiT'
-        self.acs_client = AcsClient(aliSms['ACCESS_KEY_ID'], aliSms['ACCESS_KEY_SECRET'], REGION)
+        self.acs_client = AcsClient(ALICLOUD_AK, ALICLOUD_SK, REGION)
         region_provider.add_endpoint(PRODUCT_NAME, REGION, DOMAIN)
 
     def do_send_sms(self, business_id, phone_numbers, sign_name, template_code, template_param=None):

Object/ContentSecurityObject.py

@@ -5,7 +5,10 @@ from alibabacloud_green20220302.client import Client as Green20220302Client
 from alibabacloud_tea_openapi import models as open_api_models
 from alibabacloud_green20220302 import models as green_20220302_models
 from alibabacloud_tea_util import models as util_models
-from Ansjer.config import ALI_ACCESS_KEY_ID, ALI_ACCESS_KEY_SECRET, LOGGER
+from Ansjer.config import LOGGER
+from django.conf import settings
+ALICLOUD_AK = settings.ALICLOUD_AK
+ALICLOUD_SK = settings.ALICLOUD_SK
 
 TEXT_ILLEGAL_LABEL_LIST = ['political_content', 'profanity', 'contraband', 'sexual_content', 'violence',
                            'negative_content', 'religion', 'cyberbullying']
@@ -29,9 +32,9 @@ class ContentSecurity:
         """
         config = open_api_models.Config(
             # 必填，您的 AccessKey ID,
-            access_key_id=ALI_ACCESS_KEY_ID,
+            access_key_id=ALICLOUD_AK,
             # 必填，您的 AccessKey Secret,
-            access_key_secret=ALI_ACCESS_KEY_SECRET
+            access_key_secret=ALICLOUD_SK
         )
         # Endpoint 请参考 https://api.aliyun.com/product/Green
         config.endpoint = f'green-cip.cn-shanghai.aliyuncs.com'