mm_machine 1.6.8 → 1.7.0

package/demo/test1/index.js

@@ -1,11 +1,20 @@
 
 var i = 0;
 function test() {
-	console.log("你好123", i++)
+	console.log("你好7654321", i++)
 }
 
 function main() {
 	test();
+	return i;
 }
 
-exports.main = main;
+exports.main = main;
+
+exports.main_before = function(){
+	console.log("请求前")
+}
+
+exports.main_after = function(ret){
+	console.log("请求后", ret)
+}

package/demo/test2/index.js

@@ -3,7 +3,7 @@ class Demo {
 }
 var i = 0;
 Demo.prototype.main = function() {
-	console.log("我很好123", i++);
+	console.log("我很好7654321", i++);
 }
 
 module.exports = new Demo();

package/demo2/test1/index.js

@@ -1,11 +1,20 @@
-
 var i = 0;
+
 function test() {
 	console.log("你好123", i++)
 }
 
 function main() {
 	test();
+	return i;
+}
+
+exports.main = main;
+
+exports.main_before = function() {
+	console.log("请求前")
 }
 
-exports.main = main;
+exports.main_after = async function(ret) {
+	console.log("请求后", ret)
+}

package/index.js

@@ -314,7 +314,7 @@ Item.prototype.save = function() {
  * @param {Object} param1 参数一
  * @param {Object} param2 参数二
  */
-Item.prototype.main = function(param1, param2) {
+Item.prototype.main = async function(...params) {
 	return null;
 };
 
@@ -324,9 +324,22 @@ Item.prototype.main = function(param1, param2) {
  * @param {Object} params 参数集合
  * @return {Object} 执行结果
  */
-Item.prototype.run = function(method, ...params) {
+Item.prototype.run = async function(method, ...params) {
 	if (this.config.state && this[method]) {
-		return this[method](...params);
+		if (this[method + "_before"]) {
+			this[method + "_before"](...params);
+		}
+		var ret = this[method](...params);
+		if (util.types.isPromise(ret)) {
+			ret = await ret;
+		}
+		if (this[method + "_after"]) {
+			ret = this[method + "_after"](ret, ...params) || ret;
+		}
+		if (util.types.isPromise(ret)) {
+			ret = await ret;
+		}
+		return ret
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_machine",
-    "version": "1.6.8",
+    "version": "1.7.0",
     "description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
     "main": "index.js",
     "scripts": {