From c68ee8bac2991d97f4bf4645e0f639d3d891ba17 Mon Sep 17 00:00:00 2001
From: aazhou <aazhou@protonmail.com>
Date: Wed, 7 Jun 2023 14:38:35 +0800
Subject: [PATCH] update

---
 __pycache__/bn.cpython-310.pyc        | Bin 588 -> 0 bytes
 __pycache__/crossover.cpython-310.pyc | Bin 1620 -> 0 bytes
 bn.py                                 |   8 +++++---
 main.py                               |   2 +-
 settings.py                           |   6 ++++++
 crossover.py => strategy/crossover.py |   9 +++++++++
 tg.py                                 |  11 +++++++++++
 7 files changed, 32 insertions(+), 4 deletions(-)
 delete mode 100644 __pycache__/bn.cpython-310.pyc
 delete mode 100644 __pycache__/crossover.cpython-310.pyc
 create mode 100644 settings.py
 rename crossover.py => strategy/crossover.py (81%)
 create mode 100644 tg.py

diff --git a/__pycache__/bn.cpython-310.pyc b/__pycache__/bn.cpython-310.pyc
deleted file mode 100644
index a8f9be4f826628e8727301fb345f4eb0d6c77186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmY*W%}(Pm5T0?|G;~|kD?9;_7II&$Rx54Ky%a8y5K3cHyrfRB4ZBFGSZTTP4(*Xw
z@|6>>z=?4x5KJ^*JU<@KH&c&B10XTeJ8^>mPr>*o5g9*8?E!%RffXz<M+AxgA!i~H
zk>K~3N1`X<d&s%y&mi4-rff*j^I227=dV<`43*v_oO`6dNbQ)w!EbD##g++th^PXa
z((PWQmdd5f$7Q9Yc0RtWl$JJ)d~9!*^Sbhh(oUM2qB5MyJc8Mw-^*ckVx_TJQJ7k1
z6KOA9-DG7gWadmElwKTOT^HJAbA8m@nwakNNi8E7V`rCie3wuCej~SoHEv)93s_O#
z0{377r{fi){@EU^nTR%M_FG&>ThE3jb~R{`nDMFaZ=1I!Jeu>9+2lCoCJZDW$-m`A
zp%?N@>GRqrQVaV>xeFf`O+yAz=OJRgP_{?g@!djLWakbcyGxKDXG7ejkNxAUi_ut3
zV3YRp;aurLm-5Kcj!dB5wa~HeazE4#Q#IiMpL}1|;<}PQXs2Kkf+56gz=!-5?!b1k

diff --git a/__pycache__/crossover.cpython-310.pyc b/__pycache__/crossover.cpython-310.pyc
deleted file mode 100644
index a607b7ea9323f8963c863b449b1378e7e0e15c58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1620
zcmc&!&1(}u6rYcsWQ}RHT0iO+h!=y}L@ju!MNxawUQ$7}NZ9VIHD<FLXE&8dibw_Z
zprRK+JQ(njn}{G3!K;76UNx0?@z9&#$9t35FSP2(S>`wMo0&JWZ{BZS(9@G5P(Gc#
zA+IF}d5>gyVL(nm4Tk_Ek<=qrr==FtoLgKn$!`(MkcJe{3Ym~eXcLm=Nyco0B^h%l
zHr)az5d-QesNozyM4nMeCA&rH<TRP34LU<3c7@le<kGmuW>}XA&3Kn3G&8y^shOxV
zX%3J&M>Gg0B|{yr8!MPV2ICVxr$nyL6R=sQZ2+|mRTsc!ITOfAR87cKo^-6xGLv5E
z8eW)ynuofu9bgJvx@dws1e_rQ;M_xYmE}p3w($y@G!~b<z>b<MW`ns{xPGK+O`<R^
zUxu>hLsx}a+g5>}J?)02D5zweK)TsT*|O+Q9lBbz{V40GAPj?PR}EHbacbBrhLIDL
zD<dZU2L97_a{YjF*>y^V$*Kp_mkUcK!(QOnUN|ziWY<pWf3s3ivFuh{RSaZ%4-B;>
z!aIcTP}<)B#z&h*%=}6$Y^Cg4EF#-0PFnoTxs%OAY)Ct@t+e9>p<Ae^qT_~^;g;=V
zmH<4Ovl7r8&UM-&xtw;q1MA_Kc-wFO8a1@A6`-H>@?MHxjvM^oSA(+eCRaOQ>OYE(
ztPmZtj_Al5q7y4bhpZzy@h_rN7;VK7P=^Wwx#~_;8pZ~2ya!-W7p|@Ts0-DLW*ZPT
zBJ?3_LfDMZ4=_HewqRc$fGYk)FjpV74VUdg*bU&I3qK2bvY0DIfnctv!((dbtWamO
zRBed3q_dO~-+&&BP!bt>W;bw-T*8ZlzVWl45o1-9NbC8N*7H~M_aC+HJpS;u(R%Q@
zb$jmP{TH9#+^p_}`T3WP`KNc+T7|oOY|j0~E^DmHh?q_KaiZiEeK*wNjRm|GNCtQ#
z86GFXT6r??ViU$(HEnxp2TZJrY@7}uFGTKCt)Qy@epnD<z|zcQDQYs4r)iq0eYj&%
zVRo{FUoBT^3Llcf2d<CSXX<6k_Sd1*PtqJN2eRt9Bbd`e6q89z3LiK7(tSSw?ZB28

diff --git a/bn.py b/bn.py
index a001ea2..8a93e6b 100644
--- a/bn.py
+++ b/bn.py
@@ -4,8 +4,10 @@ client = Spot()
 
 
 # Get klines
-def klines(symbol, interval, limit=300):
-    return client.klines(symbol,interval,limit=limit)
+def klines(symbol, interval):
+    lines = client.klines(symbol,interval)
+    print(len(lines))
+    return lines
 
 # Get Symbols
 def symbols():
@@ -16,4 +18,4 @@ def symbols():
         if s['symbol'].endswith('USDT'):
             symbols.append(s['symbol'])
     
-    return symbols
+    return symbols
\ No newline at end of file
diff --git a/main.py b/main.py
index 4a37515..b78164c 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
 import schedule
 import bn
 import time
-import crossover
+import strategy.crossover as crossover
 
 # 获取交易所交易对
 symbols = bn.symbols()
diff --git a/settings.py b/settings.py
new file mode 100644
index 0000000..8a21c86
--- /dev/null
+++ b/settings.py
@@ -0,0 +1,6 @@
+
+# telegram bot key
+telegram_bot_key='5863718864:AAFijN65_SbbGQ0WDBggzKJw2SIcZVTVrPw'
+
+#
+chat_id = "@dragon_invest"
\ No newline at end of file
diff --git a/crossover.py b/strategy/crossover.py
similarity index 81%
rename from crossover.py
rename to strategy/crossover.py
index 986b030..2423447 100644
--- a/crossover.py
+++ b/strategy/crossover.py
@@ -1,6 +1,8 @@
 import talib
 import numpy as np
 import bn
+import tg
+import settings
 
 # 检查是否出现多头排列信号
 def check_bullish_crossover(data):
@@ -40,9 +42,16 @@ def check_bearish_crossover(data):
 def strategy_run(symbol, interval):
     # 获取kline数据
     data = bn.klines(symbol, interval)
+    print(f'获取Kline数据: [{symbol}] - [{interval}]')
 
     if check_bullish_crossover(data):
         print('多头排列信号出现！')
 
+        text = f'${symbol} - {interval}\r\n\r\n出现【多头排列】信号'
+        tg.send_message(settings.chat_id, text)
+
+
     if check_bearish_crossover(data):
         print("空头排列信号出现！")
+        text = f'${symbol} - {interval}\r\n\r\n出现【空头排列】信号'
+        tg.send_message(settings.chat_id, text)
\ No newline at end of file
diff --git a/tg.py b/tg.py
new file mode 100644
index 0000000..927c6cd
--- /dev/null
+++ b/tg.py
@@ -0,0 +1,11 @@
+import requests
+import settings
+
+# 发送消息
+def send_message(chat_id, text):
+    url = f'https://api.telegram.org/bot{settings.telegram_bot_key}/sendMessage'
+    formData = {
+        "chat_id" : chat_id,
+        "text" : text
+    }
+    requests.post(url, data= formData)
\ No newline at end of file