Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/UserController.py

@@ -769,7 +769,6 @@ class v2registerView(TemplateView):
     def validates(self, request_dict):
         phone = request_dict.get('phone', None)
         email = request_dict.get('email', None)
-
         password = request_dict.get('password', None)
         authcode = request_dict.get('authcode', None)
         lang = request_dict.get('lang', None)
@@ -1286,19 +1285,27 @@ class v3LoginView(TemplateView):
             return response.json(111)
         username = username.strip()
         password = password.strip()
+        print("准备解密")
         # 解密
         for i in range(1, 4):
             if i == 1:
                 # 第一次先解密
                 password = base64.b64decode(password)
                 password = password.decode('utf-8')
-                # 去盐值
-                password = password.split('SALTP@SSWORD')[1]
-                print("解密去盐后的password:%s" % password)
-            else:
-                # 继续解密
+                # 截去第一位，最后一位
+                password = password[1:-1]
+            if i==2:
+                # 第2次先解密
+                password = base64.b64decode(password)
+                password = password.decode('utf-8')
+                # 去前2位，后2位
+                password = password[2:-2]
+            if i==3:
+                # 第3次先解密
                 password = base64.b64decode(password)
                 password = password.decode('utf-8')
+                # 去前3位，后3位
+                password = password[3:-3]
         data_valid = DataValid()
         if data_valid.email_validate(username):
             return self.do_email_login(username, password, response)