mm_os 1.6.1 → 1.6.3

package/core/com/api/drive.js

@@ -12,9 +12,6 @@ if (!$.dict) {
 	}
 }
 
-var dir = '/app/sys/static/doc/';
-var url_path = "/sys/doc/";
-
 /**
  * Api接口驱动类
  * @extends {Item}
@@ -29,7 +26,10 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./api.json";
-
+		
+		this.save_dir = '/static/file/';
+		this.url_path = "/file/";
+		
 		// oauth身份验证配置 + 函数
 		this.oauth;
 		// param参数配置 + 函数
@@ -329,20 +329,17 @@ Drive.prototype.save_file = function(files) {
 		var f = files.file;
 		// 创建可读流
 		var stamp = Date.now();
-		var name = f.name;
-		file = path.join($.runPath, dir, name);
-		const fileDir = path.join($.runPath, dir);
-		if (!fs.existsSync(fileDir)) {
-			fs.mkdirSync(fileDir, err => {
-				$.log.error('创建失败', err);
-			});
-		}
+		var name = f.name || f.originalFilename;
+		file = ("./" + name).fullname(this.save_dir);
+		file.addDir();
 		// 创建写入流
+		var readStream = fs.createReadStream(f.filepath);
+		
 		try {
 			const writeStream = fs.createWriteStream(file);
 			readStream.pipe(writeStream);
 			// writeStream.close();
-			url = url_path + name;
+			url = this.url_path + name;
 		} catch (err) {
 			$.log.error('保存文件失败', err);
 		}

package/core/com/sql/drive.js

@@ -661,6 +661,7 @@ Drive.prototype.get_format = async function(db) {
 Drive.prototype.import_main = async function(db, file) {
 	var params = await this.get_params(db);
 	var format = await this.get_format(db);
+	
 	file = file.replace(this.url_path, this.save_dir);
 	var path;
 	if ($.config.path) {
@@ -700,7 +701,7 @@ Drive.prototype.import_main = async function(db, file) {
 			var o = jarr[i];
 			var qy = {};
 			qy[key] = o[key];
-			var n = await db.set(qy, o);
+			var n = await db.addOrSet(qy, o);
 			if (n < 1) {
 				errors.push(db.error);
 				list_error.push(o);
@@ -787,8 +788,6 @@ Drive.prototype.export_main = async function(db, query, body) {
 		fields = query.field;
 	}
 	var params = await this.get_params(db, fields);
-
-	console.log("参数", params, fields);
 	var format = await this.get_format(db);
 
 	file = file.fullname(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "koa-send": "^5.0.1",
     "koa-websocket": "^7.0.0",
     "mm_check": "^1.4.4",
-    "mm_excel": "^1.0.9",
+    "mm_excel": "^1.1.1",
     "mm_expand": "^1.5.6",
     "mm_html": "^1.1.1",
     "mm_koa_proxy": "^1.0.0",