diff --git a/datasource/crypto.py b/datasource/crypto.py index 04d9e8e..a221d2f 100644 --- a/datasource/crypto.py +++ b/datasource/crypto.py @@ -103,6 +103,4 @@ def get_klines(symbol,interval, future = False,limit=1000): df['timestamp'] = pd.to_datetime(df['timestamp'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) df['close_time'] = pd.to_datetime(df['close_time'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) - print(df) - return df \ No newline at end of file diff --git a/monitors/macd_boll.py b/monitors/macd_boll.py index e769c66..6e81093 100644 --- a/monitors/macd_boll.py +++ b/monitors/macd_boll.py @@ -4,6 +4,7 @@ import time,setting import telegram_sender from datasource import crypto import dingding +import redis_helper import discord_sender @@ -41,6 +42,7 @@ def stratergy_run(symbol, interval, df, debug): df['Short_Signal'] = np.where(short_condition,True, False) latest = df.iloc[-2] + print(f"【{symbol} - {interval}】 is checked!") direction = "" if latest['Short_Signal'] == True: @@ -66,7 +68,7 @@ def stratergy_run(symbol, interval, df, debug): def run_crypto(interval, debug=False): print('Vegas策略运行.') time.sleep(5) - for s in setting.symbols: + for s in redis_helper.get_symbols(): df = crypto.get_klines(s, interval, True) stratergy_run(s,interval, df, debug) diff --git a/monitors/vegas_cross.py b/monitors/vegas_cross.py index 5e0b499..4707fc7 100644 --- a/monitors/vegas_cross.py +++ b/monitors/vegas_cross.py @@ -34,7 +34,6 @@ def stratergy_run(symbol, interval, df, debug): df['shortSignal'] = crossunder(max_low_line, min_high_line) latest = df.iloc[-1] - print(df) direction = "" if latest['shortSignal']==True: direction = '空' @@ -61,7 +60,7 @@ def stratergy_run(symbol, interval, df, debug): def run_crypto(interval, debug=False): print('Vegas策略运行.') - for s in crypto.get_future_symbols(): + for s in setting.symbols: df = crypto.get_klines(s, interval,True) stratergy_run(s,interval, df, debug) diff --git a/redis_helper.py b/redis_helper.py new file mode 100644 index 0000000..b969a33 --- /dev/null +++ b/redis_helper.py @@ -0,0 +1,10 @@ +import redis +import json + +r = redis.Redis(host='45.76.104.85', port=6379, db=0 ,password="redis_ihkXTj") + +def get_symbols(): + data = json.loads(r.get('t_symbols')) + print(f'symbols: \r\n{data}') + + return data \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index ae33f6b..604a95d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,5 @@ requests schedule TA_Lib tweepy -discord_webhook \ No newline at end of file +discord_webhook +redis \ No newline at end of file diff --git a/test.py b/test.py index a9d9ecd..6471b55 100644 --- a/test.py +++ b/test.py @@ -9,6 +9,12 @@ from datasource import crypto from monitors import macd_boll import datasource from binance.um_futures import UMFutures +import redis + +# r = redis.Redis(host='45.76.104.85', port=6379, db=0 ,password="redis_ihkXTj") +# r.set('r_symbols', "test") + +# print(r.get('r_symbols')) # print(datasource.crypto.get_future_symbols())