优化配置文件

Ansjer/cn_config/config_formal.py

@@ -1,32 +1,46 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
 """
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/10/16 9:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: config_formal.py
-@Contact: chanjunkai@163.com
+独立于config.py的配置文件
 """
 import os
 
-# 配置信息
+# 配置信息,配置模式和根路径
 CONFIG_INFO = 'cn'
+SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-NGINX_RTMP_STAT = 'http://www.zositechc.cn/stat'
-SERVER_DOMAIN_SSL = 'https://www.zositechc.cn/'
-SERVER_DOMAIN = 'http://www.zositechc.cn/'
-DOMAIN_HOST = 'www.zositechc.cn'
+"""
+AWS相关
+"""
+# ======================================================================================================================
+# aws api key
+AWS_ARN_S3 = 'arn:aws-cn:s3'
+REGION_NAME = 'cn-northwest-1'
+ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
+SECRET_ACCESS_KEY = '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'
+
+# 存储桶
+PUSH_BUCKET = 'push'                                # 推送存储桶
+PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
+AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
+LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+
+# redis节点
 SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
 PUSH_REDIS_ADDRESS = 'pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
-# PAYPAL_CRD = {
-#     "mode": "live",  # sandbox or live
-#     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-#     "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-# }
+# ======================================================================================================================
+
+# 域名
+DOMAIN_HOST = 'www.zositechc.cn'
+SERVER_DOMAIN = 'http://www.zositechc.cn/'
+SERVER_DOMAIN_SSL = 'https://www.zositechc.cn/'
+NGINX_RTMP_STAT = 'http://www.zositechc.cn/stat'
+DETECT_PUSH_DOMAIN = 'http://push.zositechc.cn/'
+DETECT_PUSH_DOMAINS = 'https://push.zositechc.cn/'
+DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.zositechc.cn/'
+DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.zositechc.cn/'
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
+
+# PayPal
 PAYPAL_CRD = {
     "mode": "sandbox",  # sandbox or live
     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
@@ -35,15 +49,12 @@ PAYPAL_CRD = {
 PAYPAL_WEB_HOOK_ID = '6TS30758D98835230'
 PAYPAL_WEB_HOOK_ID_TWO = '2BH56575UJ9324151'
 
-DETECT_PUSH_DOMAIN = 'http://push.zositechc.cn/'
-DETECT_PUSH_DOMAINS = 'https://push.zositechc.cn/'
-DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.zositechc.cn/'
-DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.zositechc.cn/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'
 
-# type =2
+APNS_MODE = 'prod'
+
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {
         'Key': 'f0dc047e5e53fd14199de5b0',
@@ -88,7 +99,7 @@ JPUSH_CONFIG = {
         'Key': 'ecdde95cd272f410ee029139',
         'Secret': '9ddca1e92bfa331126fd8826'},
 }
-# type =1
+
 FCM_CONFIG = {
     'com.ansjer.zccloud_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.loocamccloud_a': 'AAAAb9YP3rk:APA91bFCgd-kbVmpK4EVpfdHH_PJZQCYTkOGnTZdIuBWEz2r7aMRsJYHOH3sB-rwcbaRWgnufTyjX9nGQxb6KxQbWVk4ah_H-M3IqGh6Mb60WQQAuR33V6g_Jes5pGL6ViuIxGHqVMaR',
@@ -101,6 +112,7 @@ FCM_CONFIG = {
     'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.customizedc_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
 }
+
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
         'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
@@ -127,19 +139,3 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/customizedc.pem',
     }
 }
-APNS_MODE = 'prod'
-# 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
-
-TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
-
-# aws api key
-AWS_ARN_S3 = 'arn:aws-cn:s3'
-REGION_NAME = 'cn-northwest-1'
-ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
-SECRET_ACCESS_KEY = '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'
-
-# 存储桶名
-AVATAR_BUCKET = 'avatar-cn'         # 头像存储桶
-LOG_BUCKET = 'ansjer-statres'       # 日志存储桶

Ansjer/cn_config/config_test.py

@@ -1,60 +1,64 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
 """
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/10/16 9:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: config_test.py
-@Contact: chanjunkai@163.com
+独立于config.py的配置文件
 """
 import os
 
-# 配置信息
+# 配置信息,配置模式和根路径
 CONFIG_INFO = 'test'
+SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-NGINX_RTMP_STAT = 'http://test.zositechc.cn/stat/'
+"""
+AWS相关
+"""
+# ======================================================================================================================
+# aws api key
+AWS_ARN_S3 = 'arn:aws-cn:s3'
+REGION_NAME = 'cn-northwest-1'
+ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
+SECRET_ACCESS_KEY = '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'
+
+# 存储桶
+PUSH_BUCKET = 'push'                                # 推送存储桶
+PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
+AVATAR_BUCKET = 'avatar-cn'                         # 头像存储桶
+LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+
+# redis节点
+SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
+PUSH_REDIS_ADDRESS = 'pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
+# ======================================================================================================================
+
+# 域名
+DOMAIN_HOST = 'test.zositechc.cn'
 SERVER_DOMAIN = 'http://test.zositechc.cn/'
 SERVER_DOMAIN_SSL = 'https://test.zositechc.cn/'
-
+NGINX_RTMP_STAT = 'http://test.zositechc.cn/stat/'
+DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+DETECT_PUSH_DOMAINS = 'https://test.push.dvema.com/'
+DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
+DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
 
 # token的secret
 OAUTH_ACCESS_TOKEN_SECRET = 'test_a+jbgnw%@1%zy^=@dn62%'
 OAUTH_REFRESH_TOKEN_SECRET = 'test_r+jbgnw%@1%zy^=@dn62%'
 
-DOMAIN_HOST = 'test.zositechc.cn'
-SERVER_HOST = 'backendserver.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
-PUSH_REDIS_ADDRESS = 'pushredis.3xavzq.0001.cnw1.cache.amazonaws.com.cn'
+# PayPal
 PAYPAL_CRD = {
-    # "mode": "live",  # sandbox or live
-    # "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-    # "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-    # "mode": "sandbox",  # sandbox or live
-    # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-    # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
     "mode": "sandbox",  # sandbox or live
     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
     "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
 }
 PAYPAL_WEB_HOOK_ID = '6TS30758D98835230'
 PAYPAL_WEB_HOOK_ID_TWO = '2BH56575UJ9324151'
-# PAYPAL_CRD = {
-#     "mode": "sandbox",  # sandbox or live
-#     "client_id": "ATXTpWs8sajNYeU46jNs1yzpy4H_o3RRrGVIJ8Tscc312BjMx12cpRgCucfWX07a4G6GbK8hzElB04Pd",
-#     "client_secret": "EHcnfrpL1o1ev9WnlQ-C1uymeRKDoJ6li6Y0d6iHoRGj4u8Sx5lSEEH774XphP4LQZ0DrDUdvxbux0T2"
-# }
-DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
-DETECT_PUSH_DOMAINS = 'https://test.push.dvema.com/'
-DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
-DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
+
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'test_user_brand'
 USER_BRAND_ALL = 'test_user_brand_all'
 
-# type =2
+APNS_MODE = 'dev'
+
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {
         'Key': 'f0dc047e5e53fd14199de5b0',
@@ -99,7 +103,7 @@ JPUSH_CONFIG = {
         'Key': 'ecdde95cd272f410ee029139',
         'Secret': '9ddca1e92bfa331126fd8826'},
 }
-# type =1
+
 FCM_CONFIG = {
     'com.ansjer.zccloud_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.loocamccloud_a': 'AAAAb9YP3rk:APA91bFCgd-kbVmpK4EVpfdHH_PJZQCYTkOGnTZdIuBWEz2r7aMRsJYHOH3sB-rwcbaRWgnufTyjX9nGQxb6KxQbWVk4ah_H-M3IqGh6Mb60WQQAuR33V6g_Jes5pGL6ViuIxGHqVMaR',
@@ -112,6 +116,7 @@ FCM_CONFIG = {
     'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.customizedc_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
 }
+
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
         'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
@@ -138,20 +143,3 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/customizedc.pem',
     }
 }
