From 9d63f6068c3978e79e87db2f3729ed2a96caddfc Mon Sep 17 00:00:00 2001
From: danial <danial@gmail.com>
Date: Tue, 31 Dec 2024 00:27:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor(scripts):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E6=89=A7=E8=A1=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 docker-entrypoint.sh，增加睡眠时间以减少资源占用
- 重命名 main.py 中的函数 run_task 为 run
- 更新 scripts.py，使用 while 循环持续查询订单
---
 deploy/docker-entrypoint.sh |  2 +-
 main.py                     |  4 ++--
 src/cmd/scripts.py          | 25 ++++++++++++++-----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/deploy/docker-entrypoint.sh b/deploy/docker-entrypoint.sh
index 49644a6..56e2d31 100644
--- a/deploy/docker-entrypoint.sh
+++ b/deploy/docker-entrypoint.sh
@@ -11,5 +11,5 @@ while true; do
       # 如果成功获取锁，则运行 Python 脚本
       python -u main.py
   ) 200>$LOCKFILE
-  sleep 1
+  sleep 5
 done
\ No newline at end of file
diff --git a/main.py b/main.py
index b7c5550..a38b8c8 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,4 @@
-from src.cmd.scripts import run_task
+from src.cmd.scripts import run
 
 if __name__ == "__main__":
-    run_task()
+    run()
diff --git a/src/cmd/scripts.py b/src/cmd/scripts.py
index c22e565..4f0e7ca 100644
--- a/src/cmd/scripts.py
+++ b/src/cmd/scripts.py
@@ -182,17 +182,20 @@ def run_task():
     # 注册信号处理程序
     has_been_console = False
     master_node_service = MasterNodeService()
-    # 1s获取两次订单
-    master_order = master_node_service.query_order()
-    if master_order.orderNo != "":
-        logger.info(f"当前订单：{master_order}")
-        run_redeem_task(master_order, master_node_service)
-    # 10分钟打印一次信息
-    if datetime.now().second % 10 == 0 and not has_been_console:
-        has_been_console = True
-        print(f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\t暂时没有订单")
-    if datetime.now().second % 10 != 0 and has_been_console:
-        has_been_console = False
+    while True:
+        master_node_service = MasterNodeService()
+        # 1s获取两次订单
+        master_order = master_node_service.query_order()
+        if master_order.orderNo != "":
+            logger.info(f"当前订单：{master_order}")
+            run_redeem_task(master_order, master_node_service)
+        # 10分钟打印一次信息
+        if datetime.now().second % 10 == 0 and not has_been_console:
+            has_been_console = True
+            print(f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\t暂时没有订单")
+        if datetime.now().second % 10 != 0 and has_been_console:
+            has_been_console = False
+        # time.sleep(1)
 
 def run():
     # signal.signal(signal.SIGINT, signal_handler)