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

Controller/EquipmentManager.py

@@ -657,6 +657,8 @@ def deleteInterface(request):
                 # 异步删除推送消息
             asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
             asy.start()
+            redisObj = RedisObject(db=8)
+            redisObj.del_data(key='uid_qs_' + userID)
         else:
             return response.json(14)
     except Exception as e:

Controller/UserController.py

@@ -2878,6 +2878,9 @@ class Image_Code_RegisterView(TemplateView):
         # 删除redis中的图片验证码，防止用户使用同一个图片验证码验证多次
         redisObj.del_data(key=image_code_key)
         username = userEmail
+        email_qs = Device_User.objects.filter(Q(userEmail=userEmail) | Q(username=userEmail))
+        if email_qs:
+            return response.json(103)
         # #存用户名和密码
         create_data = {
             "username": username,
@@ -2889,7 +2892,6 @@ class Image_Code_RegisterView(TemplateView):
             "user_isValid": True,
         }
         users = Device_User.objects.create(**create_data)
-        email_qs = Device_User.objects.filter(Q(userEmail=userEmail) | Q(username=userEmail))
         return self.do_login(email_qs, response)
 
     def do_login(self, user_qs, response):