mm_os 2.1.9 → 2.2.1

package/demo/com/server/index.js

@@ -0,0 +1,447 @@
+var sql = $.mysql_admin('sys');
+var dbs = sql.dbs;
+
+/**
+ * 服务端类
+ */
+class Server {
+
+}
+
+/**
+ * 获取用户
+ * @param {String} table 数据表
+ * @param {Number} project_id 项目ID
+ * @param {String} customId 自定义身份ID
+ * @param {String} name 用户姓名
+ * @param {String} phone 用户手机号码
+ * @param {String} idcard 用户身份证号
+ * @returns {Object} 返回用户对象
+ */
+Server.prototype.get_user_sub = async function(table, project_id, customId, name, phone, idcard) {
+	var db1 = dbs.new("face_" + table, "user_id");
+	var query = {
+		project_id
+	}
+	if (customId && customId !== "0") {
+		query.customId = customId;
+	} else {
+		query.name = name;
+		if (phone) {
+			query.phone = phone;
+		} else if (idcard) {
+			query.idcard = idcard;
+		}
+	}
+	// 先查询1次，看内部人员是否存在
+	var enter = await db2.getObj(query, "", "*", false);
+
+	if (!enter) {
+		// 如果不存在，则用名字再查一次，看内部人员是否存在
+		query = {
+			project_id,
+			name
+		};
+		enter = await db2.getObj(query, "`time_create` desc", "*", false);
+	}
+	return enter;
+}
+
+/**
+ * 获取用户
+ * @param {String} project_id 项目ID
+ * @param {String} table 数据表
+ * @param {Number} project_id 项目ID
+ * @param {String} customId 自定义身份ID
+ * @param {String} name 用户姓名
+ * @param {String} phone 用户手机号码
+ * @param {String} idcard 用户身份证号
+ * @returns {Object} 返回用户对象和用户类型
+ */
+Server.prototype.get_user = async function(project_id, customId, name, phone, idcard) {
+	// 默认为 1内部人员类型
+	var user_type = 1;
+	var enter = await this.get_user_sub("enter", project_id, customId, name, phone, idcard);
+
+	if (!enter) {
+		// 2为访客
+		user_type = 2;
+		enter = await this.get_user_sub("visitor", project_id, customId, name, phone, idcard);
+	}
+
+	if (enter) {
+		var by = {};
+		if (!enter.customId && customId && customId !== "0") {
+			by.customId = customId;
+		}
+		if (!enter.phone && phone) {
+			by.phone = phone;
+		}
+		if (!enter.idcard && idcard && idcard !== '0') {
+			by.idcard = idcard;
+		}
+		if (Object.keys(by).length) {
+			var db3;
+			var qy = {};
+			if (user_type == 2) {
+				db3 = dbs.new("face_visitor", "visitor_id");
+				qy.visitor_id = enter.visitor_id
+			} else {
+				db3 = dbs.new("face_enter", "user_id");
+				qy.user_id == enter.user_id;
+				qy.project_id = enter.project_id;
+			}
+			await db3.set(qy, by);
+			enter = Object.assign({}, enter, by);
+		}
+	} else {
+		// 3为外部人员(非平台成员)
+		user_type = 3;
+		enter = {
+			department_id: 0,
+			team_id: 0,
+			job: '',
+			phone,
+			idcard
+		};
+	}
+	var user = Object.assign({}, enter, {
+		customId,
+		name,
+		phone,
+		idcard
+	})
+	return {
+		user_type,
+		user
+	}
+}
+
+/**
+ * 处理上传记录
+ * @param {String} clientid 设备ID
+ * @param {Object} log 记录
+ */
+Server.prototype.exec_log = async function(clientid, log) {
+	var {
+		device,
+		tip
+	} = await this.check_device(clientid);
+
+	if (tip) {
+		return tip
+	}
+
+	var project_id = device.project_id;
+	var {
+		project,
+		tip
+	} = check_project(project_id);
+
+	if (tip) {
+		return tip
+	}
+
+	var {
+		customId,
+		name,
+		phone,
+		idcard
+	} = log;
+	// 通过项目id和用户唯一标识获取用户
+	var {
+		user,
+		user_type
+	} = await this.get_user(project_id, customId, name, phone, idcard);
+
+	// 如果不记录外部人员，则终止，不保存记录
+	if (!project.save_outboard && user_type === 3) {
+		return
+	}
+	log.user_type = user_type;
+	log.clientid = clientid;
+	log.direction = device.direction;
+	return this.save_log(log);
+}
+
+/**
+ * 检查设备
+ * @param {String} clientid 客户端ID
+ * @param {Object} key 键
+ */
+Server.prototype.check_device = async function(clientid, key) {
+	var tip;
+	var db2 = dbs.new("face_device");
+	var device = await db2.getObj({
+		clientid
+	});
+	if (device) {
+		if (device.available) {
+			if (key && !device[key]) {
+				tip = "没有功能权限"
+			}
+		} else {
+			tip = "设备已禁用"
+		}
+	} else {
+		tip = "没有找到设备"
+	}
+	return {
+		device,
+		tip
+	};
+}
+
+
+/**
+ * 检查项目
+ * @param {String} project_id 项目ID
+ * @param {Object} key 键
+ */
+Server.prototype.check_project = async function(project_id, key) {
+	var tip;
+	var db2 = dbs.new("face_project");
+	var project = await db2.getObj({
+		project_id
+	});
+	if (project) {
+		if (project.available) {
+			var now = new Date().getTime();
+			if (now > new Date(project.time_valid).getTime()) {
+				tip = "项目已过期"
+			} else if (key && !project[key]) {
+				tip = "没有功能权限"
+			}
+		} else {
+			tip = "项目已禁用"
+		}
+	} else {
+		tip = "没有找到项目"
+	}
+	return {
+		project,
+		tip
+	}
+}
+
+/**
+ * 保存记录
+ * @param {Object} log 记录
+ */
+Server.prototype.save_log = async function(log) {
+	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 count = await db.count({
+		project_id,
+		user_id,
+		time
+	});
+
+	// 如果记录已存在，则不再保存
+	if (count) {
+		return
+	}
+
+	// 重新定义方向
+	var direction = log.direction;
+	if (user_id && direction == "通用") {
+		var qy = {
+			user_id,
+			project_id,
+			type_has: "1,3,4",
+			time_min: now.toStr('yyyy-MM-dd 00:00:00')
+		};
+		var obj = await db.getObj(qy, '`time` desc');
+		if (obj) {
+			direction = obj.direction == "进" ? "出" : "进"
+		} else {
+			direction = "进"
+		}
+	}
+	log.direction = direction;
+
+	// 重新定义头像
+	var pic;
+	var fname = time.replace(/[-: ]/g, '_');
+	var avatar = log.avatar;
+	if (avatar) {
+		if (project.upload_pic) {
+			pic = avatar;
+			avatar = `/face/img/user/${user_id}/${fname}.png`;
+		} else {
+			avatar = "";
+		}
+	}
+
+	// 如果是访客则追加备注
+	var visitor_id = log.visitor_id;
+	if (visitor_id) {
+		var {
+			respondent,
+			date,
+			source
+		} = log;
+		if (typeof(date) == "string") {
+			date = date.toTime().toStr("yyyy-MM-dd");
+		} else if (typeof(date) == "object") {
+			date = date.toStr("yyyy-MM-dd");
+		} else {
+			date = ''
+		}
+		log.note = `${visitor_id},${source},${date},${respondent},${log.nfc}`;
+		delete log.visitor_id;
+		delete log.respondent;
+		delete log.date;
+		delete log.source;
+	}
+
+	// 添加新记录
+	var n = await db.add(log);
+
+	var bl = n > 0;
+	if (bl) {
+		// 更新用户状态
+		var body = {
+			clientid: log.clientid,
+			direction,
+			time
+		};
+		if (log.user_type == 1) {
+			var db4 = dbs.new("face_enter", "enter_id");
+			await db4.set({
+				user_id,
+				project_id
+			}, body);
+		} else if (user_type == 2) {
+			var db4 = dbs.new("face_visitor", "visitor_id");
+			await db4.set({
+				visitor_id
+			}, body);
+		}
+
+		if (pic) {
+			var file = (`/app/face/static/img/user/${user_id}/${fname}.png`).fullname();
+			file.addDir();
+			var po = pic.replace(/^data:image\/\w+;base64,/, "");
+			var bf = Buffer.from(po, 'base64');
+			fs.writeFileSync(file, bf);
+		}
+	}
+	return bl;
+}
+
+/**
+ * 处理扫描二维码开门
+ * @param {String} clientid 客户端ID
+ * @param {String} qrcode 二维码内容
+ */
+Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
+	var ret;
+	var db = dbs.new("face_qrcode", "qrcode_id");
+	var now = new Date();
+	var time = now.toStr('yyyy-MM-dd hh:mm:ss');
+	var obj = await db.getObj({
+		qrcode,
+		time_end_min: time
+	});
+	if (obj) {
+		var {
+			device,
+			tip
+		} = await this.check_device(clientid, "qrcode");
+		if (tip) {
+			// 发送开门控制
+			ret = {
+				"uuid": obj.user_id,
+				// 0不开门，1开门
+				"pass": false,
+				"tip": tip
+			}
+		} else {
+			if (obj.count == 0 || obj.num < obj.count) {
+				var db = dbs.new("face_enter");
+				var user = await db.getObj({
+					user_id: obj.user_id,
+					project_id: obj.project_id,
+					state: 3
+				});
+				if (user) {
+					if (user.client && user.client.indexOf(clientid) !== -1) {
+						obj.num++;
+						// 发送开门控制
+						ret = {
+							"uuid": user.customId || user.project_id + "-" + user.user_id,
+							// 0不开门，1开门
+							"pass": true,
+							"tip": "请通行",
+							user
+						}
+						var log = {
+							project_id: 0,
+							user_id: 0,
+							name: "",
+							// 1内部人员|2访客|3非系统名单
+							user_type: 1,
+							// 1人脸验证|2远程开门|3扫码开门|4刷卡验证
+							type: 3,
+							record_type: 1,
+							action: "智码开门",
+							// 1白名单|2黑名单
+							person_type: 1,
+							department_id: 0,
+							team_id: 0,
+							job: "",
+							phone: "",
+							idcard: "",
+							nfc: "",
+							note: ""
+						}
+						$.push(u, user);
+						log.direction = device.direction;
+						log.clientid = clientid;
+						log.time = time;
+						await this.save_log(log);
+					} else {
+						// 发送开门控制
+						ret = {
+							"uuid": user.customId || user.project_id + "-" + user.user_id,
+							// 0不开门，1开门
+							"pass": false,
+							"tip": "没有访问权限"
+						}
+					}
+				} else {
+					// 发送开门控制
+					ret = {
+						"uuid": obj.project_id + "-" + obj.user_id,
+						// 0不开门，1开门
+						"pass": false,
+						"tip": "非法用户"
+					}
+				}
+			} else {
+				// 发送开门控制
+				ret = {
+					"uuid": obj.project_id + "-" + obj.user_id,
+					// 0不开门，1开门
+					"pass": false,
+					"tip": "使用次数超限"
+				}
+			}
+		}
+	} else {
+		// 发送开门控制
+		ret = {
+			"uuid": "0",
+			// 0不开门，1开门
+			"pass": false,
+			"tip": "非法二维码"
+		}
+	}
+
+	return ret;
+}
+
+$.server = new Server();

