chenjunkai 6 жил өмнө
parent
commit
f18182abc6

+ 1 - 1
Ansjer/urls.py

@@ -13,7 +13,7 @@ urlpatterns = [
     url(r'^account/logout$', UserController.LogoutView.as_view()),
     url(r'^account/changePwd$', UserController.ChangePwdView.as_view()),
     url(r'^account/forget$', UserController.ForgetPwdView.as_view()),
-    url(r'^account/email-re-pwd$', UserController.EmailResetPwdView.as_view()),
+    url(r'^account/email-re-pwd$', UserController.EmailResetPwdView.as_view()),reset
     url(r'^account/refreshTk$', UserController.refreshTokenView.as_view()),
     url(r'^favicon.ico$', UserManger.success, name=u'favicon.ico'),
     url(r'^account/showUserMore$', UserManger.showUserMoreView.as_view()),

+ 1 - 1
Controller/EquipmentManager.py

@@ -78,7 +78,7 @@ def addNewUserEquipmentInterface(request):
         UID = deviceData.get('UID', None)
         if not UID:
             return response.json(444, 'content')
-        dValid = Device_Info.objects.filter(userID=userID, UID=UID)
+        dValid = Device_Info.objects.filter(userID_id=userID, UID=UID)
         if dValid:
             return response.json(174)
         else:

+ 13 - 6
Object/TokenObject.py

@@ -28,13 +28,13 @@ class TokenObject:
         self.lang = None
         self.userID = None
         self.user = ''
+        self.code = 0
         self.valid()
-        if token is None:
-            self.code = 309
-        else:
-            self.code = 0
 
     def valid(self):
+        if self.token is None:
+            self.code = 309
+            return
         try:
             res = jwt.decode(self.token, OAUTH_ACCESS_TOKEN_SECRET, algorithms='HS256')
             # print(res)
@@ -50,13 +50,17 @@ class TokenObject:
             print('过期')
             print(repr(e))
             self.code = 309
+            return
         except Exception as e:
             self.code = 309
+            return
         else:
-            self.code = 0
             if not self.userID:
                 self.code = 309
-            return res
+                return
+            else:
+                self.code = 0
+                return res
 
     def generate(self, data={}):
         try:
@@ -88,6 +92,9 @@ class TokenObject:
             return res
 
     def refresh(self):
+        if not self.token:
+            self.code = 309
+            return
         try:
             res = jwt.decode(self.token, OAUTH_REFRESH_TOKEN_SECRET, algorithms='HS256')
         except jwt.ExpiredSignatureError as e: