mm_os 1.5.5 → 1.5.7

package/core/com/api/drive.js

@@ -328,7 +328,6 @@ Drive.prototype.save_file = function(files) {
 	if (files.file) {
 		var f = files.file;
 		// 创建可读流
-		const readStream = fs.createReadStream(f.path);
 		var stamp = Date.now();
 		var name = f.name;
 		file = path.join($.runPath, dir, name);
@@ -375,7 +374,10 @@ $.get_state = async function(db, token) {
 		o.password = o.password ? "******" : "";
 		delete o.salt;
 		delete o.time_create;
-		return { state, user: o };
+		return {
+			state,
+			user: o
+		};
 	} else {
 		return null;
 	}
@@ -714,4 +716,4 @@ Drive.prototype.runRPC = async function(db, method, query, body) {
 	return ret;
 };
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/sql/drive.js

@@ -18,9 +18,9 @@ class Drive extends Item {
 		super(dir, __dirname);
 		this.default_file = "./sql.json";
 		// 保存文件目录
-		this.save_dir = '/static/doc/';
+		this.save_dir = '/static/file/';
 		// 读取文件目录
-		this.url_path = "/doc/";
+		this.url_path = "/file/";
 
 		/* 通用项 */
 		// 配置参数
@@ -623,7 +623,13 @@ Drive.prototype.get_format = async function(db) {
 		if (o.table) {
 			if (!o.list || o.list.length == 0) {
 				dbs.table = o.table;
-				o.list = await dbs.getSql(o.where, null, o.key + "," + o.name);
+				var list = await dbs.getSql(o.where, null, o.id + "," + o.name);
+				if (o.id !== o.key) {
+					o.list = list.map((m) => {
+						m[o.key] = m[o.id];
+						return m;
+					});
+				}
 			}
 		}
 	}

package/package.json

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