mm_os 2.9.1 → 2.9.3

package/core/com/static/drive.js

@@ -1,7 +1,7 @@
-const Item = require('mm_machine').Item;
-
 const fs = require("fs");
 const send = require('koa-send');
+const conf = require('mm_config');
+const Item = require('mm_machine').Item;
 
 /**
  * Plugin插件驱动类
@@ -15,10 +15,11 @@ class Drive extends Item {
 	 * @param {Object} config 配置
 	 * @constructor
 	 */
-	constructor(dir, config) {
+	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./static.json";
-
+		// 更新并重载
+		this.mode = 3;
 		/* 通用项 */
 		// 配置参数
 		this.config = {
@@ -57,29 +58,6 @@ class Drive extends Item {
 			// 是否将ES6转换AMD
 			"convert_amd": true
 		};
-
-		this.init(config);
-	}
-}
-
-Drive.prototype.init = function(config) {
-	if (config) {
-		$.push(this.config, config);
-		this.dir = config.root.fullname();
-		var f = this.default_file.fullname(this.dir);
-		if (f.hasFile()) {
-			var obj = f.loadJson();
-			if (obj) {
-				this.loadObj(obj);
-			} else {
-				var text = "./config.tpl.json".loadText(__dirname);
-				text = text.replace('"path": "/"', '"path": "' + config.path + '"');
-				f.saveText(text);
-			}
-		}
-	}
-	if (this.config.convert_amd) {
-		this.run_mode(true);
 	}
 }
 
