zhangdongming преди 1 седмица
родител
ревизия
4be7b911e3

+ 3 - 0
AnsjerPush/cn_config/cn_formal_settings.py

@@ -17,6 +17,9 @@ 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 = ["*"]

+ 3 - 0
AnsjerPush/eur_config/eur_formal_settings.py

@@ -17,6 +17,9 @@ 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 = ["*"]

+ 3 - 0
AnsjerPush/test_config/test_settings.py

@@ -17,6 +17,9 @@ 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 = ["*"]

+ 3 - 0
AnsjerPush/us_config/formal_settings.py

@@ -17,6 +17,9 @@ 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 = ["*"]

+ 5 - 1
Service/DevicePushService.py

@@ -24,7 +24,7 @@ from oci.object_storage.models import CopyObjectDetails
 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, \
+    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, OCI_NAMESPACE_NAME
 from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID, XM_PUSH_CHANNEL_DICT
@@ -50,9 +50,13 @@ from Service.VSeesHuaweiPushService.VseesHuaweiPushObject import VseesHuaweiPush
 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')