m_code

Controller/DetectController.py

@@ -104,10 +104,15 @@ class DetectControllerView(View):
         app_type = request_dict.get('app_type', None)
         push_type = request_dict.get('push_type', None)
         status = request_dict.get('status', None)
+        m_code = request_dict.get('m_code',None)
         print('status')
         print(status)
+        if not status:
+            return response.json(444,'status')
         if status == '0':
-            uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, token_val=token_val,
+            if not all([app_type,appBundleId,uid,m_code]):
+                return response.json(444,'app_type,appBundleId,uid,m_code')
+            uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, m_code=m_code,
                                                 uid=uid,app_type=app_type)
             if uid_app_qs.exists():
                 uid_app_qs.update(status=0)
@@ -115,18 +120,15 @@ class DetectControllerView(View):
             else:
                 return response.json(173)
         elif status == '1':
-            # return response.json(10)
-
+            if not all([appBundleId,app_type,token_val,uid,m_code]):
+                return response.json(444,'appBundleId,app_type,token_val,uid,m_code')
             dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
-            # aiqs = App_Info.objects.filter(appBundleId=appBundleId).values('app_type')
-            # print(dvqs)
-            # print(aiqs)
-            # if dvqs.exists() and aiqs.exists():
+
             if dvqs.exists():
                 now_time = int(time.time())
                 try:
                     uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, token_val=token_val,
-                                                        uid=uid)
+                                                        uid=uid,m_code=m_code)
                     print(uid_app_qs)
                     if uid_app_qs.exists():
                         uid_app_qs.update(status=1)

Controller/UserController.py

@@ -301,12 +301,13 @@ class LogoutView(TemplateView):
 
             redisObj = RedisObject(db=3)
             redisObj.del_data(key=tko.userID)
-            token_val = request_dict.get('token_val', None)
-            userID = tko.userID
-            uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=1)
-            print(uid_app)
-            if uid_app.exists():
-                uid_app.update(status=3)
+            m_code = request_dict.get('m_code', None)
+            if m_code:
+                userID = tko.userID
+                uid_app = UID_App.objects.filter(userID_id=userID, m_code=m_code, status=1)
+                print(uid_app)
+                if uid_app.exists():
+                    uid_app.update(status=3)
             return response.json(0)
         else:
             return response.json(tko.code)

Model/models.py

@@ -572,6 +572,7 @@ class UID_App(models.Model):
     push_type = models.IntegerField(default=0, verbose_name=u'推送类型')  # 0,apns 1,安卓gcm 2,激光
     token_val = models.CharField(default='', max_length=160, verbose_name=u'设备验证令牌')
     status = models.SmallIntegerField(default=0, verbose_name='状态[0:关闭,1:开启,2:用户解绑]')
+    m_code = models.CharField(default='',max_length=64,verbose_name='手机唯一标识')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 

Object/TokenObject.py

@@ -61,7 +61,7 @@ class TokenObject:
             else:
                 self.code = 0
                 return res
-
+    # token加密
     def generate(self, data={}):
         try:
             access_expire = int(OAUTH_ACCESS_TOKEN_TIME.total_seconds())