From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 十一月 2023 17:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/mqtt/MqttProperties.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fzzy/mqtt/MqttProperties.java b/src/main/java/com/fzzy/mqtt/MqttProperties.java
index a7293c9..094df8b 100644
--- a/src/main/java/com/fzzy/mqtt/MqttProperties.java
+++ b/src/main/java/com/fzzy/mqtt/MqttProperties.java
@@ -22,39 +22,44 @@
     /**
      * 鐢ㄦ埛鍚�
      */
-    private String clientUsername;
+    private String username;
 
     /**
      * 瀵嗙爜
      */
-    private String clientPassword;
+    private String password;
 
 
     /**
-     * 瀹㈡埛绔疘d锛屽悓涓�鍙版湇鍔″櫒涓嬶紝涓嶅厑璁稿嚭鐜伴噸澶嶇殑瀹㈡埛绔痠d
+     * 瀹㈡埛绔疘d-鍙戝竷鑰匢d
      */
-    private String clientId;
+    private String clientOutId;
+
+    /**
+     * 瀹㈡埛绔疘d-琚闃呰�匢d
+     */
+    private String clientInId;
 
 
     /**
      * 瓒呮椂鏃堕棿
      */
-    private int clientTimeout = 5000;
+    private int timout = 5000;
 
     /**
      * 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风
      * 鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
      */
-    private int clientAliveTime = 30000;
+    private int keepAliveInterval = 20;
 
-    private int clientMaxConnectTime;
+    private int maxConnectTimes = 5;
 
-    private String clientTopics;
+    private String topics;
 
     /**
      * 杩炴帴鏂瑰紡
      */
-    private Integer clientQos = 0;
+    private Integer qos = 0;
 
     /**
      * 榛樿杩炴帴涓婚锛屼互/#缁撳熬琛ㄧず璁㈤槄鎵�鏈変互test寮�澶寸殑涓婚

--
Gitblit v1.9.3