处理了一些警告，只剩下一些简单的字段封装了。

standard/src/bitget_usdt_swap.rs

@@ -9,8 +9,7 @@ use rust_decimal::prelude::ToPrimitive;
 use rust_decimal_macros::dec;
 use serde_json::{json, Value};
 use tokio::time::Instant;
-use tracing::{error, info, trace};
-use tracing_subscriber::fmt::format;
+use tracing::{error, info};
 use global::trace_stack::TraceStack;
 use crate::exchange::ExchangeEnum;
 use crate::{Account, Market, Order, OrderCommand, Platform, Position, PositionModeEnum, Ticker, utils};
@@ -383,6 +382,7 @@ impl Platform for BitgetSwap {
             "symbol": symbol_format,
             "productType": "USDT-FUTURES",
             "clientOid": custom_id,
+            "orderId": order_id
         });
         let response = self.request.cancel_order(params).await;
 
@@ -620,22 +620,22 @@ impl Platform for BitgetSwap {
     }
 }
 
-pub fn format_account_info(balance_data: Value) -> Account {
-    let balance_coin = balance_data["coin"].as_str().unwrap().to_string().to_uppercase();
-    let available_balance = Decimal::from_str(balance_data["available"].as_str().unwrap()).unwrap();
-    let frozen_balance = Decimal::from_str(balance_data["frozen"].as_str().unwrap()).unwrap();
-    let balance = available_balance + frozen_balance;
-
-    Account {
-        coin: balance_coin,
-        balance,
-        available_balance,
-        frozen_balance,
-        stocks: Decimal::ZERO,
-        available_stocks: Decimal::ZERO,
-        frozen_stocks: Decimal::ZERO,
-    }
-}
+// pub fn format_account_info(balance_data: Value) -> Account {
+//     let balance_coin = balance_data["coin"].as_str().unwrap().to_string().to_uppercase();
+//     let available_balance = Decimal::from_str(balance_data["available"].as_str().unwrap()).unwrap();
+//     let frozen_balance = Decimal::from_str(balance_data["frozen"].as_str().unwrap()).unwrap();
+//     let balance = available_balance + frozen_balance;
+//
+//     Account {
+//         coin: balance_coin,
+//         balance,
+//         available_balance,
+//         frozen_balance,
+//         stocks: Decimal::ZERO,
+//         available_stocks: Decimal::ZERO,
+//         frozen_stocks: Decimal::ZERO,
+//     }
+// }
 
 pub fn format_order_item(order: Value, ct_val: Decimal) -> Order {
     let price = Decimal::from_str(order["price"].as_str().unwrap_or(order["priceAvg"].as_str().unwrap())).unwrap();

standard/src/gate_swap.rs

@@ -10,7 +10,7 @@ use rust_decimal::prelude::{FromPrimitive, ToPrimitive};
 use serde_json::{json, Value};
 use tokio::spawn;
 use tokio::time::Instant;
-use tracing::{error, info, trace};
+use tracing::{error, info};
 use crate::{Platform, ExchangeEnum, Account, Position, Ticker, Market, Order, OrderCommand, PositionModeEnum};
 use exchanges::gate_swap_rest::GateSwapRest;
 use global::trace_stack::TraceStack;

strategy/src/bitget_usdt_swap.rs

@@ -63,12 +63,12 @@ pub async fn bitget_usdt_swap_run(is_shutdown_arc :Arc<AtomicBool>,
         // 构建链接ws
         let mut bg_private = BitgetSwapWs::new_label(name.clone(),
                                                      is_colo,
-                                                     None,
+                                                     Some(parse_btree_map_to_bitget_swap_login(exchange_params)),
                                                      BitgetSwapWsType::Private);
 
         // 消费数据的函数
         let core_arc_clone = core_arc.clone();
-        let mut ct_val = Decimal::ZERO;
+        let ct_val = core_arc_clone.lock().await.platform_rest.get_self_market().ct_val;
         let fun = move |data: ResponseData| {
             let core_arc_cc = core_arc_clone.clone();
 
@@ -88,19 +88,19 @@ pub async fn bitget_usdt_swap_run(is_shutdown_arc :Arc<AtomicBool>,
     });
 }
 
-async fn on_private_data(core_arc_clone: Arc<Mutex<Core>>,
-                         ct_val: Decimal,
+async fn on_private_data(_core_arc_clone: Arc<Mutex<Core>>,
+                         _ct_val: Decimal,
                          response: ResponseData) {
     info!(?response)
 }
 
-async fn on_public_data(core_arc_clone: Arc<Mutex<Core>>,
-                        update_flag_u: &mut Decimal,
+async fn on_public_data(_core_arc_clone: Arc<Mutex<Core>>,
+                        _update_flag_u: &mut Decimal,
                         response: ResponseData) {
     info!(?response)
 }
 
-fn parse_btree_map_to_bitget_spot_login(exchange_params: BTreeMap<String, String>) -> BitgetSwapLogin {
+fn parse_btree_map_to_bitget_swap_login(exchange_params: BTreeMap<String, String>) -> BitgetSwapLogin {
     BitgetSwapLogin {
         api_key: exchange_params.get("access_key").unwrap().clone(),
         secret_key: exchange_params.get("secret_key").unwrap().clone(),