chenjunkai 5 tahun lalu
induk
melakukan
99c96e473a

+ 2 - 0
Ansjer/config_formal.py

@@ -47,3 +47,5 @@ APNS_CONFIG = {
     }
 }
 APNS_MODE = 'prod'
+
+TUTK_PUSH_DOMAIN = 'http://push.iotcplatform.com/tpns'

+ 2 - 1
Ansjer/config_local.py

@@ -52,4 +52,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
     }
 }
-APNS_MODE = 'dev'
+APNS_MODE = 'dev'
+TUTK_PUSH_DOMAIN = 'http://rd2-3-tpns.kalay.us:8000/apns/apns.php'

+ 2 - 1
Ansjer/config_test.py

@@ -55,4 +55,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
     }
 }
-APNS_MODE = 'dev'
+APNS_MODE = 'dev'
+TUTK_PUSH_DOMAIN = 'http://rd2-3-tpns.kalay.us:8000/apns/apns.php'

+ 1 - 0
Ansjer/urls.py

@@ -111,6 +111,7 @@ urlpatterns = [
     url(r'^v2/account/resetPwdByCode$', UserController.v2resetPwdByCodeView.as_view()),
     # 重置密码验证码校验
     url(r'^v2/authcode/verify$', UserController.verifyAuthcode.as_view()),
+    url(r'^v2/account/logout$', UserController.V2LogoutView.as_view()),
 
     url(r'^detect/add$', DetectController.PushNotificationView.as_view()),
     url(r'^detect/(?P<operation>.*)$', DetectController.DetectControllerView.as_view()),

+ 4 - 4
Controller/UserController.py

@@ -25,9 +25,9 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from ratelimit.decorators import ratelimit
 
-from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG
+from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG,TUTK_PUSH_DOMAIN
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
-from Model.models import Device_User, Role, SysMsgModel, UidPushModel, UserOauth2Model, UserExModel, Device_Info
+from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -2088,8 +2088,8 @@ class V2LogoutView(TemplateView):
             os_type = request_dict.get('os_type', None)
             appid = request_dict.get('appid', None)
             udid = request_dict.get('udid', None)
-            tutk_push_url = "http://push.iotcplatform.com/tpns?cmd=mapsync&os={os_type}&appid={appid}&udid={udid}".format(
-                os_type=os_type, appid=appid, udid=udid)
+            tutk_push_url = "{tutk_push_domain}?cmd=mapsync&os={os_type}&appid={appid}&udid={udid}".format(
+                os_type=os_type, appid=appid, udid=udid,tutk_push_domain=TUTK_PUSH_DOMAIN)
             res = requests.get(url=tutk_push_url)
             return response.json(0)
         else: