update git.sh

git-after.sh

@@ -1,4 +0,0 @@
-cd output
-sudo git add .
-sudo git commit -m "$(date +'%Y-%m-%d %H:%M:%S')"
-sudo git push origin main

git.sh

@@ -8,4 +8,8 @@ cd config
 sudo git fetch origin
 sudo git reset --hard origin/main
 cd ..
-sudo python3 -m pip install -r requirements.txt
+sleep 120
+cd output
+sudo git add .
+sudo git commit -m "$(date +'%Y-%m-%d %H:%M:%S')"
+sudo git push origin main

main.py

@@ -88,8 +88,10 @@ def main():
     logger = logging.getLogger("main")
 
     db = Database(config_file_name)
+    next_exec_time = time.time()
     config = config_load(config_file_path)
 
+    while True:
         logger.info("开始检查")
         try:
             old_config = config
@@ -174,19 +176,22 @@ def main():
                     trade_data["order"]["type"],
                     trade_data["order"]["side"],
                     trade_data["order"]["amount"],
-                trade_data["order"]["price"],
+                    trade_data["order"].get("price", None),
                 )
-            if order_detail["status"] == "closed":
+                if order_detail["status"] == "open":
+                    db.data[trade_id]["order_id"]["open"].append(order_detail["id"])
+                    db.data[trade_id]["counter"]["open"] += 1
+                elif order_detail["status"] == "closed":
                     logger.info("%s: 订单成交", order_detail["id"])
                     csv_record(config_file_name, order_detail, accounts[trade_data["account"]].id, trade_data.get("csv_symbol", None))
                     db.data[trade_id]["order_id"]["filled"].append(order_detail["id"])
                     db.data[trade_id]["counter"]["filled"] += 1
                 else:
-                db.data[trade_id]["order_id"]["open"].append(order_detail["id"])
-                db.data[trade_id]["counter"]["open"] += 1
                     logger.warning("%s: 订单状态为 %s，未加入追踪", order_detail["id"], order_detail["status"])
 
         db.save()
+        next_exec_time += config["interval"]
+        time.sleep(max(0, next_exec_time - time.time()))
 
 
 if __name__ == "__main__":