添加DETECT_PUSH_DOMAIN_V2

Ansjer/config_formal.py

@@ -28,6 +28,7 @@ PAYPAL_CRD = {
 }
 
 DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
+DETECT_PUSH_DOMAIN_V2 = 'http://jiuan.push.dvema.com'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'

Ansjer/config_test.py

@@ -39,6 +39,7 @@ PAYPAL_CRD = {
 #     "client_secret": "EHcnfrpL1o1ev9WnlQ-C1uymeRKDoJ6li6Y0d6iHoRGj4u8Sx5lSEEH774XphP4LQZ0DrDUdvxbux0T2"
 # }
 DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+DETECT_PUSH_DOMAIN_V2 = 'http://jiuan.push.dvema.com'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'test_user_brand'
 USER_BRAND_ALL = 'test_user_brand_all'

Controller/DetectControllerV2.py

@@ -21,7 +21,7 @@ from django.http import JsonResponse
 from django.views.generic.base import View
 from pyfcm import FCMNotification
 from Object.RedisObject import RedisObject
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, JPUSH_CONFIG, \
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN_V2, JPUSH_CONFIG, \
     FCM_CONFIG, APNS_CONFIG, BASE_DIR, APNS_MODE
 from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel, UidPushModel, CompanyModel
 from Object.ETkObject import ETkObject
@@ -127,9 +127,9 @@ class DetectControllerViewV2(View):
         # ipInfo = CommonService.getIpIpInfo(ip=ip, lang='EN')
         # area = ipInfo['country_name']
         # if area == 'China':
-        #     DETECT_PUSH_DOMAIN = 'cn.push.dvema.com'
+        #     DETECT_PUSH_DOMAIN_V2 = 'cn.push.dvema.com'
         # else:
-        #     DETECT_PUSH_DOMAIN = 'en.push.dvema.com'
+        #     DETECT_PUSH_DOMAIN_V2 = 'en.push.dvema.com'
 
         nowTime = int(time.time())
         if dvqs.exists():
@@ -216,8 +216,8 @@ class DetectControllerViewV2(View):
                 # utko.generate(data={'uid': uid})
                 etkObj = ETkObject(etk='')
                 etk = etkObj.encrypt(uid)
-                detectUrl = "{DETECT_PUSH_DOMAIN}notifyV2/push?etk={etk}&company_secrete={company_secrete}". \
-                    format(etk=etk, company_secrete=company_secrete, DETECT_PUSH_DOMAIN=DETECT_PUSH_DOMAIN)
+                detectUrl = "{DETECT_PUSH_DOMAIN_V2}notifyV2/push?etk={etk}&company_secrete={company_secrete}". \
+                    format(etk=etk, company_secrete=company_secrete, DETECT_PUSH_DOMAIN_V2=DETECT_PUSH_DOMAIN_V2)
                 return response.json(0, {'detectUrl': detectUrl})
         else:
             return response.json(14)