Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer

Controller/SerialNumberController.py

@@ -150,6 +150,14 @@ class SerialNumberView(View):
 
         if serial_number[9:10]:
             p2p_type = serial_number[9:10]
+
+        # redis加锁，防止同一个序列号重复绑定
+        redisObj = RedisObject()
+        isLock = redisObj.CONN.setnx(serial + 'do_attach_uid', 1)
+        redisObj.CONN.expire(serial + 'do_attach_uid', 60)
+        if not isLock:
+            return response.json(5)
+
         try:
             if not country_id:
                 # 设备模拟国外环境测试