diff --git a/bitmart/抓取数据_30分钟.py b/bitmart/抓取数据_30分钟.py index d0e7e01..7e98086 100644 --- a/bitmart/抓取数据_30分钟.py +++ b/bitmart/抓取数据_30分钟.py @@ -6,7 +6,7 @@ BitMart 30分钟K线数据抓取脚本 import time from loguru import logger from bitmart.api_contract import APIContract -from models.bitmart import BitMart30 +from models.bitmart_15 import BitMart15 class BitMartDataCollector: @@ -29,11 +29,11 @@ class BitMartDataCollector: if not end_time: end_time = int(time.time()) if not start_time: - start_time = end_time - 3600 * 24 * 7 # 默认获取最近7天 + start_time = end_time - 3600 * 24 * 1 # 默认获取最近7天 response = self.contractAPI.get_kline( contract_symbol=self.contract_symbol, - step=30, # 30分钟 + step=15, # 30分钟 start_time=start_time, end_time=end_time )[0] @@ -73,7 +73,7 @@ class BitMartDataCollector: saved_count = 0 for kline in klines: try: - BitMart30.get_or_create( + BitMart15.get_or_create( id=kline['id'], defaults={ 'open': kline['open'], @@ -144,7 +144,7 @@ if __name__ == '__main__': collector = BitMartDataCollector() # 抓取最近30天的历史数据 - collector.collect_historical_data(days=365) + collector.collect_historical_data(days=500) # 如果需要实时抓取,可以取消下面的注释 # collector.collect_realtime_data() diff --git a/models/bitmart_15.py b/models/bitmart_15.py new file mode 100644 index 0000000..5360111 --- /dev/null +++ b/models/bitmart_15.py @@ -0,0 +1,21 @@ +from peewee import * + +from models import db + + +class BitMart15(Model): + id = IntegerField(primary_key=True) # 时间戳(毫秒级) + open = FloatField(null=True) + high = FloatField(null=True) + low = FloatField(null=True) + close = FloatField(null=True) + + class Meta: + database = db + table_name = 'bitmart_15' + + +# 连接到数据库 +db.connect() +# 创建表(如果表不存在) +db.create_tables([BitMart15]) diff --git a/models/database.db b/models/database.db index a35c4a0..80c311b 100644 Binary files a/models/database.db and b/models/database.db differ diff --git a/telegram/8619211027341.session b/telegram/8619211027341.session index 3aa9b5f..cd2d2a7 100644 Binary files a/telegram/8619211027341.session and b/telegram/8619211027341.session differ diff --git a/telegram/bhaha_session.session b/telegram/bhaha_session.session index f443219..48866c2 100644 Binary files a/telegram/bhaha_session.session and b/telegram/bhaha_session.session differ diff --git a/telegram/bot_session.session b/telegram/bot_session.session index 5d816b2..64eb9dc 100644 Binary files a/telegram/bot_session.session and b/telegram/bot_session.session differ diff --git a/telegram/sign.db b/telegram/sign.db index fddad46..6c0e48b 100644 Binary files a/telegram/sign.db and b/telegram/sign.db differ diff --git a/telegram/sign1.db b/telegram/sign1.db index 02a20fb..5291b12 100644 Binary files a/telegram/sign1.db and b/telegram/sign1.db differ