Merge remote-tracking branch 'remotes/origin/locky' into test

.dockerignore

@@ -2,4 +2,5 @@ __pycache__/
 .gitee/
 .idea/
 static/log/*/*
-static/apns_pem/*
+static/apns_pem/*
+.env

.gitignore

@@ -16,4 +16,5 @@
 /sdk_install
 /DB/mydata4vipday2.ipdb
 /__pycache__/*.pyc
-/venv
+/venv
+.env

AnsjerPush/cn_config/cn_formal_config.py

@@ -14,8 +14,6 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws-cn:s3'
 REGION_NAME = 'cn-northwest-1'
-ACCESS_KEY_ID = 'AKIA2MMWBR4D3I4YNHSP'
-SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'push'                                # 推送存储桶

AnsjerPush/config.py

@@ -69,8 +69,6 @@ OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # aws api key
 AWS_ARN = ['arn:aws-cn:s3', 'arn:aws:s3']
-AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4D3I4YNHSP', 'AKIA2E67UIMD45Y3HL53']  # 0国内， 1国外
-AWS_SECRET_ACCESS_KEY = ['5Q9LsKwa0Q9IRntwDWDzIgDOdT5zayt4M+qJKmuw', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
 
 # 服务器域名
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

AnsjerPush/dev_config/local_config.py

@@ -14,8 +14,6 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
-ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
-SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'foreignpush'                                # 推送存储桶

AnsjerPush/eur_config/eur_formal_config.py

@@ -14,8 +14,6 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
-ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
-SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'foreignpush'                                # 推送存储桶

AnsjerPush/test_config/test_config.py

@@ -14,8 +14,6 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
-ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
-SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'foreignpush'                                # 推送存储桶

AnsjerPush/test_config/test_settings.py

@@ -1,7 +1,18 @@
 import os
+from AnsjerPush.config import BASE_DIR
+import environ
+
+env = environ.Env(
+    DEBUG=(bool, False)
+)
+# 读取 .env 文件
+environ.Env.read_env(os.path.join(BASE_DIR, '.env'))
+
+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=[])
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-print()
 SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
 DEBUG = True
 ALLOWED_HOSTS = ["*"]
@@ -52,22 +63,22 @@ TEMPLATES = [
 WSGI_APPLICATION = 'AnsjerPush.wsgi.application'
 
 # 业务数据库
-DATABASE_DATA = 'ansjer_server_test'
-SERVER_HOST = '124.70.222.33'
-DATABASES_USER = 'root'
-DATABASES_PASS = 'Ansjer123'
+DATABASE_DATA = env('DATABASE_DATA')
+SERVER_HOST = env('SERVER_HOST')
+DATABASES_USER = env('DATABASES_USER')
+DATABASES_PASS = env('DATABASES_PASS')
 
 # 推送数据库
-DATABASE_DATA2 = 'ansjer_push_test'
-SERVER_HOST2 = '124.70.222.33'
-DATABASES_USER2 = 'root'
-DATABASES_PASS2 = 'Ansjer123'
+DATABASE_DATA2 = env('DATABASE_DATA2')
+SERVER_HOST2 = env('SERVER_HOST2')
+DATABASES_USER2 = env('DATABASES_USER2')
+DATABASES_PASS2 = env('DATABASES_PASS2')
 
 # 袋鼠妈妈数据库
-DATABASE_DATA4 = 'test_roomumy'
-SERVER_HOST4 = '124.70.222.33'
-DATABASES_USER4 = 'root'
-DATABASES_PASS4 = 'Ansjer123'
+DATABASE_DATA4 = env('DATABASE_DATA4')
+SERVER_HOST4 = env('SERVER_HOST4')
+DATABASES_USER4 = env('DATABASES_USER4')
+DATABASES_PASS4 = env('DATABASES_PASS4')
 
 DATABASES = {
     'default': {

AnsjerPush/us_config/formal_config.py

@@ -13,8 +13,6 @@ AWS相关
 # aws api key
 AWS_ARN_S3 = 'arn:aws:s3'
 REGION_NAME = 'us-east-1'
-ACCESS_KEY_ID = 'AKIA2E67UIMD45Y3HL53'
-SECRET_ACCESS_KEY = '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'
 
 # 存储桶
 PUSH_BUCKET = 'foreignpush'                                # 推送存储桶

Controller/AiController.py

@@ -21,7 +21,7 @@ from django.views.generic.base import View
 from pyfcm import FCMNotification
 
 from AnsjerPush.config import AI_IDENTIFICATION_TAGS_DICT, CONFIG_US, CONFIG_EUR
-from AnsjerPush.config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, APNS_MODE, APNS_CONFIG, BASE_DIR, \
+from AnsjerPush.config import APNS_MODE, APNS_CONFIG, BASE_DIR, \
     JPUSH_CONFIG, FCM_CONFIG
 from AnsjerPush.config import CONFIG_INFO
 from AnsjerPush.config import PUSH_BUCKET
@@ -40,6 +40,9 @@ from Service.DevicePushService import DevicePushService
 from Service.EquipmentInfoService import EquipmentInfoService
 from Object.NovaImageTagObject import NovaImageTagObject
 from datetime import datetime
+from django.conf import settings
+AWS_ACCESS_KEY_ID = settings.AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY = settings.AWS_SECRET_ACCESS_KEY
 
 TIME_LOGGER = logging.getLogger('time')
 # 1. 声明一个全局变量，用于存放创建好的实例

Object/S3Email.py

@@ -4,8 +4,11 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
 import boto3
+from django.conf import settings
+AWS_ACCESS_KEY_ID = settings.AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY = settings.AWS_SECRET_ACCESS_KEY
 
-AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY = 'AKIA2E67UIMD45Y3HL53', 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw'
+AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY = AWS_ACCESS_KEY_ID[1], AWS_SECRET_ACCESS_KEY[1]
 
 
 class S3Email:

Service/CommonService.py

@@ -16,10 +16,11 @@ from pyipip import IPIPDatabase
 import OpenSSL.crypto as ct
 from base64 import encodebytes
 
-from AnsjerPush.config import BASE_DIR, ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, PUSH_BUCKET, SYS_EVENT_TYPE_LIST, \
-    DATA_PUSH_EVENT_TYPE_LIST
+from AnsjerPush.config import BASE_DIR, REGION_NAME, PUSH_BUCKET, SYS_EVENT_TYPE_LIST, DATA_PUSH_EVENT_TYPE_LIST
 from Model.models import iotdeviceInfoModel, Device_User
-from Object.enums.EventTypeEnum import EventTypeEnumObj
+from django.conf import settings
+ACCESS_KEY_ID = settings.ACCESS_KEY_ID
+SECRET_ACCESS_KEY = settings.SECRET_ACCESS_KEY
 
 
 # 复用性且公用较高封装代码在这

Service/DevicePushService.py

@@ -23,8 +23,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, AWS_ACCESS_KEY_ID, \
-    AWS_SECRET_ACCESS_KEY, EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST, HUAWEICLOUD_AK, HUAWEICLOUD_SK, \
+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, \
     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
@@ -47,6 +47,10 @@ from django.db import close_old_connections
 from Service.RoomumyHuaweiPushService.RoomumyHuaweiPushService import RoomumyHuaweiPushObject
 from Service.VSeesHuaweiPushService.VseesHuaweiPushObject import VseesHuaweiPushObject
 
+from django.conf import settings
+AWS_ACCESS_KEY_ID = settings.AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY = settings.AWS_SECRET_ACCESS_KEY
+
 LOGGING = logging.getLogger('info')
 TIME_LOGGER = logging.getLogger('time')
 ERROR_INFO_LOGGER = logging.getLogger('error_info')

requirements.txt

@@ -109,4 +109,5 @@ zope.event==5.0
 zope.interface==6.4
 esdk-obs-python==3.24.6
 concurrent-log-handler==0.9.25
-oci==2.125.2
+oci==2.125.2
+django-environ==0.11.2