mm_os 2.5.2 → 2.5.4

package/core/com/eventer/com.js

@@ -143,11 +143,11 @@ Eventer.prototype.do_after = function() {
 /**
  * 执行事件
  */
-Eventer.prototype.doing = async function(o, msg) {
+Eventer.prototype.doing = async function(o, ...msg) {
 	o.num++;
 	var ret;
 	try {
-		ret = o.func(msg, o.param, o.num);
+		ret = o.func(...msg, o.param, o.num);
 		if (types.isPromise(ret)) {
 			ret = await ret;
 		}
@@ -167,10 +167,10 @@ Eventer.prototype.doing = async function(o, msg) {
  * 运行事件
  * @param {Array} list 列表
  * @param {String} type 类型
- * @param {Object} msg 事件消息
  * @param {Boolean} isBreak 是否中断
+ * @param {Object} msg 事件消息
  */
-Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
+Eventer.prototype.run_sub = async function(list, isBreak, ...msg) {
 	var ret;
 	if (list) {
 		for (var i = 0; i < list.length; i++) {
@@ -179,7 +179,7 @@ Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
 			if (o.state == 1) {
 				// 判断是否还需要执行
 				if (o.count < 0 || o.num < o.count) {
-					ret = await this.doing(o, msg);
+					ret = await this.doing(o, ...msg);
 					if (ret && isBreak) {
 						break;
 					}
@@ -201,19 +201,19 @@ Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
  * @param {String} type 类型
  * @param {Object} msg 事件消息
  */
-Eventer.prototype.run = async function(type, msg) {
+Eventer.prototype.run = async function(type, ...msg) {
 	this.do_before();
 	var ret;
 	var dt = this.dict[type];
 	if (dt) {
-		ret = await this.run_sub(dt.before, msg, false);
-		ret = await this.run_sub(dt.check, msg, true);
+		ret = await this.run_sub(dt.before, false, ...msg);
+		ret = await this.run_sub(dt.check, true, ...msg);
 		if (ret) {
 			return ret
 		}
-		ret = await this.run_sub(dt.main, msg, false);
+		ret = await this.run_sub(dt.main, false, ...msg);
 		if (ret) {
-			var ret_new = await this.run_sub(dt.after, msg, false);
+			var ret_new = await this.run_sub(dt.after, false, ...msg);
 			ret = ret_new || ret;
 		}
 	}

package/core/com/mqtt/drive.js

@@ -305,6 +305,18 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
 	});
 }
 
+/**
+ * 
+ * @param {Object} clientid
+ * @param {Object} online
+ * @param {Object} ip
+ */
+Drive.prototype.save_online = async function(clientid, online, ip) {
+	if (!clientid) {
+		
+	}
+}
+
 /**
  * 更新设备在线
  * @param {String} clientid 客户端ID

package/core/com/mqtt/index.js

@@ -454,9 +454,7 @@ MQTT.prototype.update_online = async function() {
 		var dict = list[i].drives;
 		for (var clientid in dict) {
 			var o = dict[clientid];
-			if (o.online === 0) {
-				list_offline.push(clientid);
-			} else {
+			if (o.online === 1) {
 				if (o.time_last) {
 					var cha = now - o.time_last;
 					if (cha > online_expires) {
@@ -469,6 +467,8 @@ MQTT.prototype.update_online = async function() {
 				} else {
 					list_online.push(clientid);
 				}
+			} else {
+				list_offline.push(clientid);
 			}
 		}
 	}

package/demo/com/server/index.js

@@ -203,8 +203,8 @@ Server.prototype.exec_log = async function(clientid, log) {
  */
 Server.prototype.check_device = async function(clientid, key) {
 	var tip;
-	var db2 = dbs.new("face_device", "device_id");
-	var device = await db2.getObj({
+	var db_device = dbs.new("face_device", "device_id");
+	var device = await db_device.getObj({
 		clientid
 	});
 	if (device) {

package/demo/config/development.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -37,14 +37,14 @@
     "koa-websocket": "^7.0.0",
     "mm_check": "^1.4.8",
     "mm_excel": "^1.2.0",
-    "mm_expand": "^1.7.3",
+    "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_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
-    "mm_mysql": "^1.8.1",
+    "mm_mysql": "^1.8.3",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.8",