|
|
@@ -106,9 +106,9 @@ mod tests {
|
|
|
"556DAB6773CA26DDAAA114F7044138CA".to_string(),
|
|
|
);
|
|
|
let req3: ResponseData = binance_exc.binance_depth("BTCUSDT", "20").await;
|
|
|
- println!("---响应：code:{}", req3.code);
|
|
|
- println!("---响应：mes:{}", req3.message);
|
|
|
- println!("---响应：data:{}", req3.data);
|
|
|
+ //println!("---响应：code:{}", req3.code);
|
|
|
+ //println!("---响应：mes:{}", req3.message);
|
|
|
+ //println!("---响应：data:{}", req3.data);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -163,16 +163,16 @@ impl BinanceExc {
|
|
|
let url = format!("{}{}", base_url, request_path);
|
|
|
let response = reqwest::get(url)
|
|
|
.await?; // 发起请求并等待结果
|
|
|
- println!("-------");
|
|
|
+ //println!("-------");
|
|
|
// 检查响应是否成功
|
|
|
if response.status().is_success() {
|
|
|
// 读取响应的内容
|
|
|
let body = response.text().await?;
|
|
|
- println!("Response body:\n{}", body);
|
|
|
+ //println!("Response body:\n{}", body);
|
|
|
req_data = ResponseData::new("0".to_string(), "success".to_string(), body);
|
|
|
} else {
|
|
|
let body = response.text().await?;
|
|
|
- println!("Request failed with status: {}", body);
|
|
|
+ //println!("Request failed with status: {}", body);
|
|
|
req_data = ResponseData::error(body.to_string())
|
|
|
}
|
|
|
Ok((req_data))
|
|
|
@@ -277,7 +277,7 @@ impl OkxExc {
|
|
|
|
|
|
// 时间戳 + 请求类型+ 请求参数字符串
|
|
|
let message = format!("{}GET{}", timestamp, get_url_params);
|
|
|
- // println!("---message:{:?}", message);
|
|
|
+ // //println!("---message:{:?}", message);
|
|
|
let sign = self.okx_sign(secret_key, message);
|
|
|
|
|
|
//添加请求头
|
|
|
@@ -286,21 +286,21 @@ impl OkxExc {
|
|
|
let client = reqwest::Client::new();
|
|
|
let req = client.get(base_url + &get_url_params)
|
|
|
.headers(headers);
|
|
|
- println!("--请求头：{:?}", req);
|
|
|
+ //println!("--请求头：{:?}", req);
|
|
|
|
|
|
//拿到返回
|
|
|
let response = req.send()
|
|
|
.await?;
|
|
|
// 检查响应是否成功
|
|
|
- println!("---状态：{:?},{}", response.status(), response.status().is_success());
|
|
|
+ //println!("---状态：{:?},{}", response.status(), response.status().is_success());
|
|
|
if response.status().is_success() {
|
|
|
// 读取响应的内容
|
|
|
let body = response.text().await?;
|
|
|
- println!("okx_acc-Response body:\n{}", body);
|
|
|
+ //println!("okx_acc-Response body:\n{}", body);
|
|
|
req_data = ResponseData::new("0".to_string(), "success".to_string(), body);
|
|
|
} else {
|
|
|
let body = response.text().await?;
|
|
|
- println!("okx_acc-Request failed with status: {}", body);
|
|
|
+ //println!("okx_acc-Request failed with status: {}", body);
|
|
|
req_data = ResponseData::error(body.to_string())
|
|
|
}
|
|
|
Ok((req_data))
|
|
|
@@ -313,16 +313,16 @@ impl OkxExc {
|
|
|
let url = format!("{}{}", base_url, request_path);
|
|
|
let response = reqwest::get(url)
|
|
|
.await?; // 发起请求并等待结果
|
|
|
- println!("-------");
|
|
|
+ //println!("-------");
|
|
|
// 检查响应是否成功
|
|
|
if response.status().is_success() {
|
|
|
// 读取响应的内容
|
|
|
let body = response.text().await?;
|
|
|
- println!("Response body:\n{}", body);
|
|
|
+ //println!("Response body:\n{}", body);
|
|
|
req_data = ResponseData::new("0".to_string(), "success".to_string(), body);
|
|
|
} else {
|
|
|
let body = response.text().await?;
|
|
|
- println!("Request failed with status: {}", body);
|
|
|
+ //println!("Request failed with status: {}", body);
|
|
|
req_data = ResponseData::error(body.to_string())
|
|
|
}
|
|
|
Ok((req_data))
|
|
|
@@ -347,13 +347,13 @@ impl OkxExc {
|
|
|
|
|
|
// let params_json = serde_json::to_value(params_str.clone()).unwrap();
|
|
|
|
|
|
- println!("---params:{:?}", params);
|
|
|
- println!("---params-json_str:{ }", params_str.clone());
|
|
|
- // println!("---params-json:{:?}", params_json);
|
|
|
+ //println!("---params:{:?}", params);
|
|
|
+ //println!("---params-json_str:{ }", params_str.clone());
|
|
|
+ // //println!("---params-json:{:?}", params_json);
|
|
|
|
|
|
// 时间戳 + 请求类型+ 请求参数字符串
|
|
|
let message = format!("{}POST{}{}", timestamp, request_path, ¶ms_str);
|
|
|
- println!("---message:{:?}", message);
|
|
|
+ //println!("---message:{:?}", message);
|
|
|
let sign = self.okx_sign(secret_key, message);
|
|
|
|
|
|
//添加请求头
|
|
|
@@ -370,15 +370,15 @@ impl OkxExc {
|
|
|
let response = req.send()
|
|
|
.await?;
|
|
|
// 检查响应是否成功
|
|
|
- println!("---状态：{:?},{}", response.status(), response.status().is_success());
|
|
|
+ //println!("---状态：{:?},{}", response.status(), response.status().is_success());
|
|
|
if response.status().is_success() {
|
|
|
// 读取响应的内容
|
|
|
let body = response.text().await?;
|
|
|
- println!("okx_order-Response body:\n{}", body);
|
|
|
+ //println!("okx_order-Response body:\n{}", body);
|
|
|
req_data = ResponseData::new("0".to_string(), "success".to_string(), body);
|
|
|
} else {
|
|
|
let body = response.text().await?;
|
|
|
- println!("okx_order-Request failed with status: {}", body);
|
|
|
+ //println!("okx_order-Request failed with status: {}", body);
|
|
|
req_data = ResponseData::error(body.to_string())
|
|
|
}
|
|
|
Ok((req_data))
|
|
|
@@ -438,9 +438,9 @@ impl OkxExc {
|
|
|
let data = serde_json::to_string(&json_value["data"]).unwrap();
|
|
|
let msg = json_value["msg"].as_str().unwrap();
|
|
|
|
|
|
- // println!("--解析成功----code:{}",code);
|
|
|
- // println!("--解析成功----data:{}",data);
|
|
|
- // println!("--解析成功----msg:{}",msg);
|
|
|
+ // //println!("--解析成功----code:{}",code);
|
|
|
+ // //println!("--解析成功----data:{}",data);
|
|
|
+ // //println!("--解析成功----msg:{}",msg);
|
|
|
let success = ResponseData::new(code.parse().unwrap(),
|
|
|
msg.parse().unwrap(),
|
|
|
data.parse().unwrap());
|
|
|
@@ -514,7 +514,7 @@ impl SocketTool {
|
|
|
|
|
|
/*****判断代理IP是否为空,空则不走代理*****/
|
|
|
if self.ip.len() > 0 {
|
|
|
- println!("----socket-走代理");
|
|
|
+ //println!("----socket-走代理");
|
|
|
let ip_array: Vec<&str> = self.ip.split(".").collect();
|
|
|
let proxy_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(
|
|
|
ip_array[0].parse().unwrap(),
|
|
|
@@ -535,18 +535,18 @@ impl SocketTool {
|
|
|
|
|
|
/******登陆认证********/
|
|
|
if self.is_login {
|
|
|
- println!("----需要登陆");
|
|
|
+ //println!("----需要登陆");
|
|
|
let login_json_str = SocketTool::log_in_to_str(login_param);
|
|
|
- // println!("---组装 登陆信息:{0}", login_json_str);
|
|
|
+ // //println!("---组装 登陆信息:{0}", login_json_str);
|
|
|
socket.write_message(Message::Text(login_json_str)).unwrap();
|
|
|
thread::sleep(Duration::from_secs(1));
|
|
|
} else {
|
|
|
- println!("----no longin(不需要登陆)");
|
|
|
+ //println!("----no longin(不需要登陆)");
|
|
|
}
|
|
|
|
|
|
/******订阅信息********/
|
|
|
let sub_json = self.subscription.clone();
|
|
|
- println!("--订阅内容：{:?}", sub_json);
|
|
|
+ //println!("--订阅内容：{:?}", sub_json);
|
|
|
let sub_json_str = sub_json.to_string();
|
|
|
// writeln!(stdout, "subscribe info: {:?}", sub_json_str).unwrap();
|
|
|
socket.write_message(Message::Text(sub_json_str))
|
|
|
@@ -557,7 +557,7 @@ impl SocketTool {
|
|
|
let mut okx_ping_off = false;
|
|
|
loop {
|
|
|
// if !socket.can_read() {
|
|
|
- // println!("不能读取的socket");
|
|
|
+ // //println!("不能读取的socket");
|
|
|
// continue;
|
|
|
// }
|
|
|
|
|
|
@@ -617,25 +617,25 @@ impl SocketTool {
|
|
|
socket.close(None).unwrap();
|
|
|
} else {
|
|
|
// 提示,并未找到好的优化方式,
|
|
|
- println!("----socket-没代理");
|
|
|
+ //println!("----socket-没代理");
|
|
|
let (mut socket, response) =
|
|
|
connect(request_url.clone())
|
|
|
.expect("Can't connect(无法连接)");
|
|
|
|
|
|
/******登陆认证********/
|
|
|
if self.is_login {
|
|
|
- println!("----需要登陆");
|
|
|
+ //println!("----需要登陆");
|
|
|
let login_json_str = SocketTool::log_in_to_str(login_param);
|
|
|
- // println!("---组装 登陆信息:{0}", login_json_str);
|
|
|
+ // //println!("---组装 登陆信息:{0}", login_json_str);
|
|
|
socket.write_message(Message::Text(login_json_str)).unwrap();
|
|
|
thread::sleep(Duration::from_secs(1));
|
|
|
} else {
|
|
|
- println!("----no longin(不需要登陆)");
|
|
|
+ //println!("----no longin(不需要登陆)");
|
|
|
}
|
|
|
|
|
|
/******订阅信息********/
|
|
|
let sub_json = self.subscription.clone();
|
|
|
- println!("--订阅内容：{:?}", sub_json);
|
|
|
+ //println!("--订阅内容：{:?}", sub_json);
|
|
|
let sub_json_str = sub_json.to_string();
|
|
|
writeln!(stdout, "subscribe info: {:?}", sub_json_str).unwrap();
|
|
|
socket.write_message(Message::Text(sub_json_str))
|
|
|
@@ -736,14 +736,14 @@ impl SocketTool {
|
|
|
let lable = login_param.get("lable");
|
|
|
if let Some(ref_string) = lable {
|
|
|
if *ref_string == "binance" {
|
|
|
- println!("----币安 暂不做登陆");
|
|
|
+ //println!("----币安 暂不做登陆");
|
|
|
} else if *ref_string == "okx" {
|
|
|
let mut access_key: String = "".to_string();
|
|
|
let mut secret_key: String = "".to_string();
|
|
|
let mut passphrase: String = "".to_string();
|
|
|
|
|
|
for (key, value) in &login_param {
|
|
|
- // println!("Key: {}, Value: {}", key, value);
|
|
|
+ // //println!("Key: {}, Value: {}", key, value);
|
|
|
if key == "access_key" {
|
|
|
access_key = value.parse().unwrap();
|
|
|
} else if key == "secret_key" {
|
|
|
@@ -756,7 +756,7 @@ impl SocketTool {
|
|
|
|
|
|
// 时间戳 + 请求类型+ 请求参数字符串
|
|
|
let message = format!("{}GET{}", timestamp, "/users/self/verify");
|
|
|
- // println!("---message:{:?}", message);
|
|
|
+ // //println!("---message:{:?}", message);
|
|
|
let hmac_key = ring::hmac::Key::new(hmac::HMAC_SHA256, secret_key.as_bytes());
|
|
|
let result = ring::hmac::sign(&hmac_key, &message.as_bytes());
|
|
|
let mut sign = base64::encode(result);
|
|
|
@@ -770,12 +770,12 @@ impl SocketTool {
|
|
|
"sign": sign }]
|
|
|
});
|
|
|
|
|
|
- // println!("---login_json：{0}", login_json.to_string());
|
|
|
- // println!("--登陆：{:?}", login_json);
|
|
|
+ // //println!("---login_json：{0}", login_json.to_string());
|
|
|
+ // //println!("--登陆：{:?}", login_json);
|
|
|
login_json_str = login_json.to_string();
|
|
|
}
|
|
|
} else {
|
|
|
- println!("Option is None(lable 为None)");
|
|
|
+ //println!("Option is None(lable 为None)");
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -938,10 +938,10 @@ pub fn http_enable_proxy() -> bool {
|
|
|
let http_proxy = format!("http://{}:{}", parsing_detail.ip_address, parsing_detail.port);
|
|
|
env::set_var("http_proxy", http_proxy.clone());
|
|
|
env::set_var("https_proxy", http_proxy.clone());
|
|
|
- println!("代理设置成功{0}", http_proxy.to_string());
|
|
|
+ //println!("代理设置成功{0}", http_proxy.to_string());
|
|
|
true
|
|
|
} else {
|
|
|
- println!("无法开启代理：环境变量获取失败：{:?}", parsing_detail);
|
|
|
+ //println!("无法开启代理：环境变量获取失败：{:?}", parsing_detail);
|
|
|
false
|
|
|
}
|
|
|
}
|
|
|
@@ -965,7 +965,7 @@ pub fn parsing_environment_variables() -> ParsingDetail {
|
|
|
// 使用std::env::var函数获取环境变量的值，如果返回Err，则说明环境变量不存在
|
|
|
match proxy_address {
|
|
|
Ok(value) => {
|
|
|
- println!("环境变量读取成功：key：proxy_address , val：{}", value);
|
|
|
+ //println!("环境变量读取成功：key：proxy_address , val：{}", value);
|
|
|
env::set_var("http_proxy", value.to_string());
|
|
|
env::set_var("https_proxy", value.to_string());
|
|
|
|
|
|
@@ -974,7 +974,7 @@ pub fn parsing_environment_variables() -> ParsingDetail {
|
|
|
parsing_detail
|
|
|
}
|
|
|
Err(_) => {
|
|
|
- println!("环境变量读取失败:'proxy_address'");
|
|
|
+ //println!("环境变量读取失败:'proxy_address'");
|
|
|
let parsing_detail = ParsingDetail::new("".to_string(), "".to_string());
|
|
|
parsing_detail
|
|
|
}
|
875428575@qq.com