From fb47d36048e94b9a506d5c153e3dd19a01e37df1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 十月 2023 16:30:27 +0800
Subject: [PATCH] bug修复
---
gui.py | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/gui.py b/gui.py
index e437217..af2c0b4 100644
--- a/gui.py
+++ b/gui.py
@@ -9,12 +9,12 @@
import win32gui
-from db.redis_manager import RedisUtils
+from db.redis_manager_delegate import RedisUtils
from utils import data_export_util
import multiprocessing
-from log_module import log
-from db import mysql_data, redis_manager
+from log_module import log, log_export
+from db import mysql_data_delegate as mysql_data, redis_manager_delegate as redis_manager
import server
from config import settings
from ths.l2_code_operate import L2CodeOperate
@@ -157,15 +157,18 @@
text.delete('1.0', END)
# 楠岃瘉redis
+ redis = redis_manager.RedisManager().getRedis()
try:
- redis = redis_manager.RedisManager().getRedis()
- redis.set("test", "1")
- RedisUtils.delete(redis, "test")
+
+ RedisUtils.set( redis,"test", "1",auto_free=False)
+ RedisUtils.delete(redis, "test", auto_free=False)
text.insert(END, "redis杩炴帴鎴愬姛锛乗n")
except:
error = "redis杩炴帴澶辫触...\n"
text.insert(END, error)
_set_error_color(text, 1, error)
+ finally:
+ RedisUtils.realse(redis)
# 楠岃瘉mongodb
try:
counts = mysql_data.Mysqldb().select_one("select count(*) from clients")
@@ -220,8 +223,7 @@
# 缁樺埗寮�鐩樺墠鐨勬暟鎹噯澶囨儏鍐�
def __draw_pre_data_check(self, frame):
def refresh_close_price_data():
- redis = redis_manager.RedisManager(0).getRedis()
- count = len(RedisUtils.keys(redis, "price-pre-*"))
+ count = len(RedisUtils.keys(redis_manager.RedisManager(0).getRedis(), "price-pre-*"))
sv_num.set("鑾峰彇鍒版敹鐩樹环鏁伴噺锛歿}".format(count))
def re_get_close_price():
@@ -721,7 +723,7 @@
time.sleep(1)
def refresh_data():
- money = trade_manager.get_available_money()
+ money = trade_manager.AccountAvailableMoneyManager().get_available_money()
if money is not None:
sv_trade_money.set(money)
else:
@@ -942,10 +944,10 @@
def export_l2_data_origin(code):
redis = redis_manager.RedisManager(1).getRedis()
- keys = RedisUtils.keys(redis, "big_data-{}-*".format(code))
try:
+ keys = RedisUtils.keys(redis, "big_data-{}-*".format(code), auto_free=False)
for k in keys:
- datas = redis.get(k)
+ datas = redis.get(k, auto_free=False)
datas = json.loads(datas)
_t = k.split("-")[2]
k = time.strftime("%Y_%m_%d_%H_%M_%S_", time.localtime(float(_t) / 1000))
@@ -953,6 +955,8 @@
data_export_util.export_l2_data_origin(code, datas, k)
except Exception as e1:
showerror("瀵煎嚭澶辫触", str(e1))
+ finally:
+ RedisUtils.realse(redis)
showinfo("鎻愮ず", "瀵煎嚭瀹屾垚")
@@ -1011,7 +1015,7 @@
btn = FlatButton(frame, text="鑾峰彇m鍊�", command=lambda: compute_m(code.get()))
btn.place(x=10, y=130)
- btn = FlatButton(frame, text="瀵煎嚭浜ゆ槗鏃ュ織", command=lambda: log.export_l2_log(code.get()))
+ btn = FlatButton(frame, text="瀵煎嚭浜ゆ槗鏃ュ織", command=lambda: log_export.export_l2_log(code.get()))
btn.place(x=80, y=130)
btn = FlatButton(frame, text="娓呯┖l2鏁版嵁", command=lambda: clear_l2(code.get()))
--
Gitblit v1.8.0