@@ -89,36 +67,17 @@ Drive.prototype.init = function(config) {
 Drive.prototype.send = send;
 
 /**
- * 加载配置对象
- * @param {Object} obj 配置对象
+ * 加载配置对象前
+ * @param {Object} config 配置对象
  */
-Drive.prototype.loadObj = function(obj) {
-	if (obj.maxAge) {
-		obj.maxAge *= 1000;
-	}
-	$.push(this.config, obj, true);
-	var cg = this.config;
-	if (cg.convert_amd) {
-		this.run_mode(true);
-	}
-	var f = cg.func_file;
-	if (f) {
-		var file = f.fullname(this.dir);
-		if (file.hasFile()) {
-			var cs = require(file);
-			if (cs) {
-				var name = cg.func_name;
-				if (name) {
-					this.main = cs[name];
-				} else {
-					$.push(this, cs);
-				}
-			}
-		} else {
-			var fl = __dirname + "/script.js";
-			fl.copyFile(file);
+Drive.prototype.set_config = function(config) {
+	if (config) {
+		if (config.maxAge) {
+			config.maxAge *= 1000;
 		}
 	}
+	this.config = conf(Object.assign({}, this.config, config || {}), this.filename);
+	this.run_mode(this.config.convert_amd);
 };
 
 /**

package/core/com/static/index.js

@@ -21,6 +21,9 @@ class Static extends Index {
 	constructor(scope, title) {
 		super(scope, __dirname);
 		this.Drive = Drive;
+		
+		// 更新并重载
+		this.mode = 3;
 		this.type = "static";
 		this.title = title;
 		var $this = this;
@@ -87,7 +90,7 @@ class Static extends Index {
  * @param {Object} dir 目录
  * @return {Drive} 静态文件驱动类
  */
-Static.prototype.getObj = function(dir) {
+Static.prototype.getObj = async function(dir) {
 	var d = join(dir).replace(process.cwd() + $.slash, '/');
 	var app = d.between(join('app/'), join('/'));
 	var plugin = d.between(join('/plugin/'), join('/'));
@@ -101,14 +104,18 @@ Static.prototype.getObj = function(dir) {
 		root: d.substring(0, d.length - 1).fullname(),
 		path: path
 	};
-	return new Drive(dir, obj);
+	var file = ("./" + this.type + ".json").fullname(obj.root);
+	var drive = new Drive(dir, obj);
+	await drive.exec('load_config', file);
+	await drive.exec('set_config', obj);
+	return drive
 };
 
 /**
  * 加载接口
  * @param {String} path 加载的路径
  */
-Static.prototype.load = function(path) {
+Static.prototype.update_config_all = async function(path) {
 	if (!path) {
 		path = $.runPath + 'app' + $.slash;
 	}
@@ -117,10 +124,11 @@ Static.prototype.load = function(path) {
 	var list_scope = $.dir.getAll(path, search_dir);
 	// 遍历目录路径
 	var _this = this;
-	list_scope.map(function(o) {
-		var obj = _this.getObj(o);
+	for (var i = 0; i < list_scope.length; i++) {
+		var dir = list_scope[i];
+		var obj = await _this.getObj(dir);
 		_this.list.push(obj);
-	});
+	}
 };
 
 /**

package/core/com/task/drive.js

@@ -42,7 +42,10 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./task.json";
-
+		
+		// 更新配置并重载脚本
+		this.mode = 3;
+		
 		/// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
@@ -299,7 +302,9 @@ Drive.prototype.run = async function(func) {
 	if (func) {
 		await this.setInterval(this.setPeriod(this.setNum(func)));
 	} else {
-		await this.setInterval(this.setPeriod(this.setNum(this.main)));
+		await this.setInterval(this.setPeriod(this.setNum(() => {
+			this.main();
+		})));
 	}
 	return this;
 };

package/core/com/task/index.js

@@ -18,6 +18,8 @@ class Task extends Index {
 		this.Drive = Drive;
 		this.type = "task";
 		this.title = title;
+		// 更新配置并重载脚本
+		this.mode = 3;
 	}
 }
 
@@ -31,7 +33,7 @@ Task.prototype.run = async function(name) {
 		for (var i = 0, o; o = lt[i++];) {
 			if (o.config.state === 1 && o.config.name === name) {
 				try {
-					o.run();
+					await o.run();
 				} catch (error) {
 					$.log.error("定时任务错误", o.name, error);
 				}
@@ -42,7 +44,7 @@ Task.prototype.run = async function(name) {
 		for (var i = 0, o; o = lt[i++];) {
 			if (o.config.state === 1) {
 				try {
-					o.run();
+					await o.run();
 				} catch (error) {
 					$.log.error("定时任务错误", o.name, error);
 				}
@@ -57,44 +59,22 @@ Task.prototype.run = async function(name) {
  * @param {Object} cg 配置参数
  * @param {String} file 配置文件
  */
-Task.prototype.load_item = function(dir, cg, file) {
-	var drive = new this.Drive(dir);
-	drive.loadObj(cg);
-	drive.filename = file;
+Task.prototype.load_item = async function(dir, cg, file) {
 	var _this = this;
+	var drive = new this.Drive(dir, this.dir_base.fullname());
+	drive.mode = this.mode;
+	if (cg) {
+		await drive.exec('load_config', file, cg.name);
+		await drive.exec('set_config', cg);
+	} else {
+		await drive.exec('load_config', file);
+	}
+
 	drive.admin = function() {
-		return this;
+		return _this;
 	};
 	this.list.push(drive);
-};
-
-/**
- * 加载列表
- * @param {Array} list 文件列表
- */
-Task.prototype.load_list = function(list) {
-	var _this = this;
-	// 遍历文件路径
-	list.map(function(file) {
-		var dir = file.dirname();
-		// 载入文件
-		var obj = file.loadJson(dir);
-		if (obj) {
-			if (obj.constructor == Array) {
-				obj.map(function(o) {
-					// 实例化一个驱动
-					_this.load_item(dir, o, file);
-				});
-			} else {
-				_this.load_item(dir, obj, file);
-			}
-		} else {
-			var fl = _this.dir_base + "/config.tpl.json";
-			if (fl.hasFile()) {
-				fl.copyFile(file);
-			}
-		}
-	});
+	return drive;
 };
 
 exports.Task = Task;

package/core/com/tpl/com.js

@@ -8,11 +8,11 @@ class Controller extends Base {
 		super();
 
 		// 检索的文件路径
-		this.path = "./apps/controller".fullname();
+		this.path = "./app/controller".fullname();
 		// 文件拓展名
 		this.extension = "controller.json";
 		// 文件存放目录
-		this.dir = "./apps";
+		this.dir = "./app";
 	}
 }
 

package/demo/app/dev/event_api/manage/event.json

@@ -0,0 +1,19 @@
+[{
+	// 目标对象
+	"target": "/apis/dev*",
+	// 事件名称, 用于动态增删改
+	"name": "dev_manage",
+	// 标题, 用于开发者查看事件
+	"title": "示例事件",
+	// 描述, 用于介绍该事件是做什么用的
+	"description": "描述事件使用方法",
+	// 阶段, 分执行前before、验证check、主要main、渲染render、执行后after阶段
+	"stage": "main",
+	"state": 1,
+	// 响应方法 GET请求、POST请求、ALL所有请求，如果非API事件可自定义
+	"method": "ALL",
+	// 函数文件, 当事件触发时执行指定的脚本
+	"func_file": "./main.js",
+	// 执行顺序, 数值越小越优先执行
+	"sort": 100
+}]

package/demo/app/dev/event_api/manage/main.js

@@ -0,0 +1,26 @@
+// 使用api管理器
+var api = $.api_admin('dev_manage', 'dev_manage');
+// 首次启动更新api接口;
+api.update();
+
+// 使用mysql数据库管理器
+var sql = $.mysql_admin('sys', __dirname);
+// sql.setConfig($.config.mysql);
+// sql.open();
+
+/**
+ * @description 接口主函数
+ * @param {Object} ctx HTTP上下文
+ * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+ * @return {Object} 执行结果
+ */
+async function main(ctx, db) {
+	// 使用模板引擎
+	db.tpl = new $.Tpl();
+	
+	// 在这定义要访问的数据库 (分布式开发时设置不同的数据库名)
+	$.push(db, sql.db(), true);
+	return api.run(ctx, db);
+};
+
+exports.main = main;

package/demo/app/dev/plugin/doc/static/api_list.html

@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="zh">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta http-equiv="x-dns-prefetch-control" content="on">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+		<meta name="format-detection" content="telephone=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<meta name="description" content="这是web API文档">
+		<meta name="keywords" content="开发文档">
+		<meta name="author" content="邱文武">
+
+		<!-- 加载CSS样式 -->
+		<link rel="stylesheet" href="/css/font-awesome.min.css" async />
+		<link rel="stylesheet" href="/css/mm_base.css" async />
+		<link rel="stylesheet" href="/css/mm_layout.css" async />
+		<link rel="stylesheet" href="/css/mm_common.css" async />
+		<link rel="stylesheet" href="/css/mm_component.css" async />
+		<link rel="stylesheet" href="/css/mm_theme.css" async />
+
+		<!-- 加载JS脚本 -->
+		<script src="/js/jquery.min.js"></script>
+		<script src="/js/clipboard.min.js" async></script>
+		<script src="/js/vue.js"></script>
+		<script src="/js/mm_sdk.js"></script>
+
+		<title>接口列表</title>
+		<style>
+			body {
+				background: #fff;
+			}
+
+			main {
+				padding: 2rem;
+			}
+
+			#app h4 {
+				padding-bottom: 0.5rem;
+				border-bottom: 1px solid rgba(125, 125, 125, 0.25);
+				margin-bottom: 1rem;
+			}
+
+			.scope_list {
+				padding-left: 2rem;
+			}
+
+			.desc {
+				margin-bottom: 2rem;
+			}
+
+			.mm_btn {
+				border: 1px solid var(--color_border);
+			}
+
+			h4 a {
+				font-size: 0.875rem;
+				padding-top: 0.5rem;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="app">
+			<div class="mm_page">
+				<main>
+					<div class="mm_warp">
+						<h4>API接口文档 —— <span>列表</span> <a class="fr" href="./">选择域</a></h4>
+						<p class="desc">所有的API接口都作用在不同的域下，您可以点击以下域，访问该域下的接口列表</p>
+						<table class="mm_table table-hover" v-if="list.length">
+							<thead>
+								<tr>
+									<th>#</th>
+									<th width="200">名称</th>
+									<th width="200">标题</th>
+									<th>描述</th>
+									<th width="80">操作</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="(o, k) in list" :key="k">
+									<th>{{ k + 1 }}</th>
+									<td><a :href="'./api_view.html?scope=' + query.scope + '&name=' + o.name">{{ o.name }}</a></td>
+									<td>{{ o.title }}</td>
+									<td>{{ o.description }}</td>
+									<td><a class="mm_btn btn_info-x" :href="'./api_view.html?scope=' + query.scope + '&name=' + o.name">查看</a></td>
+								</tr>
+							</tbody>
+						</table>
+						<div v-else class="desc center">
+							该域下没有定义API接口
+						</div>
+					</div>
+				</main>
+			</div>
+		</div>
+		<script>
+			var vue = new Vue({
+				el: '#app',
+				data() {
+					return {
+						url: "/api/dev_api?",
+						query: {
+							scope: "client"
+						},
+						list: []
+					}
+				},
+				methods: {
+					get_list() {
+						var _this = this;
+						$.http.get(this.url + $.toUrl(this.query), function(json, status) {
+							_this.get_list_after(json);
+						});
+					},
+					get_list_after(json) {
+						if (json.result) {
+							var list = this.list;
+							list.clear();
+							list.addList(json.result.list);
+						}
+					}
+				},
+				created() {
+					var arr = location.search.split("&");
+					var len = arr.length;
+					if (len > 0) {
+						for (var i = 0; i < len; i++) {
+							var o = arr[i];
+							if (o.indexOf('scope') !== -1) {
+								var ar = o.split("=");
+								if (ar.length > 1) {
+									this.query.scope = ar[1];
+								}
+							};
+						}
+					}
+					this.get_list();
+				}
+			});
+		</script>
+	</body>
+</html>