mm_os 2.2.3 → 2.2.5

package/core/com/mqtt/drive.js

@@ -369,10 +369,13 @@ Drive.prototype.exec = async function(clientid, key, json) {
  * @param {Object} msg 消息
  * @param {String} topic 订阅的主题
  */
-Drive.prototype.get_clientid = function(push_topic, msg, topic) {
+Drive.prototype.get_clientid = function(push_topic, body, msg, topic) {
 	var cg = this.config;
-	var str = topic.left("#");
-	var clientid = push_topic.between(str, "/");
+	var clientid = body[cg.clientid] || msg[cg.clientid];
+	if (!clientid) {
+		var str = topic.left("#");
+		clientid = push_topic.between(str, "/");
+	}
 	return clientid;
 }
 
@@ -385,19 +388,19 @@ Drive.prototype.get_clientid = function(push_topic, msg, topic) {
  */
 Drive.prototype.convert_in = function(push_topic, msg, topic, index) {
 	var cg = this.config;
-	var clientid = msg[cg.clientid] || this.get_clientid(push_topic, msg, topic);
 	var method = msg[cg.method];
 	var json = {
-		clientid,
+		clientid: "",
 		id: msg[cg.msgid] || this.get_msgid(method, 'client'),
 		method
 	};
-
 	if (msg[cg.params]) {
-		json.params = msg[cg.params]
+		json.params = msg[cg.params];
+		json.clientid = this.get_clientid(push_topic, json.params, msg, topic);
 	}
 	if (msg[cg.result]) {
 		json.result = msg[cg.result]
+		json.clientid = this.get_clientid(push_topic, json.result, msg, topic);
 	}
 	return json;
 }
@@ -494,7 +497,7 @@ Drive.prototype.handle = async function(push_topic, msg, topic, index) {
  * @param {Number} index 索引
  * @return {Object} 返回执行结果
  */
-Drive.prototype.main = async function(push_topic, msg, index, topic) {
+Drive.prototype.main = async function(push_topic, msg, topic, index) {
 	return this.handle(push_topic, msg, topic, index);
 }
 

package/core/com/mqtt/index.js

@@ -29,16 +29,18 @@ class MQTT extends Index {
 			hostname: "127.0.0.1",
 			port: "1883",
 			protocol: "mqtt",
-			clientId: "server",
+			clientId: "de",
 			subscribe_qos: 0,
 			publish_qos: 1,
-			username: "server",
+			username: "de",
 			password: "asd123",
 			clean: false,
 			longtime: 15000,
+			connectTimeout: 4000,
 			// maxInflight: 20,
 			// 重连间隔
-			interval: 6000
+			// interval: 6000,
+			reconnectPeriod: 6000 // 重连间隔1秒
 		}
 
 		// mqtt客户端服务器
@@ -83,6 +85,14 @@ class MQTT extends Index {
 	}
 }
 
+/**
+ * 设置配置
+ * @param {Object} config 配置
+ */
+MQTT.prototype.set_config = function(config) {
+	Object.assign(this.config, config);
+}
+
 /**
  * 主题匹配
  * @param {String} topic 接收到的主题
@@ -133,21 +143,20 @@ MQTT.prototype.update_after = function() {
 	}
 }
 
-
 /**
  * 重新连接
  */
 MQTT.prototype.reconnect = function() {
-	$.sleep(this.config.interval);
-	this.retryTimes += 1;
-	if (this.retryTimes > 5) {
-		try {
-			this.client.end();
-			this.init();
-		} catch (error) {
-			this.$message.error(error.toString());
-		}
-	}
+	// $.sleep(this.config.interval);
+	// this.retryTimes += 1;
+	// if (this.retryTimes > 5) {
+	// 	try {
+	// 		this.client.end();
+	// 		this.init();
+	// 	} catch (error) {
+	// 		this.$message.error(error.toString());
+	// 	}
+	// }
 }
 
 /**

package/demo/app/test/mqtt/df/index.js

@@ -324,6 +324,11 @@ exports.init = function() {
 		if (params.pic) {
 			avatar = params.pic;
 		}
+		if (typeof(time) == "object") {
+			time = time.toStr("yyyy-MM-dd hh:mm:ss");
+		} else {
+			time = time.toTime().toStr("yyyy-MM-dd hh:mm:ss");
+		}
 		var log = {
 			customId,
 			name,

package/demo/app/test/mqtt/df/mqtt.json

@@ -20,7 +20,7 @@
 	// 调用的脚本
 	"func_file": "./index.js",
 	// 客户端ID
-	"clientid": "clientid",
+	"clientid": "facesluiceId",
 	// 消息ID
 	"msgid": "messageId",
 	// 请求方法

package/demo/com/server/index.js

@@ -1,5 +1,5 @@
 var sql = $.mysql_admin('sys');
-var dbs = sql.dbs;
+var dbs = sql.db();
 
 /**
  * 服务端类
@@ -33,16 +33,16 @@ Server.prototype.get_user_sub = async function(table, project_id, customId, name
 			query.idcard = idcard;
 		}
 	}
-	// 先查询1次，看内部人员是否存在
-	var enter = await db2.getObj(query, "", "*", false);
+	// 先查询1次，看人员是否存在
+	var enter = await db1.getObj(query, "", "*", false);
 
 	if (!enter) {
-		// 如果不存在，则用名字再查一次，看内部人员是否存在
+		// 如果不存在，则用名字再查一次
 		query = {
 			project_id,
 			name
 		};
-		enter = await db2.getObj(query, "`time_create` desc", "*", false);
+		enter = await db1.getObj(query, "`time_create` desc", "*", false);
 	}
 	return enter;
 }
@@ -100,20 +100,15 @@ Server.prototype.get_user = async function(project_id, customId, name, phone, id
 		enter = {
 			department_id: 0,
 			team_id: 0,
-			job: '',
+			name: "",
+			job: "",
 			phone,
 			idcard
 		};
 	}
-	var user = Object.assign({}, enter, {
-		customId,
-		name,
-		phone,
-		idcard
-	})
 	return {
 		user_type,
-		user
+		user: Object.assign({}, enter)
 	}
 }
 
@@ -136,7 +131,7 @@ Server.prototype.exec_log = async function(clientid, log) {
 	var {
 		project,
 		tip
-	} = check_project(project_id);
+	} = await this.check_project(project_id);
 
 	if (tip) {
 		return tip
@@ -146,7 +141,12 @@ Server.prototype.exec_log = async function(clientid, log) {
 		customId,
 		name,
 		phone,
-		idcard
+		idcard,
+		time,
+		type,
+		record_type,
+		person_type,
+		action
 	} = log;
 	// 通过项目id和用户唯一标识获取用户
 	var {
@@ -158,10 +158,36 @@ Server.prototype.exec_log = async function(clientid, log) {
 	if (!project.save_outboard && user_type === 3) {
 		return
 	}
-	log.user_type = user_type;
+
+	log = {
+		project_id: 0,
+		user_id: 0,
+		name: "",
+		// 1内部人员|2访客|3非系统名单
+		user_type,
+		clientid: "",
+		direction: "",
+		// 1人脸验证|2远程开门|3扫码开门|4刷卡验证
+		type,
+		record_type,
+		action: action || "人脸验证",
+		// 1白名单|2黑名单
+		person_type,
+		department_id: 0,
+		team_id: 0,
+		job: "",
+		phone: "",
+		idcard: "",
+		nfc: "",
+		note: "",
+		time: ""
+	}
+
+	$.push(log, user);
+	log.time = time;
 	log.clientid = clientid;
 	log.direction = device.direction;
-	return this.save_log(log);
+	return this.save_log(log, project.upload_pic);
 }
 
 /**
@@ -192,7 +218,6 @@ Server.prototype.check_device = async function(clientid, key) {
 	};
 }
 
-
 /**
  * 检查项目
  * @param {String} project_id 项目ID
@@ -200,7 +225,7 @@ Server.prototype.check_device = async function(clientid, key) {
  */
 Server.prototype.check_project = async function(project_id, key) {
 	var tip;
-	var db2 = dbs.new("face_project");
+	var db2 = dbs.new("sys_project");
 	var project = await db2.getObj({
 		project_id
 	});
@@ -227,14 +252,16 @@ Server.prototype.check_project = async function(project_id, key) {
 /**
  * 保存记录
  * @param {Object} log 记录
+ * @param {Boolean} upload_pic 上传头像
  */
-Server.prototype.save_log = async function(log) {
+Server.prototype.save_log = async function(log, upload_pic) {
 	var db = dbs.new("face_log", "user_id");
 	var project_id = log.project_id;
 	var user_id = log.user_id || 0;
 	var time = log.time;
+	var clientid = log.clientid;
 	var count = await db.count({
-		project_id,
+		clientid,
 		user_id,
 		time
 	});
@@ -251,7 +278,7 @@ Server.prototype.save_log = async function(log) {
 			user_id,
 			project_id,
 			type_has: "1,3,4",
-			time_min: now.toStr('yyyy-MM-dd 00:00:00')
+			time_min: time.toTime().toStr('yyyy-MM-dd 00:00:00')
 		};
 		var obj = await db.getObj(qy, '`time` desc');
 		if (obj) {
@@ -267,7 +294,7 @@ Server.prototype.save_log = async function(log) {
 	var fname = time.replace(/[-: ]/g, '_');
 	var avatar = log.avatar;
 	if (avatar) {
-		if (project.upload_pic) {
+		if (upload_pic) {
 			pic = avatar;
 			avatar = `/face/img/user/${user_id}/${fname}.png`;
 		} else {
@@ -304,7 +331,7 @@ Server.prototype.save_log = async function(log) {
 	if (bl) {
 		// 更新用户状态
 		var body = {
-			clientid: log.clientid,
+			clientid,
 			direction,
 			time
 		};
@@ -314,7 +341,7 @@ Server.prototype.save_log = async function(log) {
 				user_id,
 				project_id
 			}, body);
-		} else if (user_type == 2) {
+		} else if (log.user_type == 2) {
 			var db4 = dbs.new("face_visitor", "visitor_id");
 			await db4.set({
 				visitor_id
@@ -322,7 +349,7 @@ Server.prototype.save_log = async function(log) {
 		}
 
 		if (pic) {
-			var file = (`/app/face/static/img/user/${user_id}/${fname}.png`).fullname();
+			var file = (`/static/img/user/${user_id}/${fname}.png`).fullname();
 			file.addDir();
 			var po = pic.replace(/^data:image\/\w+;base64,/, "");
 			var bf = Buffer.from(po, 'base64');

package/demo/config/development.json

@@ -50,23 +50,24 @@
 	},
 	"mqtt": {
 		// 是否启用MQTT
-		"state": true,
+		"state": false,
 		// mqtt访问端口号
 		"socket_port": 1883,
 		// websocket 访问端口
 		"http_port": 8083,
 		// 缓存方式 memory、mongodb、redis
-		"cache": "memory",
+		"cache": "redis",
 		// 缓存服务器地址
 		"cache_host": "mongodb://localhost:27017/mosca",
 		// MQTT订阅方式
-		"subscribe_qos": 1,
+		"subscribe_qos": 0,
 		// 清除历史
 		"clean": true,
 		// 协议头
 		"protocol": "mqtt",
 		// MQTT服务器地址
-		"hostname": "127.0.0.1",
+		"hostname": "mqtt.laieliantong.com",
+		// "hostname": "127.0.0.1",
 		// MQTT服务器用户名
 		"username": "developer",
 		// MQTT服务器密码

package/demo/index.js

@@ -13,7 +13,7 @@ $.sql.open();
 
 setTimeout(async () => {
 	var mqtt = $.mqtt_admin("sys");
-	mqtt.init(config.mqtt);
+	mqtt.set_config(config.mqtt);
 	mqtt.start();
 	await mqtt.update();
 	mqtt.run(null, 'init');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {