阿里云华为云AK/SK配置环境变量

AdminController/DeviceManagementController.py

@@ -16,9 +16,9 @@ from django.db.models import Q, F, Sum, OuterRef, Min, Subquery
 from django.forms.models import model_to_dict
 from django.views.generic.base import View
 
-from Ansjer.config import LOGGER, SERIAL_DOMAIN_NAME, HUAWEICLOUD_AK, HUAWEICLOUD_SK, HUAWEICLOUD_OBS_SERVER, \
-    HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET,CONFIG_INFO, CONFIG_TEST, CONFIG_CN, CONFIG_US, CONFIG_EUR
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_SES_ACCESS_REGION
+from Ansjer.config import LOGGER, SERIAL_DOMAIN_NAME, HUAWEICLOUD_OBS_SERVER, \
+    HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET, CONFIG_INFO, CONFIG_TEST, CONFIG_CN, CONFIG_US, CONFIG_EUR
+from Ansjer.config import AWS_SES_ACCESS_REGION
 from Ansjer.config import SERVER_DOMAIN_TEST, SERVER_DOMAIN_CN, SERVER_DOMAIN_US, SERVER_DOMAIN_EUR
 from Model.models import Device_Info, UidSetModel, LogModel, UID_Bucket, Unused_Uid_Meal, StsCrdModel, \
     VodHlsModel, ExperienceContextModel, DeviceTypeModel, UidUserModel, ExperienceAiModel, AiService, \
@@ -38,7 +38,10 @@ 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
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 class DeviceManagement(View):
     def get(self, request, *args, **kwargs):

AdminController/EvaluationActivityController.py

@@ -10,13 +10,14 @@ from Object.Enums.RedisKeyConstant import RedisKeyConstant
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Ansjer.config import SERVER_DOMAIN, LOGGER, HUAWEICLOUD_AK, HUAWEICLOUD_SK, HUAWEICLOUD_OBS_SERVER, \
-    HUAWEICLOUD_SERVER_BUKET
+from Ansjer.config import SERVER_DOMAIN, HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_SERVER_BUKET
 from Ansjer.cn_config.config_formal import REGION_NAME
 from django.db import transaction
 from django.conf import settings
 ACCESS_KEY_ID = settings.ACCESS_KEY_ID
 SECRET_ACCESS_KEY = settings.SECRET_ACCESS_KEY
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 
 class EvaluationActivityView(View):

AdminController/MessageMangementController.py

@@ -9,9 +9,8 @@ from django.db.models import Q
 from django.views.generic.base import View
 from obs import ObsClient
 
-from Ansjer.config import CONFIG_EUR, CONFIG_US, HUAWEICLOUD_PUSH_BUKET, HUAWEICLOUD_AK, HUAWEICLOUD_SK, \
-    HUAWEICLOUD_OBS_SERVER
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, SERVER_TYPE
+from Ansjer.config import CONFIG_EUR, CONFIG_US, HUAWEICLOUD_PUSH_BUKET,  HUAWEICLOUD_OBS_SERVER
+from Ansjer.config import SERVER_TYPE
 from Controller.DetectControllerV2 import DetectControllerViewV2
 from Model import models
 from Model.models import Device_Info, VodBucketModel, DeviceTypeModel
@@ -25,7 +24,10 @@ 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
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 class MassageView(View):
 

AdminController/UserManageController.py

@@ -12,8 +12,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 
 from AgentModel.models import AgentCustomerInfo, AgentCustomerCard, AgentCloudServicePackage, AgentCustomerPackage
-from Ansjer.config import SERVER_DOMAIN, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_SES_ACCESS_REGION, \
-    DETECT_PUSH_DOMAINS
+from Ansjer.config import SERVER_DOMAIN, AWS_SES_ACCESS_REGION, DETECT_PUSH_DOMAINS
 from Controller.CheckUserData import DataValid, RandomStr
 from Model.models import Device_User, Role, UserExModel, CountryModel, MenuModel, FeedBackModel, StatResModel, \
     SysMassModel, App_Info, SysMsgModel, DeviceSuperPassword, CustomizedPush, DeviceTypeModel, CustomCustomerOrderInfo