package/demo/config/development.json

@@ -44,12 +44,12 @@
 	},
 	"mqtt": {
 		// 是否启用MQTT
-		"state": false,
+		"state": true,
 		// mqtt访问端口号
 		"socket_port": 1883,
 		// websocket 访问端口
 		"http_port": 8083,
-		// 缓存方式
+		// 缓存方式 memory、mongodb、redis
 		"cache": "memory",
 		// 缓存服务器地址
 		"cache_host": "mongodb://localhost:27017/mosca",
@@ -58,7 +58,7 @@
 		// 协议头
 		"protocol": "mqtt",
 		// MQTT服务器地址
-		"hostname": "mqtt.aieliantong.com",
+		"hostname": "127.0.0.1",
 		// MQTT服务器用户名
 		"username": "developer",
 		// MQTT服务器密码

package/demo/config/local.json

@@ -37,15 +37,15 @@
 		"proxy": {}
 	},
 	"mqtt": {
-		"state": false,
+		"state": true,
 		// mqtt访问端口号
 		"socket_port": 1883,
 		// 服务端
 		"http_host": "localhost",
 		// websocket 访问端口
 		"http_port": 8083,
-		// 缓存方式
-		"cache": "mongodb",
+		// 缓存方式 memory、mongodb、redis
+		"cache": "memory",
 		// 缓存服务器地址
 		"cache_host": "mongodb://localhost:27017/mosca",
 		// MQTT订阅方式
@@ -57,7 +57,7 @@
 		// MQTT服务器用户名
 		"username": "server",
 		// MQTT服务器密码
-		"password": "df6897hu",
+		"password": "asd123",
 		"port": 1883
 	},
 	"mysql": {

package/demo/config/test.json

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

package/demo/index.js

@@ -11,4 +11,13 @@ $.sql = $.mysql_admin('sys', __dirname);
 $.sql.setConfig(config.mysql);
 $.sql.open();
 
+setTimeout(async () => {
+	var mqtt = $.mqtt_admin("sys");
+	mqtt.init(config.mqtt);
+	mqtt.start();
+	await mqtt.update();
+	mqtt.run(null, 'init');
+	// console.log("打印", $.eventer, mqtt);
+}, 2000);
+
 os.run();

package/index.js

@@ -239,7 +239,6 @@ OS.prototype.main = async function(state) {
 	}
 
 	if (cg.sys && cg.sys.task) {
-		console.log('【启动定时任务】');
 		$.task.update();
 		$.task.run();
 	}

package/middleware/cors/index.js

@@ -14,13 +14,12 @@ module.exports = function(server, config) {
 		// ctx.set("Access-Control-Allow-Origin", "http://localhost:8080");
 
 		// 设置所允许的HTTP请求方法OPTIONS,GET,PUT,POST,DELETE
-		ctx.set('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, HEAD, OPTIONS')
-
+		// ctx.set('Access-Control-Allow-Methods', 'PUT,POST,GET,DELETE,HEAD,OPTIONS');
 
 		// 字段是必需的。它也是一个逗号分隔的字符串，表明服务器支持的所有头信息字段.
-		ctx.set('Access-Control-Allow-Headers',
-			'Content-Type, Content-Length, Authorization, Accept, X-Requested-With, x-auth-token, token, client_id, appid, apikey, user_id,x-forwarded-for,x-real-ip,user-agent,cache-control,pragma,accept-encoding,connection,host'
-			);
+		// ctx.set('Access-Control-Allow-Headers',
+		// 	'Content-Type,Content-Length,Authorization,Accept,X-Requested-With,x-auth-token,token,client_id,appid,apikey,user_id,x-forwarded-for,x-real-ip,user-agent,cache-control,pragma,accept-encoding,connection,host'
+		// 	);
 
 		// 服务器收到请求以后，检查了Origin、Access-Control-Request-Method和Access-Control-Request-Headers字段以后，确认允许跨源请求，就可以做出回应。
 
@@ -29,12 +28,12 @@ module.exports = function(server, config) {
 
 		// 该字段可选。它的值是一个布尔值，表示是否允许发送Cookie。默认情况下，Cookie不包括在CORS请求之中。
 		// 当设置成允许请求携带cookie时，需要保证"Access-Control-Allow-Origin"是服务器有的域名，而不能是"*";
-		ctx.set("Access-Control-Allow-Credentials", 'false');
+		// ctx.set("Access-Control-Allow-Credentials", 'true');
 
 		// 该字段可选，用来指定本次预检请求的有效期，单位为秒。
 		// 当请求方法是PUT或DELETE等特殊方法或者Content-Type字段的类型是application/json时，服务器会提前发送一次请求进行验证
 		// 下面的的设置只本次验证的有效时间，即在该时间段内服务端可以不用进行验证
-		ctx.set("Access-Control-Max-Age", '3600');
+		// ctx.set("Access-Control-Max-Age", '3600');
 		/*
 		CORS请求时，XMLHttpRequest对象的getResponseHeader()方法只能拿到6个基本字段：
 		    Cache-Control、

package/middleware/waf_ip/index.js

@@ -24,7 +24,8 @@ function setting_blacklist(ip) {
 	var cmd;
 	if (platform == "win32") {
 		// window 系统
-		cmd = `netsh advfirewall firewall add rule name="Blacklist ${ip}" dir=in action=block remoteip="${ip}" protocol=any`
+		cmd =
+			`netsh advfirewall firewall add rule name="Blacklist ${ip}" dir=in action=block remoteip="${ip}" protocol=any`
 	} else {
 		// linux 系统
 		cmd = `sudo iptables -A INPUT -s ${ip} -j DROP`;
@@ -89,7 +90,6 @@ module.exports = function(server, config) {
 				time = now.toStr('yyyy-MM-dd hh:mm:ss');
 			}
 			if (pass) {
-				console.log(ip, num, time, json ? json : '');
 				await $.cache.set("ip_" + ip, JSON.stringify({
 					date,
 					time,

package/middleware/waf_ip/middleware.json

@@ -5,5 +5,6 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "common_before",
-	"sort": 1
+	"sort": 1,
+	"state": 0
 }

package/middleware/web_event/index.js

@@ -48,10 +48,12 @@ class Event {
 		if (config.event && $.event_admin) {
 			// 创建一个API事件
 			var apis = $.event_admin('api', 'API事件');
-			apis.update();
-			for (var k in this.events) {
-				this.events[k] = apis["list_" + k];
+			apis.update_after = () => {
+				for (var k in this.events) {
+					this.events[k] = apis["list_" + k];
+				}
 			}
+			apis.update();
 		};
 
 		/**

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "mm_os",
-  "version": "2.1.9",
+  "version": "2.2.1",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
     "test": "cross-env NODE_ENV=test node ./demo/index.js",
-    "start": "node ./demo/index.js",
+    "start": "node --trace-warnings ./demo/index.js",
     "dev": "cross-env NODE_ENV=development nodemon ./demo/index.js"
   },
   "repository": {
@@ -41,7 +41,7 @@
     "mm_html": "^1.1.6",
     "mm_koa_proxy": "^1.0.0",
     "mm_logs": "^1.1.4",
-    "mm_machine": "^1.6.5",
+    "mm_machine": "^1.7.2",
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
     "mm_mysql": "^1.8.0",