修改配置

AnsjerPush/eur_config/eur_formal_settings.py

@@ -13,6 +13,13 @@ 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='')
+OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
+
+HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
+HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/test_config/test_settings.py

@@ -13,6 +13,13 @@ 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='')
+OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
+
+HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
+HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]

AnsjerPush/us_config/formal_settings.py

@@ -13,6 +13,13 @@ 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='')
+OSS_ROLE_ARN = env('OSS_ROLE_ARN', default='')
+
+HUAWEICLOUD_AK = env('HUAWEICLOUD_AK', default='')
+HUAWEICLOUD_SK = env('HUAWEICLOUD_SK', default='')
+
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = False
 ALLOWED_HOSTS = ["*"]

Controller/DetectController.py

@@ -7,10 +7,13 @@ from django.http import JsonResponse
 from django.views.generic.base import View
 
 from AnsjerPush.config import CONFIG_INFO, CONFIG_CN
-from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 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
+
 V1_PUSH_LOGGER = logging.getLogger('v1_push')
 
 

Service/DevicePushService.py

@@ -22,8 +22,8 @@ from obs import ObsClient
 from AnsjerPush.Config.aiConfig import DEVICE_EVENT_TYPE, ALGORITHM_COMBO_TYPES
 from AnsjerPush.MessageConfig import EVENT_CONFIGS, DEFAULT_TEXTS, MSG_CONFIG
 from AnsjerPush.config import CONFIG_INFO, CONFIG_CN, MULTI_CHANNEL_TYPE_LIST, SYS_EVENT_TYPE_LIST, \
-    EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST, HUAWEICLOUD_AK, HUAWEICLOUD_SK, \
-    HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, JPUSH_UID_LIST, \
+    EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST, \
+    HUAWEICLOUD_OBS_SERVER, HUAWEICLOUD_PUSH_BUKET, JPUSH_UID_LIST, \
     DATA_PUSH_EVENT_TYPE_LIST, PRIMARY_USERS_PUSH_EVENT_TYPE_LIST
 from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID, XM_PUSH_CHANNEL_DICT
 from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
@@ -47,6 +47,12 @@ 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_SK
+HUAWEICLOUD_SK = settings.HUAWEICLOUD_SK
+
 LOGGING = logging.getLogger('info')
 TIME_LOGGER = logging.getLogger('time')
 ERROR_INFO_LOGGER = logging.getLogger('error_info')