diff --git a/utils/mqttUtil.js b/utils/mqttUtil.js
index 5a0e71e..ad7bbbc 100644
--- a/utils/mqttUtil.js
+++ b/utils/mqttUtil.js
@@ -16,7 +16,6 @@ import {
 } from "@/uni_modules/zy-mqtt";
 // #endif
 
-
 //封装一个类（可直接cv）
 class MqttUtil {
 	//创建公共变量 
@@ -27,10 +26,10 @@ class MqttUtil {
 	static reconnectCount = 0;
 
 	//接收创建来的数据
-	constructor(eventHandler) {
-		this.eventHandler = eventHandler;
-		const url = import.meta.env.VITE_BASE_MQTT;
+	constructor(messageEvent) {
+		this.messageEvent = messageEvent;
 
+		const url = import.meta.env.VITE_BASE_MQTT;
 		// #ifdef H5
 		this.url = `mqtt://${url}`;
 		// #endif
@@ -40,14 +39,15 @@ class MqttUtil {
 	}
 	//初始化参数
 	init(userId) {
-		let clientId = `mqtt_app_${userId}_${this.getUUID()}`;
+		this.userId = userId;
+		// let clientId = this.getClientId();
 		let username = "app_client";
 		let password = "app_client@2023";
 		let keepalive = 10; //保持连接的心跳间隔，单位为秒。
 		let connectTimeout = 30; //接超时的时间，单位为秒。 
 		// #ifdef H5
 		this.options = {
-			clientId: clientId, //	string	客户端的唯一标识符。 
+			clientId: null, //	string	客户端的唯一标识符。 
 			username: username, //	string	连接时的用户名。 
 			password: password, //	string	连接时的密码。
 			keepalive: keepalive, //	number	60	保持连接的心跳间隔，单位为秒。
@@ -69,7 +69,7 @@ class MqttUtil {
 		// #ifdef APP-PLUS
 		this.options = {
 			host: this.url, // 主机ip
-			clientId: clientId, // 客户端id
+			clientId: null, // 客户端id
 			userName: username, // 用户名
 			password: password, // 密码
 			heartBeat: keepalive, // 可选,默认60秒, 心跳
@@ -82,18 +82,27 @@ class MqttUtil {
 		};
 		// #endif
 	}
-	//监听消息回调
-	onEventHandler(topic, data) {
-		console.error("topic：", topic);
-		console.error("data：", data);
-		this.eventHandler(topic, data);
-	}
-	getUUID() {
+	//获取clientId
+	getClientId() {
 		function S4() {
 			return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
 		}
-		return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+		let UUID = (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+
+		return `mqtt_app_${this.userId}_${UUID}`;
 	}
+	//清理连接信息
+	cleanClient() {
+		// this.options.clientId = null;
+		this.client = null;
+		this.connected = false;
+		this.reconnectCount = 0;
+	}
+	//监听消息回调
+	onMessageEvent(topic, data) {
+		this.messageEvent(topic, data);
+	}
+
 
 	// #ifdef H5
 	//mqtt链接
@@ -101,19 +110,22 @@ class MqttUtil {
 		if (!this.options) {
 			this.init(userId);
 		}
-		this.client = mqtt.connect(this.url, this.options);
+		if (this.connected) {
+			return;
+		}
+		if (!this.options.clientId) {
+			this.options.clientId = this.getClientId();
+		}
 
+		this.client = mqtt.connect(this.url, this.options);
 		this.client.on("connect", error => {
-			this.connected = this.client.connected && !this.client.reconnecting;
+			this.connected = this.client.connected;
 			this.reconnectCount = 0;
 			console.log("connect:", this.client)
 			console.log("connect:", this.connected)
 		})
 		this.client.on("reconnect", error => {
-			this.connected = this.client.connected && !this.client.reconnecting;
 			this.reconnectCount++;
-			console.log("reconnect:", this.client)
-			console.log(`reconnect_${this.reconnectCount}:`, this.connected)
 		})
 		this.client.on("error", error => {
 			console.log("error", error)
@@ -121,22 +133,23 @@ class MqttUtil {
 		this.client.on("message", (topic, message) => {
 			console.log("接受消息")
 			console.log("message：", message.toString())
-			this.onEventHandler(topic, message);
+			this.onMessageEvent(topic, message);
 		})
 		this.client.on("close", () => {
 			console.log("已断开连接1")
-			this.client = null;
 			this.connected = false;
-			this.reconnectCount = 0;
 		});
 	}
 	//结束链接
 	over() {
-		this.client.end(false, null, () => {});
+		this.client.end(false, null, () => {
+			console.log("over")
+			this.cleanClient();
+		});
 	}
 	//订阅主题
 	subscribes(topics) {
-		if (!this.client || !this.connected) {
+		if (!this.connected) {
 			return;
 		}
 		console.log("subscribes", topics)
@@ -150,7 +163,7 @@ class MqttUtil {
 	}
 	//取消订阅
 	unsubscribes(topics) {
-		if (!this.client || !this.connected) {
+		if (!this.connected) {
 			return;
 		}
 		console.log("unsubscribes", topics)
@@ -176,6 +189,13 @@ class MqttUtil {
 		if (!this.options) {
 			this.init(userId);
 		}
+		if (this.connected) {
+			return;
+		}
+		if (!this.options.clientId) {
+			this.options.clientId = this.getClientId();
+		}
+
 		// 先连接mqtt
 		connect(this.options, (res) => {
 			console.log("connect：", res);
@@ -192,10 +212,7 @@ class MqttUtil {
 		})
 		// 监听自动重新连接函数
 		onReconnect((res) => {
-			console.log("onReconnect：", res);
-			this.connected = isConnected();
 			this.reconnectCount++;
-			console.log("onConnectLost_${this.reconnectCount}:", this.connected)
 		})
 	}
 	//结束链接
@@ -204,16 +221,15 @@ class MqttUtil {
 			return;
 		}
 		disConnect((res) => {
-			console.log("接受消息:", res)
+			console.log("disConnect:", res)
 			if (res.code == 200) {
-				this.reconnectCount = 0;
-				this.connected = isConnected();
+				this.cleanClient();
 			}
 		})
 	}
 	//订阅主题
 	subscribes(topics) {
-		if (!isConnected()) {
+		if (!this.connected) {
 			return;
 		}
 		console.log("subscribes", topics)
@@ -229,7 +245,7 @@ class MqttUtil {
 	}
 	//取消订阅
 	unsubscribes(topics) {
-		if (!isConnected()) {
+		if (!this.connected) {
 			return;
 		}
 		console.log("unsubscribes", topics)