@@ -28,6 +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
 
 
 # 登录

Ansjer/config.py

@@ -50,8 +50,6 @@ PAY_TYPE_CDK = 11
 SERIAL_DOMAIN_NAME = 'serial.zositechc.cn:7880'
 
 # 华为云配置
-HUAWEICLOUD_AK = 'TN9T7ZPN3QRBBQ9NQHNB'
-HUAWEICLOUD_SK = 'rIlTBJ85MUC1WNLyJBZM2077HTsQ0qJaJf4IpTjU'
 HUAWEICLOUD_OBS_SERVER = 'https://obs.cn-east-3.myhuaweicloud.com'
 HUAWEICLOUD_PUSH_BUKET = 'asj-push'
 HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET = 'baidu-big-model-license'
@@ -108,8 +106,6 @@ UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz'
                                '0123456789')
 
 # oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # aws api key

Ansjer/eur_config/formal_settings.py

@@ -12,6 +12,18 @@ ACCESS_KEY_ID = env('ACCESS_KEY_ID', default='')
 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=[])
+AWS_IOT_SES_ACCESS_CHINA_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
+AWS_IOT_SES_ACCESS_CHINA_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
+AWS_IOT_SES_ACCESS_FOREIGN_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
+AWS_IOT_SES_ACCESS_FOREIGN_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
+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='')
+HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
+HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 # DEBUG = True

Ansjer/pushconfig.py

@@ -51,11 +51,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # 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
 AWS_ARN = ['arn:aws-cn:s3', 'arn:aws:s3']
 

Ansjer/test/oss.py

@@ -22,22 +22,22 @@ host = "oss-cn-shenzhen.aliyuncs.com"  # just for example
 # host = "hlsvoda.zositech.cn"  # just for example
 # host = 'oss-eu-central-1.aliyuncs.com'
 
-accessid = 'LTAIyMkGfEdogyL9'
-accesskey = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
-
+from django.conf import settings
+OSS_STS_ACCESS_KEY = settings.OSS_STS_ACCESS_KEY
+OSS_STS_ACCESS_SECRET = settings.OSS_STS_ACCESS_SECRET
 
 
 import oss2
 
 # 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
-auth = Auth(accessid, accesskey)
+auth = Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
 
 # Endpoint以杭州为例，其它Region请按实际情况填写。
 service = oss2.Service(auth, host)
 
 
 bucket_name = "cnvod1"
-auth = Auth(accessid, accesskey)
+auth = Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
 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

@@ -12,6 +12,18 @@ ACCESS_KEY_ID = env('ACCESS_KEY_ID', default='')
 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=[])
+AWS_IOT_SES_ACCESS_CHINA_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
+AWS_IOT_SES_ACCESS_CHINA_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
+AWS_IOT_SES_ACCESS_FOREIGN_ID = env('AWS_IOT_SES_ACCESS_CHINA_ID', default='')
+AWS_IOT_SES_ACCESS_FOREIGN_SECRET = env('AWS_IOT_SES_ACCESS_CHINA_SECRET', default='')
+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='')
+HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
+HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
 
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 # DEBUG = True

Controller/AppLogController.py

@@ -7,7 +7,7 @@ import botocore
 import oss2
 from django.views.generic.base import View
 
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, REGION_NAME, LOG_BUCKET
+from Ansjer.config import REGION_NAME, LOG_BUCKET
 from Model.models import AppLogModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -16,6 +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
 
 
 class AppLogView(View):

Controller/CloudStorage.py

@@ -49,6 +49,9 @@ from Object.m3u8generate import PlaylistGenerator
 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
 
 ssl._create_default_https_context = ssl._create_unverified_context
 LOGGER = logging.getLogger('info')

Controller/CloudVod.py

@@ -13,8 +13,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.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
-    CONFIG_INFO, CONFIG_CN
+from Ansjer.config import OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD
 from Model.models import Device_Info, Order_Model, Store_Meal, OssCrdModel, UID_Bucket, StsCrdModel, \
     VodBucketModel, UidSetModel, AiService, LogModel
 from Object.AliPayObject import AliPayObject
@@ -24,6 +23,9 @@ from Object.UidTokenObject import UidTokenObject
 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
 
 
 # 设备信息添加

Controller/DetectController.py

@@ -22,9 +22,7 @@ from django.http import JsonResponse
 from django.views.generic.base import View
 from pyfcm import FCMNotification
 
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, \
-    JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, \
-    BASE_DIR, APNS_MODE, SERVER_TYPE, LOGGER, PUSH_REDIS_ADDRESS
+from Ansjer.config import DETECT_PUSH_DOMAIN, PUSH_REDIS_ADDRESS
 from Model.models import Device_Info, Equipment_Info, UidSetModel, UidPushModel, SysMsgModel, \
     VodBucketModel
 from Object.ETkObject import ETkObject
@@ -36,6 +34,9 @@ from Object.utils import LocalDateTimeUtil
 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
 
 
 class DetectControllerView(View):

Controller/DetectControllerV2.py

@@ -12,8 +12,7 @@ from django.views.generic.base import View
 from obs import ObsClient
 
 from Ansjer.config import DETECT_PUSH_DOMAIN, DETECT_PUSH_DOMAINS, DETECT_PUSH_DOMAIN_JIUAN, DETECT_PUSH_DOMAINS_JIUAN, \
-    OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, LOGGER, ALGORITHM_COMBO_TYPES, \
-    HUAWEICLOUD_AK, HUAWEICLOUD_SK, HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET
+    LOGGER, ALGORITHM_COMBO_TYPES,  HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET
 from Ansjer.config import PUSH_BUCKET, CONFIG_INFO, CONFIG_CN, CONFIG_EUR, CONFIG_US
 from Ansjer.config import PUSH_REDIS_ADDRESS
 from Model.models import Device_Info, Equipment_Info, UidSetModel, UidPushModel, CompanyModel, SysMsgModel, \
@@ -31,6 +30,10 @@ 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
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 
 class DetectControllerViewV2(View):

Controller/DeviceTypeController.py

@@ -6,13 +6,14 @@ import time
 import oss2
 from django.db.models import F
 from django.views import View
-
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import DeviceTypeModel, AppBundle, DeviceNameLanguage
 from Object.ResponseObject import ResponseObject
 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
 
 
 class DeviceTypeView(View):

Controller/EquipmentManager.py

@@ -11,7 +11,7 @@ from django.db import transaction
 from django.db.models import Q
 from django.utils import timezone
 
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, BASE_DIR, ALGORITHM_COMBO_TYPES
+from Ansjer.config import BASE_DIR, ALGORITHM_COMBO_TYPES
 from Controller.DetectController import DetectControllerView
 from Controller.DeviceShare import DeviceShareView
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, \
@@ -21,6 +21,9 @@ from Object.ResponseObject import ResponseObject
 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
 
 
 #     查询用户设备

Controller/EquipmentManagerV2.py

@@ -7,13 +7,14 @@ import oss2
 from django.db.models import Q
 from django.views.generic.base import View
 
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, UidChannelSetModel, \
     iotdeviceInfoModel, UIDModel, CountryModel
 from Object.ResponseObject import ResponseObject
 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
 
 
 class EquipmentManagerV2(View):

Controller/EquipmentManagerV3.py

@@ -11,7 +11,7 @@ from django.db import transaction
 from django.db.models import Q, Max
 from django.views.generic.base import View
 
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, CONFIG_INFO, CONFIG_US
+from Ansjer.config import CONFIG_INFO, CONFIG_US
 from Controller.CheckUserData import RandomStr
 from Controller.DeviceConfirmRegion import Device_Region
 from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
@@ -28,7 +28,9 @@ from Service.CommonService import CommonService
 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
 LOGGER = logging.getLogger('info')
 
 

Controller/EquipmentStatus.py

@@ -19,20 +19,14 @@ import time
 import oss2
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
-
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import Device_Info
 from Object.ETkObject import ETkObject
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
-from Service.ModelService import ModelService
 from Service.CommonService import CommonService
-
-'''
-http://192.168.136.45:8077/device/online?UID=C2887N9EBS87ZAT1111A
-http://192.168.136.45:8077/device/offline?UID=C2887N9EBS87ZAT1111A
-http://192.168.136.45:8077/device/updateIP?UID=C2887N9EBS87ZAT1111A?ip=190.9.194.216
-'''
+from django.conf import settings
+OSS_STS_ACCESS_KEY = settings.OSS_STS_ACCESS_KEY
+OSS_STS_ACCESS_SECRET = settings.OSS_STS_ACCESS_SECRET
 
 
 @csrf_exempt

Controller/FeedBack.py

@@ -7,7 +7,7 @@ from django.db import transaction
 from django.views.generic.base import View
 
 from Ansjer.config import REGION_NAME, PUSH_BUCKET, PUSH_INACCURATE_BUCKET
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, LOGGER
+from Ansjer.config import LOGGER
 from Model.models import FeedBackModel, StatResModel, PushInaccurateFeedback, SysMsgModel
 from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.ResponseObject import ResponseObject
@@ -19,6 +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
 
 
 class FeedBackView(View):

Controller/OssCrd.py

@@ -18,13 +18,16 @@ import simplejson as json
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
-
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Model.models import UID_Bucket, UID_Preview, OssCrdModel
 from Object.ResponseObject import ResponseObject
 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
+
+
 # 设备证书
 class OssCrdView(View):
     @method_decorator(csrf_exempt)

Controller/SensorGateway/EquipmentFamilyController.py

@@ -14,8 +14,6 @@ from django.db import connection
 from django.db import transaction
 from django.db.models import Q, Count
 from django.views.generic.base import View
-
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Controller.DeviceConfirmRegion import Device_Region
 from Controller.SensorGateway.SmartSocketController import SmartSocketView
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
@@ -24,6 +22,9 @@ from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidC
 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
 
 
 # 家庭设备管理

Controller/SerialNumberController.py

@@ -12,7 +12,7 @@ from django.views import View
 from Ansjer.config import CRCKey, CONFIG_INFO, CONFIG_US, CONFIG_EUR, \
     CONFIG_CN, USED_SERIAL_REDIS_LIST, UNUSED_SERIAL_REDIS_LIST, SERVER_DOMAIN_US, REGION_ID_LIST, SERVER_DOMAIN_TEST, \
     SERVER_DOMAIN_LIST, SERVER_DOMAIN_CN, SERVER_DOMAIN_EUR, RESET_REGION_ID_SERIAL_REDIS_LIST, LOGGER, CONFIG_TEST, \
-    SERVER_DOMAIN, HUAWEICLOUD_AK, HUAWEICLOUD_SK, HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET
+    SERVER_DOMAIN, HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_BAIDU_BIG_MODEL_LICENSE_BUKET
 from Controller.CheckUserData import DataValid
 from Controller.UnicomCombo.UnicomComboController import UnicomComboView
 from Model.models import SerialNumberModel, CompanySerialModel, UIDCompanySerialModel, UIDModel, Device_Info, \
@@ -26,10 +26,10 @@ from Object.TokenObject import TokenObject
 from Object.uidManageResponseObject import uidManageResponseObject
 from Service.AlgorithmService import AlgorithmBaseOn35
 from Service.CommonService import CommonService
-from Service.EquipmentInfoService import EquipmentInfoService
-from Service.VodHlsService import SplitVodHlsObject
-
 from AdminController.CloudServiceManage.AgentDeviceController import AgentDeviceView
+from django.conf import settings
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 
 class SerialNumberView(View):

Controller/StsOssController.py

@@ -4,9 +4,12 @@ from aliyunsdkcore import client
 from aliyunsdksts.request.v20150401 import AssumeRoleRequest
 from django.views.generic import View
 
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, OSS_ROLE_ARN
+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
 
 
 class StsOssView(View):

Controller/Test.py

@@ -12,18 +12,15 @@
 @Contact: chanjunkai@163.com
 """
 from django.views.generic.base import View
-import os
-
-'''
-http://192.168.136.40:8077/Test
-'''
 from Object.ResponseObject import ResponseObject
 from Ansjer.config import BASE_DIR
 import json
 from alipay import AliPay
 import time
-import apns2
 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
 
 
 # 测试接口sdk

Controller/TestApi.py

@@ -1,16 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: Ansjer
-@software: PyCharm
-@DATE: 2018/5/22 13:58
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: Test.py
-@Contact: chanjunkai@163.com
-"""
 import os
 import threading
 import traceback
@@ -46,7 +33,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 from django.contrib.auth.hashers import make_password  # 对密码加密模块
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, SERVER_TYPE, AWS_SES_ACCESS_REGION
+from Ansjer.config import SERVER_TYPE, AWS_SES_ACCESS_REGION
 from Model.models import Order_Model, Store_Meal, DeviceLogModel, VodBucketModel, \
     TestSerialRepetition, UIDCompanySerialModel, CompanySerialModel, LogModel, AbnormalOrder
 from Object.ResponseObject import ResponseObject
@@ -61,6 +48,10 @@ 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
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 SERVER_DOMAIN = 'http://test.dvema.com/'
 ACCESS_KEY = "AKIA2E67UIMD3CYTIWPA"

Controller/UIDPreview.py

@@ -28,12 +28,13 @@ import time
 
 import oss2
 from django.views.generic.base import View
-from Object.RedisObject import RedisObject
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Model.models import UID_Preview, Device_Info
 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
 
 
 # 设备信息添加

Controller/UserExController.py

@@ -19,13 +19,17 @@ from django.views.decorators.csrf import csrf_exempt
 from django.utils import timezone
 from django.views.generic.base import View
 import datetime, simplejson as json
-from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Model.models import Device_Info, Role, UserExModel, Device_User
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 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
+
+
 class UserExView(View):
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):

Controller/VoicePromptController.py

@@ -5,13 +5,14 @@ import time
 import oss2
 from django.db.models import Q
 from django.views import View
-
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import VoicePromptModel, UidChannelSetModel, Device_Info
 from Object.ResponseObject import ResponseObject
 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
 
 
 class VoicePromptView(View):

Roomumy/Controller/TimeAlbumController.py

@@ -6,13 +6,15 @@ import botocore
 from django.core.paginator import Paginator
 from django.views import View
 from obs import ObsClient
-from Ansjer.config import HUAWEICLOUD_AK, HUAWEICLOUD_SK, HUAWEICLOUD_OBS_SERVER, CONFIG_INFO, CONFIG_CN, CONFIG_TEST
-
+from Ansjer.config import HUAWEICLOUD_OBS_SERVER, CONFIG_INFO, CONFIG_CN, CONFIG_TEST
 from Roomumy.models import TimeAlbum, AlbumMedia, TimeDiary, DiaryAlbumMediaRelation
 from Service.CommonService import CommonService
 from django.conf import settings
 AWS_ACCESS_KEY_ID = settings.AWS_ACCESS_KEY_ID
 AWS_SECRET_ACCESS_KEY = settings.AWS_SECRET_ACCESS_KEY
+from django.conf import settings
+HUAWEICLOUD_AK = settings.HUAWEICLOUD_AK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
 
 
 class TimeAlbumView(View):

templates/hlsvod.html

@@ -10,7 +10,6 @@
 <!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@canary"></script> -->
 <video id="video"></video>
 <script>
-    //var url = 'http://cloudvod1.oss-cn-shenzhen.aliyuncs.com/FTSLL8HM437Z38WU111A/vod4/2018121001/1543902118/1543902118.m3u8?Signature=7V5EbsWhhxVF4HVzw%2BIGEZo67fk%3D&OSSAccessKeyId=LTAIyMkGfEdogyL9&x-oss-process=hls%2Fsign&Expires=1544780759'
     var url = 'https://apg.oss-cn-shenzhen.aliyuncs.com/testplay/1545101955.m3u8'
     var video = document.getElementById('video');
     if (Hls.isSupported()) {