Merge branch 'dev' of http://git.skyfffire.com/skyfffire/as-rust into dev

standard/src/bitget_spot_handle.rs

@@ -13,7 +13,7 @@ pub fn handle_account_info(res_data: ResponseData, symbol: String) -> Account {
     let symbol_array: Vec<&str> = symbol.split("_").collect();
     let res_data_str = res_data.data;
     let res_data_json: Vec<serde_json::Value> = serde_json::from_str(&res_data_str).unwrap();
-    let account_info = res_data_json.iter().find(|&item| item["coin"].as_str().unwrap() == symbol_array[1]).unwrap();
+    let account_info = res_data_json.iter().find(|&item| item["coin"].as_str().unwrap() == symbol_array[0]).unwrap();
     format_account_info(account_info.clone())
 }
 

standard/src/handle_info.rs

@@ -26,7 +26,10 @@ impl HandleSwapInfo {
             ExchangeEnum::KucoinSwap => {
                 kucoin_handle::handle_account_info(res_data, symbol)
             }
-            ExchangeEnum::BitgetSpot =>{
+            ExchangeEnum::OkxSwap => {
+                okx_handle::handle_account_info(res_data, symbol)
+            }
+            ExchangeEnum::BitgetSpot => {
                 bitget_spot_handle::handle_account_info(res_data, symbol)
             }
             _ => {
@@ -38,9 +41,6 @@ impl HandleSwapInfo {
     // 处理特殊Ticket信息
     pub fn handle_special_ticker(exchange: ExchangeEnum, res_data: ResponseData) -> SpecialDepth {
         match exchange {
-            ExchangeEnum::BinanceSpot => {
-                binance_handle::handle_special_ticker(res_data)
-            }
             ExchangeEnum::BinanceSwap => {
                 binance_handle::handle_special_ticker(res_data)
             }
@@ -51,7 +51,10 @@ impl HandleSwapInfo {
             ExchangeEnum::KucoinSwap => {
                 kucoin_handle::handle_special_ticker(res_data)
             }
-            ExchangeEnum::BitgetSpot =>{
+            ExchangeEnum::OkxSwap => {
+                okx_handle::handle_special_ticker(res_data)
+            }
+            ExchangeEnum::BitgetSpot => {
                 bitget_spot_handle::handle_special_ticker(res_data)
             }
             _ => {
@@ -73,7 +76,10 @@ impl HandleSwapInfo {
             ExchangeEnum::KucoinSwap => {
                 kucoin_handle::handle_position(res_data, ct_val)
             }
-            ExchangeEnum::BitgetSpot =>{
+            ExchangeEnum::OkxSwap => {
+                okx_handle::handle_position(res_data, ct_val)
+            }
+            ExchangeEnum::BitgetSpot => {
                 error!("暂未提供此交易所方法！handle_position：{:?}", exchange);
                 panic!("暂未提供此交易所方法！handle_position：{:?}", exchange);
             }
@@ -96,7 +102,10 @@ impl HandleSwapInfo {
             ExchangeEnum::KucoinSwap => {
                 kucoin_handle::handle_order(res_data, ct_val)
             }
-            ExchangeEnum::BitgetSpot =>{
+            ExchangeEnum::OkxSwap => {
+                okx_handle::handle_order(res_data, ct_val)
+            }
+            ExchangeEnum::BitgetSpot => {
                 bitget_spot_handle::handle_order(res_data, ct_val)
             }
             _ => {
@@ -112,10 +121,6 @@ impl HandleSwapInfo {
         let mut depth_asks: Vec<MarketOrder>;
         let mut depth_bids: Vec<MarketOrder>;
         match exchange {
-            ExchangeEnum::BinanceSpot => {
-                depth_asks = binance_handle::format_depth_items(res_data_json["asks"].clone());
-                depth_bids = binance_handle::format_depth_items(res_data_json["bids"].clone());
-            }
             ExchangeEnum::BinanceSwap => {
                 depth_asks = binance_handle::format_depth_items(res_data_json["a"].clone());
                 depth_bids = binance_handle::format_depth_items(res_data_json["b"].clone());