Преглед на файлове

fix:compatible with refreshTokenView function

chenjunkai преди 6 години
родител
ревизия
2a3bd42a73
променени са 2 файла, в които са добавени 11 реда и са изтрити 9 реда
  1. 2 6
      Controller/DetectController.py
  2. 9 3
      Controller/UserController.py

+ 2 - 6
Controller/DetectController.py

@@ -108,13 +108,9 @@ class NotificationView(View):
         uidToken = request_dict.get('uidToken', None)
         utko = UidTokenObject(uidToken)
         uid = utko.UID
-        uaqs = UID_App.objects.filter(uid=uid).values('token_val', 'app_type', 'appBundleId', 'push_type','uid')
+        uaqs = UID_App.objects.filter(uid=uid).values('token_val', 'app_type', 'appBundleId', 'push_type', 'uid')
         if uaqs.exists():
             push_type = uaqs[0]['push_type']
-            # token_val = uaqs[0]['token_val']
-            # appBundleId = uaqs[0]['appBundleId']
-            # app_type = uaqs[0]['app_type']
-
             # ios apns
             if push_type == 0:
                 return self.do_apns(request_dict, uaqs[0], response)
@@ -123,7 +119,7 @@ class NotificationView(View):
                 return self.do_gmc(request_dict, uaqs[0], response)
             # android jpush
             elif push_type == 2:
-                return self.do_apns(request_dict, uaqs[0], response)
+                return self.do_jpush(request_dict, uaqs[0], response)
         else:
             return response.json(173)
         # # 设备主键uid

+ 9 - 3
Controller/UserController.py

@@ -475,7 +475,11 @@ class refreshTokenView(TemplateView):
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
-        request_dict = json.loads(request.body.decode('utf-8'))
+        content_type = request.META.get('CONTENT_TYPE', None)
+        if content_type == 'application/json':
+            request_dict = json.loads(request.body.decode('utf-8'))
+        else:
+            request_dict = request.POST
         return self.validation(request_dict)
 
     def get(self, request, *args, **kwargs):
@@ -590,9 +594,10 @@ class v2authCodeView(TemplateView):
             return response.json(10, 'error')
         return response.json(0)
         # return response.json(0, {'identifyingCode': identifyingCode})
+
     # 阿里云获取邮箱验证码
     def aliyun_emailCode(self, email, response):
-        print ('阿里云开始')
+        print('阿里云开始')
         dataValid = DataValid()
         # 邮箱匹配
         if dataValid.email_validate(email) is False:
@@ -625,6 +630,7 @@ class v2authCodeView(TemplateView):
         if reds.set_data(key=email + '_identifyingCode', val=identifyingCode, expire=600) is not True:
             return response.json(10, 'error')
         return response.json(0)
+
     def phoneCode(self, phone, response):
         dataValid = DataValid()
         if dataValid.mobile_validate(phone) is not True:
@@ -674,7 +680,7 @@ class v2registerView(TemplateView):
         authcode = request_dict.get('authcode', None)
         lang = request_dict.get('lang', None)
         if not lang:
-            lang = request_dict.get('language',None)
+            lang = request_dict.get('language', None)
         response = ResponseObject(lang)
         if password is None:
             return response.json(444, 'password')