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

Controller/UserController.py

@@ -37,6 +37,7 @@ from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Service.TemplateService import TemplateService
 from django.views.generic import View
+import base64
 
 
 # 获取验证码
@@ -1189,6 +1190,19 @@ class v2LoginView(TemplateView):
             return response.json(111)
         username = username.strip()
         password = password.strip()
+        # 解密
+        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 = base64.b64decode(password)
+                password = password.decode('utf-8')
         data_valid = DataValid()
         if data_valid.email_validate(username):
             return self.do_email_login(username, password, response)

Model/models.py

@@ -147,7 +147,6 @@ class Device_User(AbstractBaseUser):
     language = models.CharField(blank=True, max_length=16, default='en', verbose_name=u'语言地区')
     # 手机注册增加字段
     phone = models.CharField(max_length=16, verbose_name=u'手机号', default='', blank=True)
-
     objects = UserManager()
 
     USERNAME_FIELD = 'userID'  # 必须有一个唯一标识