mm_os 2.7.0 → 2.7.2

package/cache/test/main/config.json

@@ -0,0 +1,7 @@
+{
+    "appId": "",
+    "AppSecret": "ufQBwiUG2oaM9wjWJ6tgUI6uiWK9yncR1",
+    "token": "w14e85M4Mj6egshfKc3wADq1KMP87Qi3",
+    "intents": "",
+    "sandbox": false
+}

package/core/com/mqtt/index.js

@@ -34,6 +34,7 @@ class MQTT extends Index {
 			publish_qos: 1,
 			username: "de",
 			password: "asd123",
+			table: "iot_device",
 			clean: false,
 			longtime: 15000,
 			// 在线有效期时长判断 单位：毫秒，150000毫秒为2.5分钟
@@ -428,7 +429,7 @@ MQTT.prototype.save_online = async function(arr, online = 1) {
 	var sql = $.mysql_admin('sys');
 	sql.open();
 	var db = sql.db();
-	db.table = "face_device";
+	db.table = this.config.table || "iot_device";
 	db.size = 0;
 	var query = {};
 	if (arr) {
@@ -444,7 +445,7 @@ MQTT.prototype.get_drives = async function() {
 	var sql = $.mysql_admin('sys');
 	sql.open();
 	var db = sql.db();
-	db.table = "face_device";
+	db.table = this.config.table || "iot_device";
 	db.size = 0;
 	return await db.get({}, "", "clientid, online");
 }

package/core/com/plugin/drive.js

@@ -66,6 +66,8 @@ class Drive extends Item {
 			// 配置
 			"options": []
 		};
+		// 配置
+		this.options = {};
 	}
 }
 
@@ -74,7 +76,9 @@ class Drive extends Item {
  * @param {Object} config 配置
  */
 Drive.prototype.set_config = function(config) {
-	this.config = conf(Object.assign({}, this.config, config || {}), this.filename);
+	var file = this.filename;
+	var cg = Object.assign({}, this.config, config || {});
+	this.config = conf(cg, file);
 	this.set_config_after();
 }
 
@@ -88,6 +92,9 @@ Drive.prototype.set_config_after = function() {
 	this.log = new Log({
 		filename
 	});
+	var options = this.get_config_options();
+	this.options = this.merge_options(options);
+	this.backup_options();
 }
 
 /**
@@ -114,7 +121,6 @@ Drive.prototype.update_options = function(options = []) {
 			Object.assign(obj, o);
 		} else {
 			list.push(o);
-			// options.splice(i, 1);
 		}
 	}
 	for (var i = 0; i < options.length; i++) {
@@ -138,6 +144,14 @@ Drive.prototype.update_options_after = function(options) {
  * @return {Object} 返回配置参数
  */
 Drive.prototype.get_options = function() {
+	return this.options;
+}
+
+/**
+ * 获取配置参数
+ * @return {Object} 返回配置参数
+ */
+Drive.prototype.get_config_options = function() {
 	var op = this.config.options || [];
 	var dict = {};
 	for (var i = 0; i < op.length; i++) {
@@ -148,8 +162,12 @@ Drive.prototype.get_options = function() {
 		} else if (o.type === "boolean") {
 			var val = false;
 			if (o.value) {
-				if (o.value == '1' || o.value == 'true') {
-					val = true;
+				if (typeof(o.value) == "string") {
+					if (o.value == '1' || o.value == 'true') {
+						val = true;
+					}
+				} else if (typeof(o.value) == "boolean") {
+					val = o.value;
 				}
 			}
 			dict[o.name] = val;
@@ -161,6 +179,8 @@ Drive.prototype.get_options = function() {
 			dict[o.name] = o.value.toJSON();
 		} else if (o.value === "null") {
 			dict[o.name] = null;
+		} else if (o.type === "string") {
+			dict[o.name] = o.value || "";
 		} else {
 			dict[o.name] = o.value;
 		}
@@ -168,6 +188,64 @@ Drive.prototype.get_options = function() {
 	return dict;
 }
 
+/**
+ * 获取配置参数
+ * @param {Object} 设置配置
+ * @return {Object} 返回配置参数
+ */
+Drive.prototype.design_option = function(body) {
+	var cg = this.config;
+	if (Array.isArray(body)) {
+		cg.options = body;
+	} else {
+		var options = cg.options || [];
+		var option = options.getObj({
+			name: body.name
+		});
+		if (option) {
+			Object.assign(option, body);
+		} else {
+			options.push(body);
+		}
+		cg.options = options;
+	}
+}
+
+/**
+ * 保存配置
+ */
+Drive.prototype.save_option = function(options) {
+	this.options = options;
+	this.backup_options();
+}
+
+/**
+ * 保存配置
+ */
+Drive.prototype.backup_options = function() {
+	var l = $.slash;
+	var file = "/cache/" + l + l + this.filename.right("app" + l).replaceAll(l + "plugin", "").replace(".json",
+		"/config.json");
+	file = file.fullname();
+	file.addDir();
+	file.saveJson(this.options);
+}
+
+/**
+ * 合并配置
+ * @param {Object} cg 配置
+ */
+Drive.prototype.merge_options = function(options) {
+	var l = $.slash;
+	var file = "/cache/" + l + l + this.filename.right("app" + l).replaceAll(l + "plugin", "").replace(".json",
+		"/config.json");
+	var options_cache = file.loadJson();
+	if (options_cache) {
+		$.push(options, options_cache);
+	}
+	return options;
+}
+
 /**
  * 新建脚本
  * @param {String} 文件

package/demo/app/test/plugin/main/api_demo_client/test/index.js

@@ -48,7 +48,7 @@ async function main(ctx, db) {
 	// var plus = $.plugin_admin('test');
 	// plus.run("main", "start");
 	// plus.run("main", "stop");
-	// var ret = await this.sql.run(query, body, db);
+	var ret = await this.sql.run(query, body, db);
 	return ret;
 };
 

package/demo/config/development.json

@@ -72,7 +72,9 @@
 		// MQTT服务器密码
 		"password": "asd123",
 		// MQTT端口号
-		"port": 1883
+		"port": 1883,
+		// 连接的数据表
+		"table": "face_device"
 	},
 	"mysql": {
 		// 服务器地址

package/demo/config/local.json

@@ -72,7 +72,10 @@
 		"username": "server",
 		// MQTT服务器密码
 		"password": "asd123",
-		"port": 1883
+		// MQTT端口号
+		"port": 1883,
+		// 连接的数据表
+		"table": "face_device"
 	},
 	"mysql": {
 		// 服务器地址

package/middleware/waf_ip/index.js

@@ -7,13 +7,17 @@ const platform = os.platform();
 /**
  * 获取客户端IP
  * @param {Object} req 请求对象
- * 
+ * @returns {String} 返回真实IP
  */
 function getClientIP(req) {
-	return req.headers['x-forwarded-for'] || req.headers['X-Forwarded-For'] ||
+	var ip = req.headers['x-forwarded-for'] || req.headers['X-Forwarded-For'] || req.headers['x-real-ip'] ||
 		req.connection.remoteAddress ||
 		req.socket.remoteAddress ||
 		req.connection.socket.remoteAddress;
+	if (ip && ip.split(',').length > 0) {
+		ip = ip.split(',')[0]; // 取第一个IP地址
+	}
+	return ip;
 };
 
 /**
@@ -99,6 +103,8 @@ module.exports = function(server, config) {
 					time,
 					num
 				}), duration);
+				ctx.request.ip = ip;
+				ctx.ip = ip;
 				await next();
 			} else {
 				ctx.status = 429;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "mm_machine": "^1.8.1",
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
-    "mm_mysql": "^1.8.8",
+    "mm_mysql": "^1.8.9",
     "mm_os": "^2.6.4",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",