Skip to content

M
model-entity
Commit b17996b1 authored by xuwencheng's avatar xuwencheng
Browse files
Options

upgrade

parent 7362d411
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 14 deletions
src/event/socket.rs
View file @ b17996b1
...@@ -38,8 +38,6 @@ pub struct SocketEvent { ...@@ -38,8 +38,6 @@ pub struct SocketEvent {
pub qos: Option<i32>, pub qos: Option<i32>,
// 设备信息 // 设备信息
pub seller_id: Option<i64>,
pub store_id: Option<i64>,
pub device_id: Option<String>, pub device_id: Option<String>,
pub client_type: Option<i32>, pub client_type: Option<i32>,
pub version: Option<i32>, pub version: Option<i32>,
......
src/socket/event.rs
View file @ b17996b1
...@@ -26,8 +26,6 @@ impl BusinessEvent for SocketEvent { ...@@ -26,8 +26,6 @@ impl BusinessEvent for SocketEvent {
) -> SocketEvent { ) -> SocketEvent {
let Header(msg_id, msg_ty, qos) = header; let Header(msg_id, msg_ty, qos) = header;
SocketEvent { SocketEvent {
seller_id: None,
store_id: None,
device_id: None, device_id: None,
client_type: None, client_type: None,
version: None, version: None,
...@@ -61,8 +59,6 @@ impl PublishEvent for SocketEvent { ...@@ -61,8 +59,6 @@ impl PublishEvent for SocketEvent {
) -> SocketEvent { ) -> SocketEvent {
let Header(msg_id, msg_ty, qos) = header; let Header(msg_id, msg_ty, qos) = header;
SocketEvent { SocketEvent {
seller_id: Some(info.seller_id),
store_id: Some(info.store_id),
device_id: Some(info.device_id.clone()), device_id: Some(info.device_id.clone()),
client_type: Some(info.client_type), client_type: Some(info.client_type),
version: Some(info.version), version: Some(info.version),
...@@ -81,8 +77,6 @@ impl PublishEvent for SocketEvent { ...@@ -81,8 +77,6 @@ impl PublishEvent for SocketEvent {
fn ack(info: &TokenInfo, msg_id: i64, desc: impl AsRef<str>) -> SocketEvent { fn ack(info: &TokenInfo, msg_id: i64, desc: impl AsRef<str>) -> SocketEvent {
SocketEvent { SocketEvent {
seller_id: Some(info.seller_id),
store_id: Some(info.store_id),
device_id: Some(info.device_id.clone()), device_id: Some(info.device_id.clone()),
client_type: Some(info.client_type), client_type: Some(info.client_type),
version: Some(info.version), version: Some(info.version),
...@@ -114,8 +108,6 @@ impl ConnectEvent for SocketEvent { ...@@ -114,8 +108,6 @@ impl ConnectEvent for SocketEvent {
"设备断开连接" "设备断开连接"
}; };
SocketEvent { SocketEvent {
seller_id: Some(info.seller_id),
store_id: Some(info.store_id),
device_id: Some(info.device_id.clone()), device_id: Some(info.device_id.clone()),
client_type: Some(info.client_type), client_type: Some(info.client_type),
version: Some(info.version), version: Some(info.version),
...@@ -134,8 +126,6 @@ impl ConnectEvent for SocketEvent { ...@@ -134,8 +126,6 @@ impl ConnectEvent for SocketEvent {
fn clean_session(info: &TokenInfo, extra: impl AsRef<str>) -> SocketEvent { fn clean_session(info: &TokenInfo, extra: impl AsRef<str>) -> SocketEvent {
SocketEvent { SocketEvent {
seller_id: Some(info.seller_id),
store_id: Some(info.store_id),
device_id: Some(info.device_id.clone()), device_id: Some(info.device_id.clone()),
client_type: Some(info.client_type), client_type: Some(info.client_type),
version: Some(info.version), version: Some(info.version),
...@@ -176,8 +166,6 @@ impl ConsumeEvent for SocketEvent { ...@@ -176,8 +166,6 @@ impl ConsumeEvent for SocketEvent {
}; };
let Header(msg_id, msg_ty, qos) = header; let Header(msg_id, msg_ty, qos) = header;
SocketEvent { SocketEvent {
seller_id: Some(info.seller_id),
store_id: Some(info.store_id),
device_id: Some(info.device_id.clone()), device_id: Some(info.device_id.clone()),
client_type: Some(info.client_type), client_type: Some(info.client_type),
version: Some(info.version), version: Some(info.version),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment