Merge remote-tracking branch 'origin/dev' into dev

exchanges/src/bitget_spot_rest.rs

@@ -11,7 +11,7 @@ use ring::hmac;
 use serde_json::Value;
 
 #[derive(Clone, Debug)]
-pub struct BitgetSwapRest {
+pub struct BitgetSpotRest {
     pub label: String,
     base_url: String,
     client: reqwest::Client,
@@ -25,16 +25,16 @@ pub struct BitgetSwapRest {
 
 }
 
-impl BitgetSwapRest {
+impl BitgetSpotRest {
     /*******************************************************************************************************/
     /*****************************************获取一个对象****************************************************/
     /*******************************************************************************************************/
 
-    pub fn new(is_colo: bool, login_param: BTreeMap<String, String>) -> BitgetSwapRest
+    pub fn new(is_colo: bool, login_param: BTreeMap<String, String>) -> BitgetSpotRest
     {
-        return BitgetSwapRest::new_lable("default-BitgetSwapRest".to_string(), is_colo, login_param);
+        return BitgetSpotRest::new_lable("default-BitgetSpotRest".to_string(), is_colo, login_param);
     }
-    pub fn new_lable(label: String, is_colo: bool, login_param: BTreeMap<String, String>) -> BitgetSwapRest {
+    pub fn new_lable(label: String, is_colo: bool, login_param: BTreeMap<String, String>) -> BitgetSpotRest {
         let base_url = if is_colo {
             "https://api.bitget.com".to_string()
         } else {
@@ -47,7 +47,7 @@ impl BitgetSwapRest {
             info!("走普通通道：{}",base_url);
         }
         /*****返回结构体*******/
-        BitgetSwapRest {
+        BitgetSpotRest {
             label,
             base_url,
             client: Client::new(),
@@ -488,7 +488,7 @@ impl BitgetSwapRest {
                                         end_time: String,
                                         limit: String,
     ) -> ResponseData {
-        let  params = serde_json::json!({
+        let params = serde_json::json!({
             "symbol":symbol,
             "startTime":start_time,
             "endTime":end_time,
@@ -504,7 +504,7 @@ impl BitgetSwapRest {
     }
     //批量撤销计划委托
     pub async fn cancel_plan_orders(&mut self, symbol_list: Vec<String>) -> ResponseData {
-        let  params = serde_json::json!({
+        let params = serde_json::json!({
             "symbolList":symbol_list
          });
         let data = self.request("POST".to_string(),

exchanges/src/bitget_spot_ws.rs

@@ -38,7 +38,7 @@ pub enum BitgetSubscribeType {
 }
 
 #[derive(Clone)]
-pub struct BitgetSwapWs {
+pub struct BitgetSpotWs {
     pub label: String,
     request_url: String,
     //实际ws 链接地址
@@ -53,7 +53,7 @@ pub struct BitgetSwapWs {
     sender: Sender<ResponseData>,     //数据通道
 }
 
-impl BitgetSwapWs {
+impl BitgetSpotWs {
     /*******************************************************************************************************/
     /*****************************************获取一个对象****************************************************/
     /*******************************************************************************************************/
@@ -61,15 +61,15 @@ impl BitgetSwapWs {
                login_param: BTreeMap<String, String>,
                ws_type: BitgetWsType,
                sender: Sender<ResponseData>,
-    ) -> BitgetSwapWs
+    ) -> BitgetSpotWs
     {
-        return BitgetSwapWs::new_label("default-BitgetSwapWs".to_string(), is_colo, login_param, ws_type, sender);
+        return BitgetSpotWs::new_label("default-BitgetSpotWs".to_string(), is_colo, login_param, ws_type, sender);
     }
     pub fn new_label(label: String, is_colo: bool,
                      login_param: BTreeMap<String, String>,
                      ws_type: BitgetWsType,
                      sender: Sender<ResponseData>,
-    ) -> BitgetSwapWs
+    ) -> BitgetSpotWs
     {
         /*******走代理：根据环境变量配置来决定,如果配置了走代理，没有配置不走*******/
         let parsing_detail = proxy::ParsingDetail::parsing_environment_variables();
@@ -90,7 +90,7 @@ impl BitgetSwapWs {
             info!("走普通通道：{}",request_url);
         }
         /*****返回结构体*******/
-        BitgetSwapWs {
+        BitgetSpotWs {
             label,
             request_url,
             proxy: parsing_detail,