From 24483098305c456c37d0dab1bc7b6908e55af11b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 29 八月 2025 16:52:05 +0800
Subject: [PATCH] D撤重新生效
---
log_module/log_export.py | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/log_module/log_export.py b/log_module/log_export.py
index 9ece516..87a0510 100644
--- a/log_module/log_export.py
+++ b/log_module/log_export.py
@@ -453,13 +453,12 @@
return cancel_reason_dict
-
def __parse_content(line):
line = line.split(" - ")[1]
time_str = line[line.find("[") + 1:line.find("[") + 9]
data = line[line.find("]") + 1:].strip()
- if data.find("thread-id=")>-1 and data.find("code=")>-1:
- data = data[data.find("code=")+11:].strip()
+ if data.find("thread-id=") > -1 and data.find("code=") > -1:
+ data = data[data.find("code=") + 11:].strip()
return time_str, data
@@ -608,7 +607,6 @@
return fdatas
-
@cache_log
def load_huaxin_l2_sell_deal_list(code=None, date=tool.get_now_date_str()):
path = f"{constant.get_path_prefix()}/logs/huaxin/l2/sell_l2_deal.{date}.log"
@@ -622,7 +620,7 @@
data = line.split(" - ")[1].strip()
if data.startswith("["):
data = data[data.find("]") + 1:].strip()
- if data.find("娑ㄥ仠涓诲姩涔版垚浜わ細") <0:
+ if data.find("娑ㄥ仠涓诲姩涔版垚浜わ細") < 0:
continue
data = data.split("娑ㄥ仠涓诲姩涔版垚浜わ細")[1]
data = eval(data)
@@ -856,12 +854,50 @@
path = f"{constant.get_path_prefix()}/logs/gp/plates/special_codes.{date}.log"
lines = __load_file_content(path)
if lines:
- line = lines[0]
- line = line[line.find(" - ") + 3:]
- return eval(line)
+ line = lines[0]
+ line = line[line.find(" - ") + 3:]
+ return eval(line)
return None
+def load_virtual_trade_account(date=tool.get_now_date_str()):
+ """
+ 鍔犺浇铏氭嫙浜ゆ槗鏁版嵁
+ :param date:
+ :return:
+ """
+ path = f"{constant.get_path_prefix()}/logs/gp/virtual_account/virtual_account_money_records.{date}.log"
+ fdatas = []
+ if os.path.exists(path):
+ with open(path, 'r', encoding="utf-8") as f:
+ lines = f.readlines()
+ if lines:
+ for line in lines:
+ time_str = __get_async_log_time(line)
+ data = line[line.find("]") + 1:].strip()
+ fdatas.append((time_str, eval(data)))
+ return fdatas
+
+
+def load_deal_list(date=tool.get_now_date_str()):
+ """
+ 鍔犺浇铏氭嫙浜ゆ槗鏁版嵁
+ :param date:
+ :return:
+ """
+ path = f"{constant.get_path_prefix()}/logs/huaxin_local/trade/deal.{date}.log"
+ fdatas = []
+ if os.path.exists(path):
+ with open(path, 'r', encoding="utf-8") as f:
+ lines = f.readlines()
+ if lines:
+ for line in lines:
+ # time_str = __get_async_log_time(line)
+ data = line[line.find("]") + 1:].strip()
+ fdatas.append(eval(data))
+ return fdatas
+
+
if __name__ == '__main__':
line = """
2025-03-12 14:49:15.028 | DEBUG | log_module.async_log_util:run_sync:66 - [14:49:14.899602] thread-id=3048 code=600841 L鍓嶇洃鎺ц寖鍥达細{1477, 1478, 1479, 1480, 1481, 1482, 1486, 1487, 1488, 1489, 1492, 1493, 1495, 1498, 1500} 璁＄畻鑼冨洿锛�1477-1503
--
Gitblit v1.8.0