-# 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-APNS_MODE = 'dev'
-SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
-
-TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
-
-
-# aws api key
-AWS_ARN_S3 = 'arn:aws-cn:s3'
-REGION_NAME = 'cn-northwest-1'
-ACCESS_KEY_ID = 'AKIA2MMWBR4DSFG67DTG'
-SECRET_ACCESS_KEY = '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'
-
-# 存储桶名
-AVATAR_BUCKET = 'avatar-cn'         # 头像存储桶
-LOG_BUCKET = 'ansjer-statres'       # 日志存储桶

Ansjer/eur_config/config_formal.py

@@ -1,28 +1,46 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
 """
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/10/16 9:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: config_formal.py
-@Contact: chanjunkai@163.com
+独立于config.py的配置文件
 """
 import os
 
-# 配置信息
+# 配置信息,配置模式和根路径
 CONFIG_INFO = 'eur'
+SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-NGINX_RTMP_STAT = 'http://www.zositeche.com/stat'
-SERVER_DOMAIN_SSL = 'https://www.zositeche.com/'
-SERVER_DOMAIN = 'http://www.zositeche.com/'
-DOMAIN_HOST = 'www.zositeche.com'
+"""
+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'                         # 推送存储桶
+PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
+AVATAR_BUCKET = 'avatar-us'                         # 头像存储桶
+LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+
+# redis节点
 SERVER_HOST = 'server-redis.av1kep.ng.0001.euw1.cache.amazonaws.com'
 PUSH_REDIS_ADDRESS = 'push-redis.av1kep.ng.0001.euw1.cache.amazonaws.com'
+# ======================================================================================================================
+
+# 域名
+DOMAIN_HOST = 'www.zositeche.com'
+SERVER_DOMAIN = 'http://www.zositeche.com/'
+SERVER_DOMAIN_SSL = 'https://www.zositeche.com/'
+NGINX_RTMP_STAT = 'http://www.zositeche.com/stat'
+DETECT_PUSH_DOMAIN = 'http://push.zositeche.com/'
+DETECT_PUSH_DOMAINS = 'https://push.zositeche.com/'
+DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
+DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
 
+# PayPal
 PAYPAL_CRD = {
     "mode": "sandbox",  # sandbox or live
     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
@@ -31,16 +49,12 @@ PAYPAL_CRD = {
 PAYPAL_WEB_HOOK_ID = '3YH86681TH784461T'
 PAYPAL_WEB_HOOK_ID_TWO = '7TN87895N70389928'
 
-
-DETECT_PUSH_DOMAIN = 'http://push.zositeche.com/'
-DETECT_PUSH_DOMAINS = 'https://push.zositeche.com/'
-DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
-DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'
 
-# type =2
+APNS_MODE = 'prod'
+
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {
         'Key': 'f0dc047e5e53fd14199de5b0',
@@ -85,7 +99,7 @@ JPUSH_CONFIG = {
         'Key': 'ecdde95cd272f410ee029139',
         'Secret': '9ddca1e92bfa331126fd8826'},
 }
-# type =1
+
 FCM_CONFIG = {
     'com.ansjer.zccloud_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.loocamccloud_a': 'AAAAb9YP3rk:APA91bFCgd-kbVmpK4EVpfdHH_PJZQCYTkOGnTZdIuBWEz2r7aMRsJYHOH3sB-rwcbaRWgnufTyjX9nGQxb6KxQbWVk4ah_H-M3IqGh6Mb60WQQAuR33V6g_Jes5pGL6ViuIxGHqVMaR',
@@ -98,6 +112,7 @@ FCM_CONFIG = {
     'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.customizedc_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
 }
+
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
         'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
@@ -124,19 +139,3 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/customizedc.pem',
     }
 }
-APNS_MODE = 'prod'
-# 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
-
-TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
-
-# 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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'
-
-# 存储桶名
-AVATAR_BUCKET = 'avatar-us'         # 头像存储桶
-LOG_BUCKET = 'ansjer-statres'       # 日志存储桶

Ansjer/us_config/config_formal.py

@@ -1,27 +1,46 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
 """
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/10/16 9:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: config_formal.py
-@Contact: chanjunkai@163.com
+独立于config.py的配置文件
 """
 import os
 
-# 配置信息
+# 配置信息,配置模式和根路径
 CONFIG_INFO = 'us'
+SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
-SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
-SERVER_DOMAIN = 'http://www.dvema.com/'
-DOMAIN_HOST = 'www.dvema.com'
+"""
+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'                         # 推送存储桶
+PUSH_INACCURATE_BUCKET = 'push-inaccurate'          # 推送不准确存储桶
+AVATAR_BUCKET = 'avatar-us'                         # 头像存储桶
+LOG_BUCKET = 'ansjer-statres'                       # 日志存储桶
+
+# redis节点
 SERVER_HOST = 'backendserver.5tgle2.0001.usw1.cache.amazonaws.com'
 PUSH_REDIS_ADDRESS = 'pushredis.5tgle2.0001.usw1.cache.amazonaws.com'
