dededdew
This commit is contained in:
@@ -182,7 +182,7 @@ class WeexTransaction:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def to_do_page(self):
|
def to_do_page(self):
|
||||||
# self.page.get("https://www.weeaxs.site/zh-CN/futures/demo-trading/ETH-SUSDT")
|
self.mn_tab = self.page.new_tab("https://www.weeaxs.site/zh-CN/futures/ETH-USDT")
|
||||||
|
|
||||||
self.mn_tab.ele('x://*[contains(text(), "市价")]', timeout=15).click()
|
self.mn_tab.ele('x://*[contains(text(), "市价")]', timeout=15).click()
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
@@ -269,33 +269,6 @@ class WeexTransaction:
|
|||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_start(self, ):
|
|
||||||
|
|
||||||
json_data = {
|
|
||||||
'filterCoinIdList': [
|
|
||||||
2,
|
|
||||||
],
|
|
||||||
'filterContractIdList': [],
|
|
||||||
'filterOrderStatusList': [
|
|
||||||
'CANCELED',
|
|
||||||
'FILLED',
|
|
||||||
],
|
|
||||||
'filterOrderTypeList': [],
|
|
||||||
'languageType': 1,
|
|
||||||
'limit': 20,
|
|
||||||
'sign': 'SIGN',
|
|
||||||
'timeZone': 'string',
|
|
||||||
}
|
|
||||||
|
|
||||||
response = requests.post(
|
|
||||||
'https://http-gateway2.ngsvsfx.cn/api/v1/private/order/v2/getHistoryOrderPage',
|
|
||||||
headers=self.weex_headers,
|
|
||||||
json=json_data,
|
|
||||||
)
|
|
||||||
|
|
||||||
for i in response.json()["data"]["dataList"]:
|
|
||||||
print(i)
|
|
||||||
|
|
||||||
def get_user_data(self):
|
def get_user_data(self):
|
||||||
self.mn_tab = self.page.new_tab()
|
self.mn_tab = self.page.new_tab()
|
||||||
self.mn_tab.listen.start("https://gateway2.ngsvsfx.cn/v1/user/overview/userinfo")
|
self.mn_tab.listen.start("https://gateway2.ngsvsfx.cn/v1/user/overview/userinfo")
|
||||||
@@ -330,26 +303,59 @@ class WeexTransaction:
|
|||||||
'timeZone': 'string',
|
'timeZone': 'string',
|
||||||
}
|
}
|
||||||
|
|
||||||
response = self.session.post(
|
try:
|
||||||
'https://http-gateway2.ngsvsfx.cn/api/v1/private/order/v2/getHistoryOrderPage',
|
response = self.session.post(
|
||||||
json=json_data,
|
'https://http-gateway2.ngsvsfx.cn/api/v1/private/order/v2/getHistoryOrderPage',
|
||||||
)
|
json=json_data,
|
||||||
|
)
|
||||||
|
|
||||||
data = []
|
data = []
|
||||||
for i in response.json()["data"]["dataList"]:
|
for i in response.json()["data"]["dataList"]:
|
||||||
print(i)
|
print(i)
|
||||||
|
|
||||||
data.append({
|
data.append({
|
||||||
"id":int(i["createdTime"]),
|
"id": int(i["createdTime"]),
|
||||||
"start": i["legacyOrderDirectionDesc"]
|
"start": i["legacyOrderDirectionDesc"]
|
||||||
})
|
})
|
||||||
|
|
||||||
new_data = sorted(data, key=lambda x: x["id"])
|
new_data = sorted(data, key=lambda x: x["id"])
|
||||||
if new_data[-1]["data1"] == "开多仓":
|
if new_data[-1]["data1"] == "开多仓":
|
||||||
self.start = 1
|
self.start = 1
|
||||||
elif new_data[-1]["data1"] == "开空仓":
|
elif new_data[-1]["data1"] == "开空仓":
|
||||||
self.start = -1
|
self.start = -1
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
return False
|
||||||
|
|
||||||
|
def close_position(self):
|
||||||
|
try:
|
||||||
|
self.mn_tab = self.page.new_tab("https://www.weeaxs.site/zh-CN/futures/ETH-USDT")
|
||||||
|
|
||||||
|
if self.start == 1:
|
||||||
|
if is_bearish(self.kline_1) and is_bearish(self.kline_2):
|
||||||
|
logger.success(f"{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平多")
|
||||||
|
self.send_dingtalk_message(
|
||||||
|
message_content=f"真实盘:{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平多")
|
||||||
|
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').scroll.to_see(center=True)
|
||||||
|
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').click()
|
||||||
|
self.start = 0
|
||||||
|
elif self.start == -1:
|
||||||
|
if is_bullish(self.kline_1) and is_bullish(self.kline_2):
|
||||||
|
logger.success(f"{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平空")
|
||||||
|
self.send_dingtalk_message(
|
||||||
|
message_content=f"真实盘:{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平空")
|
||||||
|
|
||||||
|
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').scroll.to_see(center=True)
|
||||||
|
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').click()
|
||||||
|
self.start = 0
|
||||||
|
|
||||||
|
return True
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
return False
|
||||||
|
|
||||||
def action(self):
|
def action(self):
|
||||||
# 获取比特端口
|
# 获取比特端口
|
||||||
@@ -408,32 +414,16 @@ class WeexTransaction:
|
|||||||
if self.get_now_time() != self.kline_3["id"]:
|
if self.get_now_time() != self.kline_3["id"]:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
time.sleep(15)
|
if self.close_position():
|
||||||
if self.get_text(target_text="仓位(1)"):
|
self.send_dingtalk_message(
|
||||||
if self.get_text(target_text="ETH/SUSDT多"):
|
message_content=f"真实盘:{datetime.datetime.now()},平仓信号,平仓成功!!!")
|
||||||
self.start = 1
|
|
||||||
elif self.get_text(target_text="ETH/SUSDT空"):
|
continue
|
||||||
self.start = -1
|
|
||||||
else:
|
else:
|
||||||
self.start = 0
|
|
||||||
|
|
||||||
if self.start == 1:
|
for i in range(3):
|
||||||
if is_bearish(self.kline_1) and is_bearish(self.kline_2):
|
|
||||||
logger.success(f"{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平多")
|
|
||||||
self.send_dingtalk_message(
|
self.send_dingtalk_message(
|
||||||
message_content=f"真实盘:{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平多")
|
message_content=f"真实盘:{datetime.datetime.now()},平仓信息,平仓失败======================================!!!")
|
||||||
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').scroll.to_see(center=True)
|
|
||||||
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').click()
|
|
||||||
self.start = 0
|
|
||||||
elif self.start == -1:
|
|
||||||
if is_bullish(self.kline_1) and is_bullish(self.kline_2):
|
|
||||||
logger.success(f"{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平空")
|
|
||||||
self.send_dingtalk_message(
|
|
||||||
message_content=f"真实盘:{datetime.datetime.now()},第一根信号:{self.kline_1},{self.kline_2},平空")
|
|
||||||
|
|
||||||
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').scroll.to_see(center=True)
|
|
||||||
self.mn_tab.ele('x://*[contains(text(), "闪电平仓")]').click()
|
|
||||||
self.start = 0
|
|
||||||
|
|
||||||
self.direction, signal_key = self.check_signal(prev=self.kline_1, curr=self.kline_2) # 判断信号
|
self.direction, signal_key = self.check_signal(prev=self.kline_1, curr=self.kline_2) # 判断信号
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user