Merge remote-tracking branch 'origin/master'

myapps/sukang24h/api/rent_portal.py

@@ -153,17 +153,6 @@ def wx_pay_callback():
     machine = Machine.query.filter_by(machine_no=machine_no).first()
     machine = Machine.query.filter_by(machine_no=machine_no).first()
 
 
     try:
     try:
-        lock_time = 0
-        while lock_time < 3:
-            # redis 加锁
-            lock_res = redis_client.set(RENT_SALE_LOCK + str(machine.id),
-                                        datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), ex=60,
-                                        nx=True)
-            if lock_res:
-                break
-            lock_time += 1
-            time.sleep(1)
-
         rent = Rent()
         rent = Rent()
         rent.rent_no = rent_no
         rent.rent_no = rent_no
         rent.machine_no = machine.machine_no
         rent.machine_no = machine.machine_no
@@ -216,10 +205,8 @@ def wx_pay_callback():
         db.session.commit()
         db.session.commit()
 
 
     except Exception as e:
     except Exception as e:
-        redis_client.delete(RENT_SALE_LOCK + str(machine.id))
         return xmltodict.unparse({'xml': error_data}, pretty=True), header
         return xmltodict.unparse({'xml': error_data}, pretty=True), header
 
 
-    redis_client.delete(RENT_SALE_LOCK + str(machine.machine_id))
     return xmltodict.unparse({'xml': response_data}, pretty=True), header
     return xmltodict.unparse({'xml': response_data}, pretty=True), header
 
 
 
 

sukang_app.py

@@ -13,4 +13,4 @@ app = create_app(os.getenv('RUN_ENV', 'prod'))
 logger.info("run server")
 logger.info("run server")
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    app.run('127.0.0.1', 8893, debug=True)
+    app.run('127.0.0.1', 8893, debug=False)