+# ======================================================================================================================
+
+# 域名
+DOMAIN_HOST = 'www.dvema.com'
+SERVER_DOMAIN = 'http://www.dvema.com/'
+SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
+NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
+DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
+DETECT_PUSH_DOMAINS = 'https://push.dvema.com/'
+DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
+DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
+
+# PayPal
 PAYPAL_CRD = {
     "mode": "live",  # sandbox or live
     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
@@ -30,21 +49,12 @@ PAYPAL_CRD = {
 PAYPAL_WEB_HOOK_ID = '3YH86681TH784461T'
 PAYPAL_WEB_HOOK_ID_TWO = '7TN87895N70389928'
 
-# PAYPAL_CRD = {
-#     "mode": "sandbox",  # sandbox or live
-#     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
-#     "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
-# }
-
-DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
-DETECT_PUSH_DOMAINS = 'https://push.dvema.com/'
-DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'
-DETECT_PUSH_DOMAINS_JIUAN = 'https://jiuan.push.dvema.com/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'
 
-# type =2
+APNS_MODE = 'prod'
+
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {
         'Key': 'f0dc047e5e53fd14199de5b0',
@@ -89,7 +99,7 @@ JPUSH_CONFIG = {
         'Key': 'ecdde95cd272f410ee029139',
         'Secret': '9ddca1e92bfa331126fd8826'},
 }
-# type =1
+
 FCM_CONFIG = {
     'com.ansjer.zccloud_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.loocamccloud_a': 'AAAAb9YP3rk:APA91bFCgd-kbVmpK4EVpfdHH_PJZQCYTkOGnTZdIuBWEz2r7aMRsJYHOH3sB-rwcbaRWgnufTyjX9nGQxb6KxQbWVk4ah_H-M3IqGh6Mb60WQQAuR33V6g_Jes5pGL6ViuIxGHqVMaR',
@@ -102,6 +112,7 @@ FCM_CONFIG = {
     'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
     'com.ansjer.customizedc_a': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
 }
+
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
         'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
@@ -128,19 +139,3 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/customizedc.pem',
     }
 }
-APNS_MODE = 'prod'
-# 根路径
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
-
-TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'
-
-# 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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'
-
-# 存储桶名
-AVATAR_BUCKET = 'avatar-us'         # 头像存储桶
-LOG_BUCKET = 'ansjer-statres'       # 日志存储桶

Controller/FeedBack.py

@@ -5,9 +5,8 @@ import oss2
 from django.db import transaction
 from django.views.generic.base import View
 
-from Ansjer.config import CONFIG_TEST, CONFIG_CN, CONFIG_INFO, AWS_IOT_SES_ACCESS_CHINA_REGION, \
-    AWS_SES_ACCESS_REGION
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
+from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, PUSH_BUCKET, PUSH_INACCURATE_BUCKET
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import FeedBackModel, StatResModel, PushInaccurateFeedback
 from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.ResponseObject import ResponseObject
@@ -49,7 +48,7 @@ class FeedBackView(View):
                 return self.do_delete_image(userID, request_dict, response)
             elif operation == 'submitted':  # 查询是否已提交过推送图片反馈
                 return self.submitted(userID, request_dict, response)
-            elif operation == 'pushInaccurate':     # 用户反馈推送不准确
+            elif operation == 'pushInaccurate':  # 用户反馈推送不准确
                 return self.push_inaccurate(userID, request_dict, response)
             else:
                 return response.json(414)
@@ -307,32 +306,23 @@ class FeedBackView(View):
         # 查询数据是否存在
         push_inaccurate_feedback_qs = PushInaccurateFeedback.objects.filter(equipment_info_id=equipment_info_id,
                                                                             user_id=user_id, uid=uid, channel=channel,
-                                                                            event_type=event_type, event_time=event_time,
+                                                                            event_type=event_type,
+                                                                            event_time=event_time,
                                                                             is_st=is_st)
         if push_inaccurate_feedback_qs.exists():
             return response.json(174)
         # 查询图片是否存在s3
-        if CONFIG_INFO == CONFIG_TEST or CONFIG_INFO == CONFIG_CN:  # 国内
-            region_name = AWS_IOT_SES_ACCESS_CHINA_REGION
-            aws_access_key_id = AWS_ACCESS_KEY_ID[0]
-            secret_access_key = AWS_SECRET_ACCESS_KEY[0]
-            bucket = 'push'
-        else:  # 国外
-            region_name = AWS_SES_ACCESS_REGION
-            aws_access_key_id = AWS_ACCESS_KEY_ID[1]
-            secret_access_key = AWS_SECRET_ACCESS_KEY[1]
-            bucket = 'foreignpush'
         if is_st == 3:
             key = '{uid}/{channel}/{event_time}_0.jpeg'.format(uid=uid, channel=channel, event_time=event_time)
         else:
             key = '{uid}/{channel}/{event_time}.jpeg'.format(uid=uid, channel=channel, event_time=event_time)
         try:
             s3 = AmazonS3Util(
-                aws_access_key_id=aws_access_key_id,
-                secret_access_key=secret_access_key,
-                region_name=region_name
+                aws_access_key_id=ACCESS_KEY_ID,
+                secret_access_key=SECRET_ACCESS_KEY,
+                region_name=REGION_NAME
             )
-            have_object = s3.get_object(bucket, key)
+            have_object = s3.get_object(PUSH_BUCKET, key)
             if have_object:
                 return response.json(0)
             else:
@@ -351,37 +341,26 @@ class FeedBackView(View):
         if not all([equipment_info_id, uid, is_st, event_type, event_time, channel]):
             return response.json(444)
 
-        if CONFIG_INFO == CONFIG_TEST or CONFIG_INFO == CONFIG_CN:  # 国内
-            region_name = AWS_IOT_SES_ACCESS_CHINA_REGION
-            aws_access_key_id = AWS_ACCESS_KEY_ID[0]
-            secret_access_key = AWS_SECRET_ACCESS_KEY[0]
-            source_bucket = 'push'
-        else:  # 国外
-            region_name = AWS_SES_ACCESS_REGION
-            aws_access_key_id = AWS_ACCESS_KEY_ID[1]
-            secret_access_key = AWS_SECRET_ACCESS_KEY[1]
-            source_bucket = 'foreignpush'
-
         now_time = int(time.time())
         is_st = int(is_st)
         try:
             s3 = AmazonS3Util(
-                aws_access_key_id=aws_access_key_id,
-                secret_access_key=secret_access_key,
-                region_name=region_name
+                aws_access_key_id=ACCESS_KEY_ID,
+                secret_access_key=SECRET_ACCESS_KEY,
+                region_name=REGION_NAME
             )
             if is_st != 3:
                 file_path = '{uid}/{channel}/{event_time}.jpeg'.format(uid=uid,
                                                                        channel=channel,
                                                                        event_time=event_time)
-                s3.copy_obj(source_bucket, 'push-inaccurate', file_path)
+                s3.copy_obj(PUSH_BUCKET, PUSH_INACCURATE_BUCKET, file_path)
             else:
                 for index in range(3):
                     file_path = '{uid}/{channel}/{event_time}_{index}.jpeg'.format(uid=uid,
                                                                                    channel=channel,
                                                                                    event_time=event_time,
                                                                                    index=index)
-                    s3.copy_obj(source_bucket, 'push-inaccurate', file_path)
+                    s3.copy_obj(PUSH_BUCKET, PUSH_INACCURATE_BUCKET, file_path)
             PushInaccurateFeedback.objects.create(equipment_info_id=equipment_info_id,
                                                   user_id=user_id, event_type=event_type,
                                                   uid=uid, channel=channel, add_time=now_time,