增加程序版本检测

Controller/AccessLog.py

@@ -104,7 +104,7 @@ class AccessLog(View):
             content = json.loads(content)
             kwargs = {}
             for (k, v) in content.items():
-                if v is not None and v != u'':
+                if v is not None and v != '':
                     if k == 'content':
                         kwargs[k + '__icontains'] = v
                     else:

Controller/UserController.py

@@ -372,7 +372,7 @@ class ForgetPwdView(TemplateView):
         return self.ValidationError(userName, response)
 
     def ValidationError(self, userName, response):
-
+        return response.json()
         if userName != None:
             userName = userName.strip()
             return self.ForgetPwd(userName, response)
@@ -444,32 +444,27 @@ class EmailResetPwdView(TemplateView):
 
     def validate(self, request_dict, response, *args, **kwargs):
         token = request_dict.get('token', None)
-        if token is not None:
-            tko = TokenObject(token)
-            if tko.code == 0:
-                redisObj = RedisObject()
-                userID = tko.userID
-                reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
-                if reset_pwd is not False:
-                    user_qs = Device_User.objects.filter(userID=userID)
-                    if user_qs.exists():
-                        redisObj.del_data(key=userID + '_email_reset_pwd')
-                        is_update = user_qs.update(password=make_password(reset_pwd))
-                        if is_update:
-                            return HttpResponseRedirect(
-                                "http://www.dvema.com/web/html/paw_update_success.html?code=" + reset_pwd)
-                        else:
-                            return response.json(10)
+        tko = TokenObject(token)
+        if tko.code == 0:
+            redisObj = RedisObject()
+            userID = tko.userID
+            reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
+            if reset_pwd is not False:
+                user_qs = Device_User.objects.filter(userID=userID)
+                if user_qs.exists():
+                    redisObj.del_data(key=userID + '_email_reset_pwd')
+                    is_update = user_qs.update(password=make_password(reset_pwd))
+                    if is_update:
+                        return HttpResponseRedirect(
+                            "http://www.dvema.com/web/html/paw_update_success.html?code=" + reset_pwd)
                     else:
-                        return response.json(104)
+                        return response.json(10)
                 else:
-                    return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
-                    return response.json(306, 'rpwd')
+                    return response.json(104)
             else:
                 return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
-                return response.json(tko.code)
         else:
-            return response.json(444, 'token')
+            return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
 
 
 class refreshTokenView(TemplateView):

Object/ResponseObject.py

@@ -44,6 +44,7 @@ class ResponseObject(object):
             424: 'Database Error !',
             444: 'Wrong parameters!',
             474: 'System Maintaining！',
+            475: 'Version too low, please upgrade the program!',
             500: 'Query Database Error:',
             700: 'Upload file error',
             701: 'The file does not exist!',
@@ -93,6 +94,7 @@ class ResponseObject(object):
             424: '数据库错误！',
             444: '参数错误！',
             474: '系统维护中！',
+            475: '版本过低，请升级程序！',
             500: '查询数据库错误！',
             700: '上传文件错误',
             701: '文件不存在',