store

src/socket/event.rs

@@ -34,7 +34,7 @@ impl BusinessEvent for SocketEvent {
             version_desc: None,
             event: "业务推送事件".to_string(),
             event_ty: EventType::BusinessEvent as i32,
-            key: key.map(|v|v.as_ref().to_string()),
+            key: key.map(|v| v.as_ref().to_string()),
             qos: Some(qos as i32),
             msg_id: Some(msg_id),
             msg_ty: Some(msg_ty),
@@ -47,12 +47,12 @@ impl BusinessEvent for SocketEvent {
 
 pub trait PublishEvent {
     fn push(
-        infos: &[TokenInfo],
+        info: &TokenInfo,
         header: Header,
         status: Status,
         desc: impl AsRef<str>,
         extra: Option<impl AsRef<str>>,
-    ) -> Vec<SocketEvent>;
+    ) -> SocketEvent;
 
     fn ack(
         info: &TokenInfo,
@@ -64,42 +64,30 @@ pub trait PublishEvent {
 
 impl PublishEvent for SocketEvent {
     fn push(
-        infos: &[TokenInfo],
+        info: &TokenInfo,
         header: Header,
         status: Status,
         desc: impl AsRef<str>,
         extra: Option<impl AsRef<str>>,
-    ) -> Vec<SocketEvent> {
+    ) -> SocketEvent {
         let Header(msg_id, msg_ty, qos) = header;
-        let qos = qos as i32;
-
-        let extra = extra.map(|s| s.as_ref().to_string());
-        let status = status as i32;
-
-        let mut vec = Vec::new();
-        for info in infos {
-            let extra = extra.clone();
-            let event = SocketEvent {
-                seller_id: Some(info.seller_id),
-                store_id: Some(info.seller_id),
-                device_id: Some(info.device_id.clone()),
-                client_type: Some(info.client_type),
-                version: Some(info.version),
-                version_desc: info.version_desc.clone(),
-                event: "推送事件".to_string(),
-                event_ty: EventType::PublishEvent as i32,
-                key: None,
-                qos: Some(qos),
-                msg_id: Some(msg_id),
-                msg_ty: Some(msg_ty),
-                status,
-                desc: desc.as_ref().to_string(),
-                extra,
-            };
-            vec.push(event);
+        SocketEvent {
+            seller_id: Some(info.seller_id),
+            store_id: Some(info.seller_id),
+            device_id: Some(info.device_id.clone()),
+            client_type: Some(info.client_type),
+            version: Some(info.version),
+            version_desc: info.version_desc.clone(),
+            event: "推送事件".to_string(),
+            event_ty: EventType::PublishEvent as i32,
+            key: None,
+            qos: Some(qos as i32),
+            msg_id: Some(msg_id),
+            msg_ty: Some(msg_ty),
+            status: status as i32,
+            desc: desc.as_ref().to_string(),
+            extra: extra.map(|s| s.as_ref().to_string()),
         }
-
-        vec
     }
 
     fn ack(