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

Controller/SerialNumberController.py

@@ -382,7 +382,7 @@ class SerialNumberView(View):
         content = json.loads(json.dumps(request_dict))
         log = {
             'ip': ip,
-            'user': 0,
+            'user_id': 1,
             'status': 200,
             'time': now_time,
             'operation': '解绑uid',

Controller/UidUser.py

@@ -62,7 +62,8 @@ def addInterface(request):
             userID = tko.userID
             re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
             sy_uid = re.compile(r'^[A-Za-z0-9]{14}$')
-            if re_uid.match(UID) or sy_uid.match(UID):
+            sy_uid23 = re.compile(r'^[A-Za-z0-9]{23}$')
+            if re_uid.match(UID) or sy_uid.match(UID) or sy_uid23.match(UID):
                 is_ap = int(is_ap)
                 is_exist = UidUserModel.objects.filter(UID=UID, userID_id=userID, is_ap=is_ap)
                 if is_exist: