mm_os 2.5.4 → 2.5.6

package/core/com/api/drive.js

@@ -415,8 +415,7 @@ Drive.prototype.get_state = async function(ctx, db) {
 						ctx.session.user = obj.user;
 						o.token = ctx.session.uuid;
 						obj.state.token = o.token;
-					}
-					else {
+					} else {
 						o = null;
 					}
 				} else {
@@ -483,28 +482,30 @@ Drive.prototype.main = async function(ctx, db) {
  * @return {Object} 执行结果
  */
 Drive.prototype.run = async function(ctx, db) {
-	var body = await this.getCache(ctx);
-	if (!body) {
-		var req = ctx.request;
-
-		var md = this.config["method"].toLocaleUpperCase();
-		if (md !== req.method && md !== "ALL") {
-			return null;
-		}
-
-		await this.before(ctx, db);
-		var ret = await this.check(ctx, db);
-		if (!ret) {
-			try {
-				ret = await this.main(ctx, db);
-			} catch (err) {
-				$.log.error("脚本文件错误", req.path, err);
-				ret = $.ret.error(10000, "脚本文件错误：" + err.toString());
+	try {
+		var body = await this.getCache(ctx);
+		if (!body) {
+			var req = ctx.request;
+			var md = this.config["method"].toLocaleUpperCase();
+			if (md !== req.method && md !== "ALL") {
+				return null;
 			}
+			await this.before(ctx, db);
+			var ret = await this.check(ctx, db);
+			if (!ret) {
+				try {
+					ret = await this.main(ctx, db);
+				} catch (err) {
+					$.log.error("脚本文件错误", req.path, err);
+					ret = $.ret.error(10000, "脚本文件错误：" + err.toString());
+				}
+			}
+			var res = ctx.response;
+			body = this.body(ret, res, req.type);
+			this.setCache(ctx, body, res.type);
 		}
-		var res = ctx.response;
-		body = this.body(ret, res, req.type);
-		this.setCache(ctx, body, res.type);
+	} catch (err) {
+		$.log.error("接口错误", ctx.path, err);
 	}
 	return body;
 };
@@ -708,7 +709,7 @@ Drive.prototype.runRPC = async function(db, method, query, body) {
 			}
 		}
 	} catch (err) {
-		$.log.error(err);
+		$.log.error("运行RPC方法错误！", method, err);
 		ret = {
 			error: {
 				code: 500,

package/core/com/api/index.js

@@ -54,15 +54,9 @@ Api.prototype.run = async function(ctx, db) {
 
 	for (var i = 0, o; o = lt[i++];) {
 		if (o.config.state === 1 && path.has(o.config.path)) {
-			var ret;
-			try {
-				ret = await o.run(ctx, db);
-				if (this.mode) {
-					o.load(o.filename);
-				}
-			} catch (error) {
-				$.log.error("接口错误", ctx.path, error);
-				//TODO handle the exception
+			var ret = await o.run(ctx, db);
+			if (this.mode) {
+				o.load(o.filename);
 			}
 			if (ret) {
 				db.ret = ret;

package/core/com/cmd/drive.js

@@ -244,7 +244,7 @@ Drive.prototype.fill = async function(msg, db, stage) {
 		return "";
 	}
 	var list = stage.param;
-	if(!list || list.length === 0){
+	if (!list || list.length === 0) {
 		return "";
 	}
 	var form = {};
@@ -394,15 +394,18 @@ Drive.prototype.end = async function(msg, db, ret) {
  */
 Drive.prototype.run_cmd = async function(msg, db) {
 	var ret;
-	// 第一步, 验证阶段
-	var bl = await this.check(msg, db);
-	if (bl) {
-		ret = await this.run(msg, db);
+	try {
+		// 第一步, 验证阶段
+		var bl = await this.check(msg, db);
+		if (bl) {
+			ret = await this.run(msg, db);
+		}
+	} catch (err) {
+		$.log.error("指令错误", this.config.name, err);
 	}
 	return ret;
 };
 
-
 /**
  * 执行
  * @param {Object} msg 消息上下文
@@ -411,14 +414,18 @@ Drive.prototype.run_cmd = async function(msg, db) {
  */
 Drive.prototype.run_first = async function(msg, db) {
 	var ret;
-	// 第一步, 验证阶段
-	var bl = await this.check(msg, db);
-	if (bl) {
-		ret = await this.run(msg, db);
-		if(ret){
-			// 如果匹配指令则将该消息定义为使用该指令
-			db.msg.cmd = this.config.name;
+	try {
+		// 第一步, 验证阶段
+		var bl = await this.check(msg, db);
+		if (bl) {
+			ret = await this.run(msg, db);
+			if (ret) {
+				// 如果匹配指令则将该消息定义为使用该指令
+				db.msg.cmd = this.config.name;
+			}
 		}
+	} catch (err) {
+		$.log.error("指令错误", this.config.name, err);
 	}
 	return ret;
 };
@@ -451,32 +458,36 @@ Drive.prototype.run_after = async function(msg, db, ret) {
  * @return {Object} 返回执行结果
  */
 Drive.prototype.run = async function(msg, db) {
+	var ret;
+	try {
+		// 第二步, 过滤阶段
+		msg.content = await this.filter(msg, db);
 
-	// 第二步, 过滤阶段
-	msg.content = await this.filter(msg, db);
-
-	// 执行前
-	var ret = await this.run_before(msg, db);
-	if (!ret) {
-		// 第三步, 信息补全或更新阶段
-		var stage = this.config["stage" + db.msg.stage];
-		if (stage) {
-			var mode = stage.mode ? stage.mode : "fill";
-			if (this[mode]) {
-				ret = await this[mode](msg, db, stage);
+		// 执行前
+		ret = await this.run_before(msg, db);
+		if (!ret) {
+			// 第三步, 信息补全或更新阶段
+			var stage = this.config["stage" + db.msg.stage];
+			if (stage) {
+				var mode = stage.mode ? stage.mode : "fill";
+				if (this[mode]) {
+					ret = await this[mode](msg, db, stage);
+				}
 			}
-		}
 
-		if (!ret) {
-			// 第五步, 执行阶段
-			ret = await this.main(msg, db);
+			if (!ret) {
+				// 第五步, 执行阶段
+				ret = await this.main(msg, db);
 
-			// 第六步, 结束会话阶段
-			ret = this.end(msg, db, ret);
+				// 第六步, 结束会话阶段
+				ret = this.end(msg, db, ret);
+			}
 		}
+		// 执行后
+		ret = await this.run_after(msg, db, ret);
+	} catch (error) {
+		$.log.error("指令执行失败！", this.config.name, error);
 	}
-	// 执行后
-	ret = await this.run_after(msg, db, ret);
 	return ret;
 };
 
@@ -508,4 +519,4 @@ Drive.prototype.view = function(msg, db) {
 	return ret.trim();
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/cmd/index.js

@@ -77,11 +77,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 			var lt = this.list_before;
 			for (var i = 0, o; o = lt[i++];) {
 				if (o.config.state === 1) {
-					try {
-						ret = await o.run_cmd(msg, db);
-					} catch (error) {
-						$.log.error("指令错误", o.config.name, error);
-					}
+					ret = await o.run_cmd(msg, db);
 					if (ret) {
 						break;
 					}
@@ -124,11 +120,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 			var lt = this.list_main;
 			for (var i = 0, o; o = lt[i++];) {
 				if (o.config.state === 1) {
-					try {
-						ret = await o.run_first(msg, db);
-					} catch (error) {
-						$.log.error("指令错误", o.config.name, error);
-					}
+					ret = await o.run_first(msg, db);
 					if (ret) {
 						break;
 					}
@@ -139,12 +131,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 			var lt = this.list_after;
 			for (var i = 0, o; o = lt[i++];) {
 				if (o.config.state === 1) {
-					try {
-						ret = await o.run_first(msg, db);
-					} catch (error) {
-						$.log.error("指令错误", o.config.name, error);
-					}
-
+					ret = await o.run_first(msg, db);
 					if (ret) {
 						break;
 					}

package/core/com/component/index.js

@@ -92,12 +92,7 @@ Component.prototype.render = async function(page, position, ctx, db) {
 				position
 			});
 			if (obj && obj.onoff) {
-				var ret;
-				try {
-					ret = await o.run('main', ctx, db);
-				} catch (error) {
-					$.log.error("组件渲染失败", o.config.name, error);
-				}
+				var ret = await o.run('main', ctx, db);
 				if (ret) {
 					html += "\n" + ret;
 				}

package/core/com/event/drive.js

@@ -95,7 +95,7 @@ Drive.prototype.new_config = function(file) {
 				text = text.replaceAll('{0}', event_name);
 				text = text.replaceAll('{1}', '/' + event_name + '*');
 			}
-			
+
 			file.saveText(text);
 		}
 	}
@@ -109,7 +109,12 @@ Drive.prototype.new_config = function(file) {
  * @return {Object} 执行结果
  */
 Drive.prototype.run = async function(ctx, db, method = 'main') {
-	var ret = await this[method](ctx, db);
+	var ret;
+	try {
+		ret = await this[method](ctx, db);
+	} catch (error) {
+		$.log.error("事件执行失败！", this.config.name, error);
+	}
 	return ret;
 };
 
@@ -123,4 +128,4 @@ Drive.prototype.main = async function(ctx, db) {
 	return null;
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/event/index.js

@@ -145,17 +145,12 @@ Event.prototype.sort = function(stage) {
  * 执行事件
  */
 Event.prototype.doing = async function(o, ctx, db) {
-	var ret;
-	try {
-		ret = o.run(ctx, db);
-		if (types.isPromise(ret)) {
-			ret = await ret;
-		}
-		if (this.mode) {
-			o.load(o.filename);
-		}
-	} catch (err) {
-		console.error(err);
+	var ret = o.run(ctx, db);
+	if (types.isPromise(ret)) {
+		ret = await ret;
+	}
+	if (this.mode) {
+		o.load(o.filename);
 	}
 	return ret;
 }
@@ -171,14 +166,9 @@ Event.prototype.doing = async function(o, ctx, db) {
 Event.prototype.run_sub = async function(list, target, ctx, db) {
 	for (var i = 0, o; o = list[i++];) {
 		if (o.config.state === 1 && target.has(o.config.target)) {
-			var ret;
-			try {
-				ret = await o.run(ctx, db);
-				if (this.mode) {
-					o.load(o.filename);
-				}
-			} catch (error) {
-				$.log.error("事件执行错误", o.config.name, error);
+			var ret = await o.run(ctx, db);
+			if (this.mode) {
+				o.load(o.filename);
 			}
 			if (ret) {
 				db.ret = ret;
@@ -255,7 +245,6 @@ Event.prototype.after = async function(target, ctx, db) {
  * @return {Object} 执行结果
  */
 Event.prototype.run = async function(target, ctx, db) {
-	console.log("运行了", target, ctx, db);
 	if (!db) {
 		db = {
 			ret: null

package/core/com/eventer/com.js

@@ -155,7 +155,7 @@ Eventer.prototype.doing = async function(o, ...msg) {
 			o.load(o.filename);
 		}
 	} catch (err) {
-		console.error(err);
+		$.log.error("事件器执行失败！", err);
 	}
 	if (o.num === o.count) {
 		this.list_del.push(o.id);

package/core/com/mqtt/drive.js

@@ -313,7 +313,7 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
  */
 Drive.prototype.save_online = async function(clientid, online, ip) {
 	if (!clientid) {
-		
+
 	}
 }
 
@@ -379,9 +379,12 @@ Drive.prototype.del_msg = function(clientid, key) {
  */
 Drive.prototype.run_event = function(clientid, key, json) {
 	var method = key.left("_");
-	var func = this[method + "_event"];
-	if (func) {
-		func(clientid, json);
+	if (this[method + "_event"]) {
+		try {
+			this[method + "_event"](clientid, json);
+		} catch (err) {
+			$.log.error("MQTT事件执行失败！", key, err);
+		}
 	}
 }
 
@@ -398,7 +401,11 @@ Drive.prototype.exec = async function(clientid, key, json) {
 	}
 	if (o) {
 		delete this.drives[clientid][key];
-		await o.func(json);
+		try {
+			await o.func(json);
+		} catch (err) {
+			$.log.error("MQTT执行失败！", key, err);
+		}
 	} else {
 		await this.run_event(clientid, key, json);
 	}
@@ -505,7 +512,12 @@ Drive.prototype.handle = async function(push_topic, msg, topic, index) {
 		if (func) {
 			var id = json.id;
 			var params = json.params;
-			var ret = func(json.clientid, params, msg, id);
+			var ret;
+			try {
+				ret = func(json.clientid, params, msg, id);
+			} catch (err) {
+				$.log.error("事件回调失败！", err);
+			}
 			if (ret) {
 				if (util.types.isPromise(ret)) {
 					ret = await ret;
@@ -518,11 +530,15 @@ Drive.prototype.handle = async function(push_topic, msg, topic, index) {
 						if (id) {
 							obj[cg.msgid] = id;
 						}
-						obj[cg.method] = this.get_method(json.method);
-						obj[cg.result] = ret;
-						var topic_receive = this.get_topic(arr_tc[index], json.clientid, params);
-						var reply_msg = this.convert_out(topic_receive, obj, topic, index);
-						await this.send(topic_receive, reply_msg);
+						try {
+							obj[cg.method] = this.get_method(json.method);
+							obj[cg.result] = ret;
+							var topic_receive = this.get_topic(arr_tc[index], json.clientid, params);
+							var reply_msg = this.convert_out(topic_receive, obj, topic, index);
+							await this.send(topic_receive, reply_msg);
+						} catch (err) {
+							$.log.error("MQTT事件响应失败！", err);
+						}
 					}
 				}
 			}

package/core/com/mqtt/index.js

@@ -132,12 +132,7 @@ MQTT.prototype.update_after = function() {
 					_this.send(topic, msg, qos, retain);
 				}
 			};
-
-			try {
-				o.run('init');
-			} catch (error) {
-				$.log.error("MQTT类初始化失败", o.config.name, error);
-			}
+			o.run('init');
 			var topics = o.config.topic;
 			if (topics) {
 				for (var i = 0; i < topics.length; i++) {
@@ -280,11 +275,7 @@ MQTT.prototype.receive = async function(push_topic, msg) {
 				for (var i = 0; i < topics.length; i++) {
 					var topic = topics[i];
 					if (this.match(push_topic, topic)) {
-						try {
-							ret = await o.run("main", push_topic, msg, topic, i);
-						} catch (error) {
-							$.log.error("MQTT执行失败", o.config.name, error);
-						}
+						ret = await o.run("main", push_topic, msg, topic, i);
 					}
 				}
 			}
@@ -436,50 +427,99 @@ MQTT.prototype.save_online = async function(arr, online = 1) {
 	var db = sql.db();
 	db.table = "face_device";
 	db.size = 0;
-	await db.set({
-		clientid_has: arr.join(",")
-	}, body);
+	var query = {};
+	if (arr) {
+		query.clientid_has = arr.join(",");
+	}
+	await db.set(query, body);
+}
+
+/**
+ * 获取所有设备
+ */
+MQTT.prototype.get_drives = async function() {
+	var sql = $.mysql_admin('sys');
+	sql.open();
+	var db = sql.db();
+	db.table = "face_device";
+	db.size = 0;
+	return await db.get({}, "", "clientid, online");
 }
 
 /**
  * 更新在线设备
  */
 MQTT.prototype.update_online = async function() {
+	// 获取所有方案
 	var list = this.list;
 	var list_online = [];
 	var list_offline = [];
+	var list_has = [];
+
 	var now = new Date().getTime();
 	var online_expires = this.config.online_expires; // 180 
+
+	// 获取所有设备
+	var drives = await this.get_drives();
 	for (var i = 0; i < list.length; i++) {
 		var dict = list[i].drives;
 		for (var clientid in dict) {
+			list_has.push(clientid);
+			var drive = drives.getObj({
+				clientid
+			});
 			var o = dict[clientid];
 			if (o.online === 1) {
 				if (o.time_last) {
 					var cha = now - o.time_last;
 					if (cha > online_expires) {
-						list_offline.push(clientid);
+						if (drive && drive.online) {
+							// 如果设备本身在线，需要改为离线
+							list_offline.push(clientid);
+						}
 						o.online = 0;
 						delete dict[clientid];
 					} else {
-						list_online.push(clientid);
+						if (drive && !drive.online) {
+							// 如果设备本身离线，需要改为在线
+							list_online.push(clientid);
+						}
 					}
-				} else {
-					list_online.push(clientid);
 				}
 			} else {
-				list_offline.push(clientid);
+				if (drive && drive.online) {
+					// 如果设备本身在线，需要改为离线
+					list_offline.push(clientid);
+				}
 			}
 		}
 	}
-	var list_on = list_online.to2D(30);
-	for (var i = 0; i < list_on.length; i++) {
-		await this.save_online(list_on[i], 1);
+
+	// 如果设备没有出现过，则视为离线
+	for (var i = 0; i < drives.length; i++) {
+		var {
+			clientid,
+			online
+		} = drives[i];
+		if (online && list_has.indexOf(clientid) === -1) {
+			list_offline.push(clientid);
+		}
 	}
+
+	// console.log("在线设备变化", list_online);
+	// console.log("离线设备变化", list_offline);
+
+	// 先将设备离线
 	var list_off = list_offline.to2D(30);
 	for (var i = 0; i < list_off.length; i++) {
 		await this.save_online(list_off[i], 0);
 	}
+
+	// 再将设备在线
+	var list_on = list_online.to2D(30);
+	for (var i = 0; i < list_on.length; i++) {
+		await this.save_online(list_on[i], 1);
+	}
 }
 
 /**

package/core/com/plugin/drive.js

@@ -314,7 +314,12 @@ Drive.prototype.run_cmd = async function(content) {
 	if (!content) {
 		content = "";
 	}
-	var ret = this.cmd(content);
+	var ret;
+	try {
+		ret = this.cmd(content);
+	} catch (err) {
+		$.log.error("运行插件指令失败！", this.config.name, err);
+	}
 	if (!ret) {
 		ret = "";
 	}
@@ -341,7 +346,12 @@ Drive.prototype.run_chat = async function(from_user, to_user, content, group, ty
 	if (!group) {
 		group = "";
 	}
-	var ret = this.chat(from_user, to_user, group, content, type, msg_type, db);
+	var ret;
+	try {
+		ret = this.chat(from_user, to_user, group, content, type, msg_type, db);
+	} catch (err) {
+		$.log.error("运行插件聊天失败！", this.config.name, err);
+	}
 	if (!ret) {
 		ret = "";
 	}

package/core/com/plugin/index.js

@@ -55,7 +55,7 @@ Plugin.prototype.init = function(option) {
 	var ret = "";
 	var lt = this.list;
 	for (var i = 0, o; o = lt[i++];) {
-		ret = o.init(option);
+		ret = o.run('init', option);
 	}
 	return ret;
 };

package/core/com/static/drive.js

@@ -203,51 +203,55 @@ Drive.prototype.run = async function(ctx, path, next) {
 	var done;
 	var cg = this.config;
 	var ph = cg.path;
-	if (path.startWith(ph)) {
-		var p = path.replace(ph, '');
-		if (p.indexOf('.') !== -1) {
-			this.before(ctx, p);
-			try {
-				done = await this.main(ctx, p);
-				this.after(ctx, p, done);
-			} catch (err) {
-				if (err.status !== 404) {
-					throw err;
-				}
-			}
-		} else {
-			done = ' ';
-			if (ctx.status === 404) {
-				var file;
-
-				// 取到物理路径
-				var root = this.dir;
-				var dir = (root + p).fullname();
-				if (!p) {
-					file = dir + '/' + cg.index;
-				} else if (p.endWith('/')) {
-					file = dir + cg.index;
-				} else {
-					file = dir + '.html';
-				}
-				if (file.hasFile()) {
-					p = file.replace(root, '');
-					this.before(ctx, p);
+	try {
+		if (path.startWith(ph)) {
+			var p = path.replace(ph, '');
+			if (p.indexOf('.') !== -1) {
+				this.before(ctx, p);
+				try {
 					done = await this.main(ctx, p);
 					this.after(ctx, p, done);
-				} else if (cg.redirect) {
-					var file = root + '/index.html';
+				} catch (err) {
+					if (err.status !== 404) {
+						throw err;
+					}
+				}
+			} else {
+				done = ' ';
+				if (ctx.status === 404) {
+					var file;
+
+					// 取到物理路径
+					var root = this.dir;
+					var dir = (root + p).fullname();
+					if (!p) {
+						file = dir + '/' + cg.index;
+					} else if (p.endWith('/')) {
+						file = dir + cg.index;
+					} else {
+						file = dir + '.html';
+					}
 					if (file.hasFile()) {
-						p = '/index.html';
+						p = file.replace(root, '');
 						this.before(ctx, p);
 						done = await this.main(ctx, p);
 						this.after(ctx, p, done);
+					} else if (cg.redirect) {
+						var file = root + '/index.html';
+						if (file.hasFile()) {
+							p = '/index.html';
+							this.before(ctx, p);
+							done = await this.main(ctx, p);
+							this.after(ctx, p, done);
+						}
 					}
 				}
 			}
 		}
+	} catch (err) {
+		$.log.error("静态文件执行错误", this.config.name, err);
 	}
 	return done;
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/static/index.js

@@ -41,12 +41,7 @@ class Static extends Index {
 					for (var i = 0; i < len; i++) {
 						var o = list[i];
 						if (o.config.state === 1) {
-							try {
-								done = await o.run(ctx, path, next);
-							} catch (error) {
-								$.log.error("静态文件执行错误", o.config.name, error);
-							}
-
+							done = await o.run(ctx, path, next);
 							if (done) {
 								break;
 							}
@@ -71,11 +66,7 @@ class Static extends Index {
 								}
 								break;
 							} else {
-								try {
-									done = await o.run(ctx, path, next);
-								} catch (error) {
-									$.log.error("静态文件执行错误", o.config.name, error);
-								}
+								done = await o.run(ctx, path, next);
 								if (done) {
 									break;
 								}

package/core/com/task/drive.js

@@ -42,7 +42,7 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./task.json";
-		
+
 		/// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
@@ -70,7 +70,7 @@ class Drive extends Item {
 			// 执行顺序
 			"sort": 100
 		};
-		
+
 		/// 状态
 		this.state = "start";
 		/// 等候器
@@ -139,15 +139,13 @@ Drive.prototype.setPeriod = function(func) {
 							func();
 						}
 					};
-				}
-				else if (arr.length == 2) {
+				} else if (arr.length == 2) {
 					fn = function() {
 						if (new Date().toStr('dd hh:mm') === time) {
 							func();
 						}
 					};
-				}
-				else {
+				} else {
 					fn = function() {
 						if (new Date().toStr('dd hh') === time) {
 							func();
@@ -227,15 +225,19 @@ Drive.prototype.setNum = function(func) {
 	var _this = this;
 	return function() {
 		if (_this.state === 'start') {
-			if (_this.config.num < 1) {
-				func();
-			} else if (_this.num < _this.config.num) {
-				func();
-				_this.num += 1;
-			} else {
-				func();
-				_this.clear();
-				_this.notify(_this.config.name, 'completed');
+			try {
+				if (_this.config.num < 1) {
+					func();
+				} else if (_this.num < _this.config.num) {
+					func();
+					_this.num += 1;
+				} else {
+					func();
+					_this.clear();
+					_this.notify(_this.config.name, 'completed');
+				}
+			} catch (err) {
+				$.log.error("定时任务执行失败！", _this.config.name, err);
 			}
 		}
 	};
@@ -371,4 +373,4 @@ Drive.prototype.dispose = function() {
 	this.timeout = undefined;
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/timer/com.js

@@ -122,7 +122,7 @@ Timer.prototype.doing = async function(o) {
 	try {
 		await o.func(o.param, o.num);
 	} catch (err) {
-		console.error(err);
+		$.log.error("定时器执行失败！", err);
 	}
 	if (o.num === o.count) {
 		this.list_del.push(o.id);

package/demo/config/development.json

@@ -66,7 +66,7 @@
 		// 协议头
 		"protocol": "mqtt",
 		// MQTT服务器地址
-		"hostname": "127.0.0.1",
+		"hostname": "mqtt.aieliantong.com",
 		// MQTT服务器用户名
 		"username": "developer",
 		// MQTT服务器密码

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -40,11 +40,11 @@
     "mm_expand": "^1.7.4",
     "mm_html": "^1.1.6",
     "mm_koa_proxy": "^1.0.0",
-    "mm_logs": "^1.1.4",
-    "mm_machine": "^1.7.8",
+    "mm_logs": "^1.1.5",
+    "mm_machine": "^1.8.1",
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
-    "mm_mysql": "^1.8.3",
+    "mm_mysql": "^1.8.5",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.8",