AnsjerPush/cn_config/cn_formal_config.py

@@ -30,8 +30,6 @@ ALY_SES_ACCESS_REPLYTO = '***'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 # 设定离线时间为5分钟

AnsjerPush/cn_config/cn_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 = ["*"]

AnsjerPush/config.py

@@ -39,8 +39,6 @@ ALY_SES_ACCESS_REPLYTO = '***'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 # 设定离线时间为5分钟

AnsjerPush/dev_config/local_config.py

@@ -25,8 +25,6 @@ APNS_MODE = 'dev'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 

AnsjerPush/eur_config/eur_formal_config.py

@@ -30,8 +30,6 @@ ALY_SES_ACCESS_REPLYTO = '***'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 # 设定离线时间为5分钟

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.py

@@ -1,51 +1,4 @@
-import datetime
 import time
-from datetime import timezone, timedelta, datetime
-
-import boto3
-
-from AnsjerPush.config import AWS_SES_ACCESS_ID, AWS_SES_ACCESS_SECRET
-
-# client = boto3.client('cloudwatch', region_name='us-east-1', aws_access_key_id=AWS_SES_ACCESS_ID, aws_secret_access_key=AWS_SES_ACCESS_SECRET)
-# response = client.get_dashboard(DashboardName='string')
-# print(response)
-
-# localtime = time.localtime(1601482210)
-# current_month = localtime.tm_mon
-# print(current_month)
-#
-# time_struct = [localtime.tm_year, localtime.tm_mon, 1, 0, 0, 0, 0, 0, 0]
-# start_time = int(time.mktime(tuple(time_struct)))
-# print(start_time)
-#
-# time_struct[1] = current_month + 1
-# end_time = int(time.mktime(tuple(time_struct)))
-# print(end_time)
-
-# current_time = int(1601565010 - 8 * 3600)
-# print(current_time)
-# count = int(current_time / (24 * 3600))
-# current_time = count * 24 * 3600
-# print(current_time)
-
-# localtime = time.localtime(1601565010)
-# datetime.datetime()
-# current_day = localtime.tm_mday
-#
-# time_struct = [localtime.tm_year, localtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
-# current_time = int(time.mktime(tuple(time_struct)))
-# print(current_time)
-
-
-# gmtime = time.gmtime(1601568621 + 28800)
-# current_day = gmtime.tm_mday
-# print(current_day)
-# print(gmtime.tm_hour)
-# time_struct = [gmtime.tm_year, gmtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
-# current_time = int(time.mktime(tuple(time_struct)))
-# print(current_time - 28800)
-
-
 gmtime = time.gmtime(int(time.time()) + 28800)
 current_month = gmtime.tm_mon - 1
 print(current_month)

AnsjerPush/test_config/test_config.py

@@ -25,8 +25,6 @@ APNS_MODE = 'dev'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 

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_config.py

@@ -29,8 +29,6 @@ ALY_SES_ACCESS_REPLYTO = '***'
 
 # 发送邮件邮箱
 SES_COMPANY_EMAIL = 'user_server@nsst.com'
-AWS_SES_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
-AWS_SES_ACCESS_SECRET = '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'
 AWS_SES_ACCESS_REGION = 'us-east-1'
 AWS_BUCKET = 'ansjertest'
 # 设定离线时间为5分钟

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

@@ -24,8 +24,8 @@ 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, \
-    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, OCI_NAMESPACE_NAME
 from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID, XM_PUSH_CHANNEL_DICT
 from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
@@ -51,6 +51,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')