添加本地登录接口1

Controller/UserController.py

@@ -174,7 +174,8 @@ class registerView(TemplateView):
         authCode = request_dict.get('identifyingCode', None)
         language = request_dict.get('language', None)
         unique = request_dict.get('unique', None)
-        self.delete_local_account(unique)
+        if unique:
+            delete_local_account(unique)
         response = ResponseObject(language)
         if username and password and authCode:
             # 过滤空格
@@ -288,15 +289,6 @@ class registerView(TemplateView):
         else:
             return response.json(109)
 
-    def delete_local_account(self, username):
-        user_qs = Device_User.objects.filter(username=username)
-        print(user_qs)
-        if user_qs.exists():
-            user: Device_User = user_qs[0]
-            if user.is_local:
-                user.delete()
-                Device_Info.objects.filter(userID__userID=user.userID).delete()
-
 # 登出
 class LogoutView(TemplateView):
     @method_decorator(csrf_exempt)
@@ -868,6 +860,9 @@ class v2registerView(TemplateView):
         password = request_dict.get('password', None)
         authcode = request_dict.get('authcode', None)
         lang = request_dict.get('lang', None)
+        unique = request_dict.get('unique', None)
+        if unique:
+            delete_local_account(unique)
         response = ResponseObject(lang)
         if not lang:
             lang = request_dict.get('language', None)
@@ -1009,7 +1004,8 @@ class v3registerView(TemplateView):
         authcode = request_dict.get('authcode', None)
         lang = request_dict.get('lang', None)
         unique = request_dict.get('unique', None)
-        self.delete_local_account(unique)
+        if unique:
+            delete_local_account(unique)
         response = ResponseObject(lang)
         # 解密
         try:
@@ -2867,6 +2863,9 @@ class Image_Code_RegisterView(TemplateView):
         # 页面输入的验证码
         response = ResponseObject(lang)
         valid_code = request_dict.get('id_v_code', None)
+        unique = request_dict.get('unique', None)
+        if unique:
+            delete_local_account(unique)
 
         if not all([userEmail, password, lang, imageCodeId, valid_code]):
             return response.json(444)
@@ -3573,3 +3572,13 @@ class LocalUserView(View):
             print('---')
             print(user_qs)
             return self.do_login(user_qs, response)
+
+
+def delete_local_account(username):
+    user_qs = Device_User.objects.filter(username=username)
+    print(user_qs)
+    if user_qs.exists():
+        user: Device_User = user_qs[0]
+        if user.is_local:
+            user.delete()
+            Device_Info.objects.filter(userID__userID=user.userID).delete()

Model/models.py

@@ -1,5 +1,4 @@
 from itertools import chain
-from Service.CommonService import CommonService
 from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
 from django.db import models
 from django.utils import six, timezone

Service/ModelService.py

@@ -5,7 +5,6 @@ import requests
 
 from Ansjer.config import BASE_DIR
 from Model.models import *
-from Service.CommonService import CommonService
 import json
 from django.db.models import Q