store

src/socket/event.rs

@@ -5,11 +5,12 @@ use crate::{
 
 use super::model::TokenInfo;
 
-#[derive(Debug, Clone)]
-pub struct Header(pub Option<String>, pub i64, pub i32, pub Qos);
+#[derive(Debug)]
+pub struct Header(pub i64, pub i32, pub Qos);
 
 pub trait BusinessEvent {
     fn message(
+        key: Option<impl AsRef<str>>,
         header: Header,
         status: Status,
         extra: Option<impl AsRef<str>>,
@@ -18,11 +19,12 @@ pub trait BusinessEvent {
 
 impl BusinessEvent for SocketEvent {
     fn message(
+        key: Option<impl AsRef<str>>,
         header: Header,
         status: Status,
         extra: Option<impl AsRef<str>>,
     ) -> SocketEvent {
-        let Header(key, msg_id, msg_ty, qos) = header;
+        let Header(msg_id, msg_ty, qos) = header;
         SocketEvent {
             seller_id: None,
             store_id: None,
@@ -32,7 +34,7 @@ impl BusinessEvent for SocketEvent {
             version_desc: None,
             event: "业务推送事件".to_string(),
             event_ty: EventType::BusinessEvent as i32,
-            key,
+            key: key.map(|v|v.as_ref().to_string()),
             qos: Some(qos as i32),
             msg_id: Some(msg_id),
             msg_ty: Some(msg_ty),
@@ -68,7 +70,7 @@ impl PublishEvent for SocketEvent {
         desc: impl AsRef<str>,
         extra: Option<impl AsRef<str>>,
     ) -> Vec<SocketEvent> {
-        let Header(key, msg_id, msg_ty, qos) = header;
+        let Header(msg_id, msg_ty, qos) = header;
         let qos = qos as i32;
 
         let extra = extra.map(|s| s.as_ref().to_string());
@@ -76,7 +78,6 @@ impl PublishEvent for SocketEvent {
 
         let mut vec = Vec::new();
         for info in infos {
-            let key = key.clone();
             let extra = extra.clone();
             let event = SocketEvent {
                 seller_id: Some(info.seller_id),
@@ -87,7 +88,7 @@ impl PublishEvent for SocketEvent {
                 version_desc: info.version_desc.clone(),
                 event: "推送事件".to_string(),
                 event_ty: EventType::PublishEvent as i32,
-                key: key,
+                key: None,
                 qos: Some(qos),
                 msg_id: Some(msg_id),
                 msg_ty: Some(msg_ty),