mm_os 3.1.4 → 3.1.7

package/core/com/api/drive.js

@@ -351,7 +351,7 @@ $.get_state = async function(db, token) {
 Drive.prototype.get_state = async function(ctx, db) {
 	var o;
 	// 获取请求参数
-	var u = ctx.session.user;
+	var u = ctx.session ? ctx.session.user : null;
 	if (u) {
 		o = Object.assign({}, u);
 		o.token = ctx.session.uuid;

package/core/com/db/drive.js

@@ -1,5 +1,4 @@
 const Item = require('mm_machine').Item;
-
 const fs = require("fs");
 
 if (!$.dict.user_id) {
@@ -62,9 +61,9 @@ class Drive extends Item {
 			// 字段
 			"fields": [
 				/* */
-			]
+			],
+			"indexes‌": []
 		};
-
 	}
 }
 
@@ -218,6 +217,49 @@ Drive.prototype.model = function(fields) {
 	};
 };
 
+/**
+ * 创建索引字段模型
+ * @param {Object} o
+ * @return {Object} 返回索引模型
+ */
+Drive.prototype.model_index = function(o) {
+	return {
+		"name": o.Key_name,
+		"type": o.Non_unique ? "unique" : "index",
+		"fields": o.Column_name.replace(/`/g, '').split(","),
+		"comment": o.Index_comment
+	}
+}
+
+/**
+ * 从数据库更新索引配置
+ * @param {Object} db 数据库管理器
+ * @return {Array} 索引列表
+ */
+Drive.prototype.update_file_index‌ = function(db) {
+	var sql = "SHOW INDEX FROM `" + this.config.table + "`";
+	var rows = db.run(sql);
+	var dict = {};
+	for (var i = 0; i < rows.length; i++) {
+		var o = rows[i];
+		if (o.Key_name !== 'PRIMARY') {
+			if (!dict[o.Key_name]) {
+				dict[o.Key_name] = {
+					Column_name: []
+				};
+			}
+			dict[o.Key_name].Column_name.push(o.Column_name);
+		}
+	}
+	var list = [];
+	for (var k in dict) {
+		var m = this.model_index(dict[k]);
+		list.push(m);
+	}
+
+	return list;
+}
+
 /**
  * 从数据库更新配置
  * @param {Object} db 数据库管理器
@@ -252,12 +294,35 @@ Drive.prototype.update_file = async function(db, cover) {
 		list.push(field);
 	}
 	cg.fields = list;
+	cg.index‌ = await this.update_file_index‌(db);
 	if (!cg.name) {
 		cg.name = cg.table;
 	}
 	await this.update_app(cover);
 };
 
+/**
+ * @param {Object} db
+ */
+Drive.prototype.update_db_index = async function(db) {
+	var cg = this.config;
+	var indexes = cg.indexes;
+	// 更新索引
+	if (indexes) {
+		var len = indexes.length;
+		for (var i = 0; i < len; i++) {
+			var o = indexes‌[i];
+			var sql_start = "";
+			if (o.type === "unique") {
+				sql_start = "CREATE UNIQUE INDEX `"
+			} else {
+				sql_start = "CREATE INDEX `";
+			}
+			await db.exec(sql_start + o.name + "` ON `" + table + "` (" + o.fields + ");");
+		}
+	}
+}
+
 /**
  * 通过配置更新数据库
  * @param {Object} db 数据库管理器
@@ -267,8 +332,8 @@ Drive.prototype.update_db = async function(db) {
 	var cg = this.config;
 	db.table = cg.table + "";
 	var fields = await db.fields();
+	var table = cg.table;
 	var list = cg.fields;
-
 	if (fields.length === 0) {
 		var k = cg.key;
 		var len = list.length;
@@ -285,7 +350,7 @@ Drive.prototype.update_db = async function(db) {
 	} else {
 		var commit = cg.title + "：" + cg.description;
 		var sql = "alter table `{0}` comment '{1}';".replace('{0}', cg.table).replace('{1}', commit);
-		db.exec(sql);
+		await db.exec(sql);
 	}
 	if (fields.length > 0) {
 		// 删除配置中没有的字段
@@ -397,15 +462,15 @@ Drive.prototype.update_db = async function(db) {
 
 			if (arr.length === 0) {
 				// 如果没有则添加
-				await db.exec("alter table `{0}` add ".replace('{0}', cg.table) + sql);
+				await db.exec("alter table `{0}` add ".replace('{0}', table) + sql);
 			} else {
 				// 如果有则修改
-				await db.exec("alter table `{0}` change `{1}` ".replace('{0}', cg.table).replace('{1}', o
+				await db.exec("alter table `{0}` change `{1}` ".replace('{0}', table).replace('{1}', o
 					.name) + sql);
 			}
 		}
 	} else {
-		return "数据表更新失败！";
+		return "数据表更新失败";
 	}
 };
 
@@ -642,7 +707,8 @@ Drive.prototype.new_sql = async function(client, manage, cover) {
 			if (this.isSet(n, this.query_keyword)) {
 				keyword += " || `" + n + "` like '%{0}%'";
 			}
-		} else if (p === 'date' || p === 'time' || p === 'datetime' || p === 'datetime' || p === 'timestamp') {
+		} else if (p === 'date' || p === 'time' || p === 'datetime' || p === 'datetime' || p ===
+			'timestamp') {
 			query[n + "_min"] = "`" + n + "` >= '{0}'";
 			query[n + "_max"] = "`" + n + "` <= '{0}'";
 		} else if (p !== 'tinyint') {
@@ -714,7 +780,8 @@ Drive.prototype.new_sql = async function(client, manage, cover) {
 		delete m.method;
 		m.field_hide = [];
 		m.name += 2;
-		m.field_obj = m.field_obj.replace(",`time_create`", "").replace(",`time_update`", "").replace(
+		m.field_obj = m.field_obj.replace(",`time_create`", "").replace(",`time_update`", "")
+			.replace(
 				",`create_time`", "")
 			.replace(",`update_time`", "");
 		delete m.query_default;
@@ -1058,7 +1125,8 @@ Drive.prototype.new_api = async function(client, manage, cover) {
 			var has = false;
 			for (var i = 0, item; item = lt[i++];) {
 				var name = item.name;
-				if (name == $.dict.user_id || name === 'uid' || name === 'user_id' || name === 'userid') {
+				if (name == $.dict.user_id || name === 'uid' || name === 'user_id' || name ===
+					'userid') {
 					has = true;
 					break;
 				}

package/core/com/plugin/drive.js

@@ -525,7 +525,7 @@ Drive.prototype.run_chat = async function(from_user, to_user, content, group, ty
 };
 
 /**
- * 压缩主题模板
+ * 压缩插件
  * @param {String} 要压缩的目录
  * @returns {String} 打包成功返回压缩包文件地址
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "3.1.4",
+	"version": "3.1.7",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -30,8 +30,8 @@
 	"author": "邱文武",
 	"license": "ISC",
 	"dependencies": {
-		"compressing": "^1.10.1",
-		"koa": "^2.16.1",
+		"compressing": "^1.10.3",
+		"koa": "^3.0.0",
 		"koa-body": "^6.0.1",
 		"koa-compress": "^5.1.1",
 		"koa-send": "^5.0.1",
@@ -42,7 +42,7 @@
 		"mm_html": "^1.1.7",
 		"mm_koa_proxy": "^1.0.1",
 		"mm_logs": "^1.2.0",
-		"mm_machine": "^2.0.0",
+		"mm_machine": "^2.0.1",
 		"mm_mongodb": "^1.4.4",
 		"mm_mqtt": "^1.0.7",
 		"mm_mysql": "^2.0.2",
@@ -53,6 +53,6 @@
 		"mm_tpl": "^2.4.3",
 		"mm_xml": "^1.1.7",
 		"mosca": "^2.8.3",
-		"mqtt": "^5.11.1"
+		"mqtt": "^5.13.1"
 	}
 }