store

src/socket/event.rs

@@ -11,7 +11,7 @@ pub trait BusinessEvent {
         qos: Qos,
         msg_id: i64,
         msg_ty: i32,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent;
 }
 
@@ -21,8 +21,9 @@ impl BusinessEvent for SocketEvent {
         qos: Qos,
         msg_id: i64,
         msg_ty: i32,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent {
+
         SocketEvent {
             seller_id: None,
             store_id: None,
@@ -37,7 +38,7 @@ impl BusinessEvent for SocketEvent {
             msg_ty: Some(msg_ty),
             status: 1,
             desc: qos.desc(),
-            extra,
+            extra: extra.map(|s| s.as_ref().to_string()),
         }
     }
 }
@@ -50,14 +51,14 @@ pub trait PublishEvent {
         msg_ty: i32,
         status: i32,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> Vec<SocketEvent>;
 
     fn ack(
         info: &TokenInfo,
         msg_id: i64,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent;
 }
 
@@ -69,8 +70,9 @@ impl PublishEvent for SocketEvent {
         msg_ty: i32,
         status: i32,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> Vec<SocketEvent> {
+        let extra = extra.map(|s| s.as_ref().to_string());
         let mut vec = Vec::new();
         for info in infos {
             let key = key.clone();
@@ -101,7 +103,7 @@ impl PublishEvent for SocketEvent {
         info: &TokenInfo,
         msg_id: i64,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent {
         SocketEvent {
             seller_id: Some(info.seller_id),
@@ -117,7 +119,7 @@ impl PublishEvent for SocketEvent {
             msg_ty: None,
             status: 1,
             desc: desc.as_ref().to_string(),
-            extra,
+            extra: extra.map(|s| s.as_ref().to_string()),
         }
     }
 }
@@ -127,7 +129,7 @@ pub trait ConnectEvent {
         token_info: &TokenInfo,
         status: i32,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent;
 }
 
@@ -136,7 +138,7 @@ impl ConnectEvent for SocketEvent {
         info: &TokenInfo,
         status: i32,
         desc: impl AsRef<str>,
-        extra: Option<String>,
+        extra: Option<impl AsRef<str>>,
     ) -> SocketEvent {
         SocketEvent {
             seller_id: Some(info.seller_id),
@@ -152,7 +154,7 @@ impl ConnectEvent for SocketEvent {
             msg_ty: None,
             status,
             desc: desc.as_ref().to_string(),
-            extra,
+            extra: extra.map(|s| s.as_ref().to_string()),
         }
     }
 }