优化错误提示

standard/src/binance_swap.rs

@@ -92,8 +92,8 @@ impl Platform for BinanceSwap {
             let balance_info = res_data_json.iter().find(|item| item["asset"].as_str().unwrap().to_string() == symbol_array[1].to_string());
             match balance_info {
                 None => {
-                    error!("格式化Binance账号信息错误!\nget_account: balance_info={:?}", balance_info);
-                    panic!("格式化Binance账号信息错误!\nget_account: balance_info={:?}", balance_info)
+                    error!("binance_swap：格式化账号信息错误!\nget_account: res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let balance = Decimal::from_str(value["balance"].as_str().unwrap()).unwrap();
@@ -200,8 +200,8 @@ impl Platform for BinanceSwap {
             let market_info = symbols.iter().find(|&item| item["symbol"].as_str().unwrap() == symbol_format);
             match market_info {
                 None => {
-                    error!("Binance：获取Market信息错误!\nget_market:res_data={:?}", res_data_str);
-                    panic!("Binance：获取Market信息错误!\nget_market:res_data={:?}", res_data_str)
+                    error!("binance_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseAsset"].as_str().unwrap_or("").to_string();
@@ -243,8 +243,8 @@ impl Platform for BinanceSwap {
             let market_info = symbols.iter().find(|&item| item["symbol"].as_str().unwrap() == symbol_format);
             match market_info {
                 None => {
-                    error!("Binance：获取Market信息错误!\nget_market:res_data={:?}", res_data_str);
-                    panic!("Binance：获取Market信息错误!\nget_market:res_data={:?}", res_data_str)
+                    error!("binance_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseAsset"].as_str().unwrap_or("").to_string();
@@ -285,8 +285,8 @@ impl Platform for BinanceSwap {
 
             let status = res_data_json["status"].as_str().unwrap();
             let custom_status = if ["CANCELED", "EXPIRED", "FILLED"].contains(&status) { "REMOVE".to_string() } else if status == "NEW" { "NEW".to_string() } else {
-                error!("Binance：格式化订单状态错误！\nget_order_detail:status={:?}", status);
-                panic!("Binance：格式化订单状态错误！\nget_order_detail:status={:?}", status)
+                error!("binance_swap：格式化订单状态错误！\nget_order_detail:res_data={:?}", res_data);
+                panic!("binance_swap：格式化订单状态错误！\nget_order_detail:res_data={:?}", res_data)
             };
             let result = Order {
                 id: res_data_json["orderId"].to_string(),
@@ -315,8 +315,8 @@ impl Platform for BinanceSwap {
             let result = order_info.iter().map(|&item| {
                 let status = item["status"].as_str().unwrap();
                 let custom_status = if ["CANCELED", "EXPIRED", "FILLED"].contains(&status) { "REMOVE".to_string() } else if status == "NEW" { "NEW".to_string() } else {
-                    error!("Binance：格式化订单状态错误！\nget_order_detail:status={:?}", status);
-                    panic!("Binance：格式化订单状态错误！\nget_order_detail:status={:?}", status)
+                    error!("binance_swap：格式化订单状态错误！\nget_order_detail:res_data={:?}", res_data);
+                    panic!("binance_swap：格式化订单状态错误！\nget_order_detail:res_data={:?}", res_data)
                 };
                 Order {
                     id: item["orderId"].to_string(),
@@ -363,8 +363,8 @@ pub fn format_position_item(position: &serde_json::Value, ct_val: Decimal) -> Po
         "LONG" => PositionModeEnum::Long,
         "SHORT" => PositionModeEnum::Short,
         _ => {
-            error!("Binance：格式化持仓模式错误！\nformat_position_item:position_side={:?}", position["positionSide"]);
-            panic!("Binance：格式化持仓模式错误！\nformat_position_item:position_side={:?}", position["positionSide"])
+            error!("binance_swap：格式化持仓模式错误！\nformat_position_item:position={:?}", position);
+            panic!("binance_swap：格式化持仓模式错误！\nformat_position_item:position={:?}", position)
         }
     };
     let size = Decimal::from_str(position["positionAmt"].as_str().unwrap()).unwrap();

standard/src/bitget_spot.rs

@@ -153,8 +153,8 @@ impl Platform for BitgetSpot {
             let market_info = res_data_json.iter().find(|&item| item["symbol"].as_str().unwrap() == symbol_format.clone());
             match market_info {
                 None => {
-                    error!("Bitget：获取Market信息错误!\nget_market:market_info={:?}", market_info);
-                    panic!("Bitget：获取Market信息错误!\nget_market:market_info={:?}", market_info)
+                    error!("bitget_spot：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseCoin"].as_str().unwrap().to_string();
@@ -206,8 +206,8 @@ impl Platform for BitgetSpot {
             let market_info = res_data_json.iter().find(|&item| item["symbol"].as_str().unwrap() == symbol_format.clone());
             match market_info {
                 None => {
-                    error!("Bitget：获取Market信息错误!\nget_market:market_info={:?}", market_info);
-                    panic!("Bitget：获取Market信息错误!\nget_market:market_info={:?}", market_info)
+                    error!("bitget_spot：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseCoin"].as_str().unwrap().to_string();

standard/src/gate_handle.rs

@@ -21,8 +21,8 @@ pub fn format_account_info(data: Vec<serde_json::Value>, symbol: String) -> Acco
     let balance_info = data.iter().find(|&item| item["text"].as_str().unwrap().contains(&symbol));
     match balance_info {
         None => {
-            error!("Gate：格式化账号信息错误!\nformat_account_info: balance_info={:?}", balance_info);
-            panic!("Gate：格式化账号信息错误!\nformat_account_info: balance_info={:?}", balance_info)
+            error!("Gate：格式化账号信息错误!\nformat_account_info: data={:?}", data);
+            panic!("Gate：格式化账号信息错误!\nformat_account_info: data={:?}", data)
         }
         Some(value) => {
             let balance = Decimal::from_str(&value["balance"].as_f64().unwrap().to_string()).unwrap();
@@ -52,8 +52,8 @@ pub fn format_position_item(position: &serde_json::Value, ct_val: Decimal) -> Po
         "dual_long" => PositionModeEnum::Long,
         "dual_short" => PositionModeEnum::Short,
         _ => {
-            error!("Gate：格式化持仓模式错误！\nformat_position_item:position_mode={:?}", position["mode"]);
-            panic!("Gate：格式化持仓模式错误！\nformat_position_item:position_mode={:?}", position["mode"])
+            error!("Gate：格式化持仓模式错误！\nformat_position_item:position={:?}", position);
+            panic!("Gate：格式化持仓模式错误！\nformat_position_item:position={:?}", position)
         }
     };
     let size = Decimal::from_str(&position["size"].as_f64().unwrap().to_string()).unwrap();
@@ -106,8 +106,8 @@ pub fn format_order_item(order: serde_json::Value, ct_val: Decimal) -> Order {
     let amount = size * ct_val;
     let deal_amount = (size - left) * ct_val;
     let custom_status = if status == "finished" { "REMOVE".to_string() } else if status == "open" { "NEW".to_string() } else {
-        error!("Gate：格式化订单状态错误！\nformat_order_item:status={:?}", status);
-        panic!("Gate：格式化订单状态错误！\nformat_order_item:status={:?}", status)
+        error!("Gate：格式化订单状态错误！\nformat_order_item:order={:?}", order);
+        panic!("Gate：格式化订单状态错误！\nformat_order_item:order={:?}", order)
     };
     let rst_order = Order {
         id: order["id"].to_string(),

standard/src/gate_swap.rs

@@ -162,8 +162,8 @@ impl Platform for GateSwap {
             let ticker_info = res_data_json.iter().find(|item| item["contract"].as_str().unwrap() == self.symbol);
             match ticker_info {
                 None => {
-                    error!("Gate：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data_str);
-                    panic!("Gate：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data_str)
+                    error!("gate_swap：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let result = Ticker {
@@ -193,8 +193,8 @@ impl Platform for GateSwap {
             let ticker_info = res_data_json.iter().find(|item| item["contract"].as_str().unwrap() == symbol_upper);
             match ticker_info {
                 None => {
-                    error!("Gate：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data_str);
-                    panic!("Gate：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data_str)
+                    error!("gate_swap：获取Ticker信息错误!\nget_ticker:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let result = Ticker {
@@ -223,8 +223,8 @@ impl Platform for GateSwap {
             let market_info = res_data_json.iter().find(|item| item["name"].as_str().unwrap() == self.symbol);
             match market_info {
                 None => {
-                    error!("Gate：获取Market信息错误!\nget_market:market_info={:?}", market_info);
-                    panic!("Gate：获取Market信息错误!\nget_market:market_info={:?}", market_info)
+                    error!("gate_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let name = value["name"].as_str().unwrap();
@@ -272,8 +272,8 @@ impl Platform for GateSwap {
             let market_info = res_data_json.iter().find(|item| item["name"].as_str().unwrap() == symbol_upper);
             match market_info {
                 None => {
-                    error!("Gate：获取Market信息错误!\nget_market:market_info={:?}", market_info);
-                    panic!("Gate：获取Market信息错误!\nget_market:market_info={:?}", market_info)
+                    error!("gate_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let name = value["name"].as_str().unwrap();
@@ -637,8 +637,8 @@ pub fn format_position_item(position: &serde_json::Value, ct_val: Decimal) -> Po
         "dual_long" => PositionModeEnum::Long,
         "dual_short" => PositionModeEnum::Short,
         _ => {
-            error!("Gate：格式化持仓模式错误！\nformat_position_item:position_mode={:?}", position["mode"]);
-            panic!("Gate：格式化持仓模式错误！\nformat_position_item:position_mode={:?}", position["mode"])
+            error!("gate_swap：格式化持仓模式错误！\nformat_position_item:position={:?}", position);
+            panic!("gate_swap：格式化持仓模式错误！\nformat_position_item:position={:?}", position)
         }
     };
     let size = Decimal::from_str(&position["size"].to_string()).unwrap();
@@ -676,8 +676,8 @@ pub fn format_order_item(order: serde_json::Value, ct_val: Decimal) -> Order {
     let amount = size * ct_val;
     let deal_amount = (size - left) * ct_val;
     let custom_status = if status == "finished" { "REMOVE".to_string() } else if status == "open" { "NEW".to_string() } else {
-        error!("Gate：格式化订单状态错误！\nformat_order_item:status={:?}", status);
-        panic!("Gate：格式化订单状态错误！\nformat_order_item:status={:?}", status)
+        error!("gate_swap：格式化订单状态错误！\nformat_order_item:order={:?}", order);
+        panic!("gate_swap：格式化订单状态错误！\nformat_order_item:order={:?}", order)
     };
     let rst_order = Order {
         id: order["id"].to_string(),

standard/src/kucoin_swap.rs

@@ -210,8 +210,8 @@ impl Platform for KucoinSwap {
             let market_info = res_data_json.iter().find(|item| item["symbol"].as_str().unwrap() == symbol_format);
             match market_info {
                 None => {
-                    error!("Kucoin：获取Market信息错误!\nget_market:res_data={:?}", res_data_str);
-                    panic!("Kucoin：获取Market信息错误!\nget_market:res_data={:?}", res_data_str)
+                    error!("kucoin_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseCurrency"].as_str().unwrap_or("").to_string();
@@ -259,8 +259,8 @@ impl Platform for KucoinSwap {
             let market_info = res_data_json.iter().find(|item| item["symbol"].as_str().unwrap() == symbol_format);
             match market_info {
                 None => {
-                    error!("Kucoin：获取Market信息错误!\nget_market:res_data={:?}", res_data_str);
-                    panic!("Kucoin：获取Market信息错误!\nget_market:res_data={:?}", res_data_str)
+                    error!("kucoin_swap：获取Market信息错误!\nget_market:res_data={:?}", res_data);
+                    Err(Error::new(ErrorKind::Other, res_data.to_string()))
                 }
                 Some(value) => {
                     let base_asset = value["baseCurrency"].as_str().unwrap_or("").to_string();

standard/src/okx_handle.rs

@@ -142,7 +142,7 @@ pub fn handle_position(res_data: ResponseData, ct_val: Decimal) -> Vec<Position>
     let res_data_str = res_data.data;
     let data_list: SwapPositionSubscribe = serde_json::from_str(&res_data_str).unwrap();
     let position_data = data_list.data;
-    position_data.iter().map(|item| format_position_item(item.clone(), ct_val)).collect()
+    position_data.iter().map(|item| format_position_item(item, ct_val)).collect()
 }
 
 pub fn format_position_item(value: &SwapPosition, ct_val: Decimal) -> Position {

standard/src/okx_swap.rs

@@ -417,7 +417,7 @@ impl Platform for OkxSwap {
         if res_data.code == "200" {
             let res_data_str = &res_data.data;
             let data_list: Vec<SwapPosition> = serde_json::from_str(&res_data_str).unwrap();
-            let result = data_list.iter().map(|item| okx_handle::format_position_item(item.clone(), Decimal::ONE)).collect();
+            let result = data_list.iter().map(|item| okx_handle::format_position_item(item, Decimal::ONE)).collect();
             Ok(result)
         } else {
             Err(Error::new(ErrorKind::Other, res_data.to_string()))