mm_os 2.8.7 → 2.8.9

package/core/base/mqtt/lib.js

@@ -1,40 +1,40 @@
-var urilib = require('url');
-var scanSchema = require('jsonschema/lib/scan').scan;
-var Validator = require("jsonschema/lib/validator.js");
-var helpers = require('jsonschema/lib/helpers');
-var SchemaContext = helpers.SchemaContext;
-var anonymousBase = '/';
-
-// 重构校验函数，解决error问题
-Validator.prototype.validate = function validate(instance, schema, options, ctx) {
-	if (!options) {
-		options = {};
-	}
-	// This section indexes subschemas in the provided schema, so they don't need to be added with Validator#addSchema
-	// This will work so long as the function at uri.resolve() will resolve a relative URI to a relative URI
-	var id = schema.$id || schema.id;
-	var base = urilib.resolve(options.base || anonymousBase, id || '');
-	if (!ctx) {
-		ctx = new SchemaContext(schema, options, [], base, Object.create(this.schemas));
-		if (!ctx.schemas[base]) {
-			ctx.schemas[base] = schema;
-		}
-		var found = scanSchema(base, schema);
-		for (var n in found.id) {
-			var sch = found.id[n];
-			ctx.schemas[n] = sch;
-		}
-	}
-	if (options.required && instance === undefined) {
-		var result = new ValidatorResult(instance, schema, options, ctx);
-		result.addError('is required, but is undefined');
-		return result;
-	}
-	var result = this.validateSchema(instance, schema, options, ctx);
-	if (!result) {
-		throw new Error('Result undefined');
-	} else if (options.throwAll && result.errors.length) {
-		throw new ValidatorResultError(result);
-	}
-	return result;
+var urilib = require('url');
+var scanSchema = require('jsonschema/lib/scan').scan;
+var Validator = require("jsonschema/lib/validator.js");
+var helpers = require('jsonschema/lib/helpers');
+var SchemaContext = helpers.SchemaContext;
+var anonymousBase = '/';
+
+// 重构校验函数，解决error问题
+Validator.prototype.validate = function validate(instance, schema, options, ctx) {
+	if (!options) {
+		options = {};
+	}
+	// This section indexes subschemas in the provided schema, so they don't need to be added with Validator#addSchema
+	// This will work so long as the function at uri.resolve() will resolve a relative URI to a relative URI
+	var id = schema.$id || schema.id;
+	var base = urilib.resolve(options.base || anonymousBase, id || '');
+	if (!ctx) {
+		ctx = new SchemaContext(schema, options, [], base, Object.create(this.schemas));
+		if (!ctx.schemas[base]) {
+			ctx.schemas[base] = schema;
+		}
+		var found = scanSchema(base, schema);
+		for (var n in found.id) {
+			var sch = found.id[n];
+			ctx.schemas[n] = sch;
+		}
+	}
+	if (options.required && instance === undefined) {
+		var result = new ValidatorResult(instance, schema, options, ctx);
+		result.addError('is required, but is undefined');
+		return result;
+	}
+	var result = this.validateSchema(instance, schema, options, ctx);
+	if (!result) {
+		throw new Error('Result undefined');
+	} else if (options.throwAll && result.errors.length) {
+		throw new ValidatorResultError(result);
+	}
+	return result;
 };

package/core/base/web/index.js

@@ -1,110 +1,110 @@
-const Koa = require('koa');
-
-/**
- * Web http 通讯类
- */
-class WEB {
-	/**
-	 * 构造函数
-	 * @param {Object} config 配置参数
-	 */
-	constructor(config) {
-		/**
-		 * 配置参数
-		 */
-		this.config = Object.assign({
-			// 访问地址
-			"host": "0.0.0.0",
-			// 访问端口号
-			"port": 5000,
-			// 是否启用websocket
-			"socket": true,
-			// 是否启用压缩
-			"compress": true,
-			// 是否启用事件
-			"event": true,
-			// 是否启用事件
-			"log": true,
-			// 是否启用静态文件
-			"static": true,
-			// 静态文件路径
-			"static_path": "./static".fullname($.runPath),
-			// 代理转发
-			"proxy": {}
-		}, config);
-
-		/**
-		 * web服务器
-		 */
-		this.server = null;
-		this.list = [];
-	}
-}
-
-/**
- * 初始化
- * @param {Object} config
- */
-WEB.prototype.init = function(config) {
-	if (config) {
-		this.config = Object.assign(this.config, config);
-	}
-	this.server = new Koa();
-	return this;
-};
-
-/**
- * 引用
- * @param {Function} 函数
- */
-WEB.prototype.use = function(func) {
-	this.server.use(func);
-};
-
-/**
- * 运行主程序
- * @param {String} state 状态
- */
-WEB.prototype.main = function(state) {
-	var cg = this.config;
-	var host = cg.host;
-	if (host == '0.0.0.0') {
-		host = '127.0.0.1'
-	}
-	this.server.listen(cg.port, cg.host, () => {
-		console.info(`HTTP访问 http://${host}:${cg.port}`);
-	});
-};
-
-/**
- * 运行主程序前
- * @param {String} state 状态
- */
-WEB.prototype.before = async function(state) {
-	var list = this.list;
-	for (var i = 0; i < list.length; i++) {
-		var o = list[i];
-		o.func = require(o.func_file);
-		if (o.func) {
-			o.func(this.server, this.config);
-		}
-	}
-};
-
-/**
- * 运行主程序后
- * @param {String} state 状态
- */
-WEB.prototype.after = async function(state) {};
-
-/**
- * 运行
- * @param {String} state 状态
- */
-WEB.prototype.run = async function(state = 'start') {
-	await this.before(state);
-	await this.main(state);
-	await this.after(state);
-};
-
+const Koa = require('koa');
+
+/**
+ * Web http 通讯类
+ */
+class WEB {
+	/**
+	 * 构造函数
+	 * @param {Object} config 配置参数
+	 */
+	constructor(config) {
+		/**
+		 * 配置参数
+		 */
+		this.config = Object.assign({
+			// 访问地址
+			"host": "0.0.0.0",
+			// 访问端口号
+			"port": 5000,
+			// 是否启用websocket
+			"socket": true,
+			// 是否启用压缩
+			"compress": true,
+			// 是否启用事件
+			"event": true,
+			// 是否启用事件
+			"log": true,
+			// 是否启用静态文件
+			"static": true,
+			// 静态文件路径
+			"static_path": "./static".fullname($.runPath),
+			// 代理转发
+			"proxy": {}
+		}, config);
+
+		/**
+		 * web服务器
+		 */
+		this.server = null;
+		this.list = [];
+	}
+}
+
+/**
+ * 初始化
+ * @param {Object} config
+ */
+WEB.prototype.init = function(config) {
+	if (config) {
+		this.config = Object.assign(this.config, config);
+	}
+	this.server = new Koa();
+	return this;
+};
+
+/**
+ * 引用
+ * @param {Function} 函数
+ */
+WEB.prototype.use = function(func) {
+	this.server.use(func);
+};
+
+/**
+ * 运行主程序
+ * @param {String} state 状态
+ */
+WEB.prototype.main = function(state) {
+	var cg = this.config;
+	var host = cg.host;
+	if (host == '0.0.0.0') {
+		host = '127.0.0.1'
+	}
+	this.server.listen(cg.port, cg.host, () => {
+		console.info(`HTTP访问 http://${host}:${cg.port}`);
+	});
+};
+
+/**
+ * 运行主程序前
+ * @param {String} state 状态
+ */
+WEB.prototype.before = async function(state) {
+	var list = this.list;
+	for (var i = 0; i < list.length; i++) {
+		var o = list[i];
+		o.func = require(o.func_file);
+		if (o.func) {
+			o.func(this.server, this.config);
+		}
+	}
+};
+
+/**
+ * 运行主程序后
+ * @param {String} state 状态
+ */
+WEB.prototype.after = async function(state) {};
+
+/**
+ * 运行
+ * @param {String} state 状态
+ */
+WEB.prototype.run = async function(state = 'start') {
+	await this.before(state);
+	await this.main(state);
+	await this.after(state);
+};
+
 module.exports = WEB;

package/core/com/mqtt/index.js

@@ -426,9 +426,7 @@ MQTT.prototype.save_online = async function(arr, online = 1) {
 	var body = {
 		online
 	}
-	var sql = $.mysql_admin('sys');
-	sql.open();
-	var db = sql.db();
+	var db = $.sql.db();
 	db.table = this.config.table || "iot_device";
 	db.size = 0;
 	var query = {};
@@ -442,9 +440,7 @@ MQTT.prototype.save_online = async function(arr, online = 1) {
  * 获取所有设备
  */
 MQTT.prototype.get_drives = async function() {
-	var sql = $.mysql_admin('sys');
-	sql.open();
-	var db = sql.db();
+	var db = $.sql.db();
 	db.table = this.config.table || "iot_device";
 	db.size = 0;
 	return await db.get({}, "", "clientid, online");