mm_os 3.0.2 → 3.0.4

package/core/com/app/drive.js

@@ -210,8 +210,6 @@ Drive.prototype.start_after = async function(opiton) {
 		var o = list[i];
 		if (o.config.state) {
 			await o.run('start');
-			// 等待0.5秒
-			await $.sleep(500);
 		}
 	}
 	return msg;

package/core/com/mqtt/index.js

@@ -43,11 +43,10 @@ class MQTT extends Index {
 			online_expires: 150000,
 			// 在线有效期检测间隔
 			online_interval: 10000,
-			// 连接超时
-			connectTimeout: 6000,
+			// 连接超时 
+			connectTimeout: 30000,
 			// maxInflight: 20,
 			// 重连间隔
-			// interval: 6000,
 			reconnectPeriod: 6000 // 重连间隔1秒
 		}
 		// 定时器

package/core/com/mqtt/mm_mqtt.js

@@ -24,8 +24,10 @@ class MM_mqtt {
 			topic_receive: "client/message/",
 			longtime: 15000,
 			// maxInflight: 20,
-			// 重连间隔
-			interval: 6000
+			 // 重连间隔时间，单位为毫秒, 默认6秒
+			reconnectPeriod: 6000,
+			 // 连接超时时间，单位为毫秒, 默认30秒, 即尝试连接5次
+			connectTimeout: 30000
 		}, config);
 
 		// mqtt客户端服务器
@@ -79,8 +81,9 @@ MM_mqtt.prototype.reconnect = function() {
 	if (this.retryTimes > 5) {
 		try {
 			this.client.end();
-			$.sleep(this.config.interval);
-			this.init();
+			setTimeout(() => {
+				this.init();
+			}, this.config.reconnectPeriod);
 		} catch (error) {
 			this.$message.error(error.toString());
 		}
@@ -123,7 +126,7 @@ MM_mqtt.prototype.run = function(config) {
 						resolve(null);
 						reject(err);
 					} else {
-						this.client.on('message', async(topic, message) => {
+						this.client.on('message', async (topic, message) => {
 							await this.receive(topic, message.toString());
 						});
 						resolve(packet);

package/index.js

@@ -90,9 +90,9 @@ OS.prototype.initData = function(config) {
 	} else if (p.substring(p.length - 1) !== $.slash) {
 		config.runPath += $.slash;
 	}
-	
+
 	$.runPath = config.runPath;
-	
+
 	// 初始化公共函数
 	$.func = {};
 
@@ -151,9 +151,6 @@ OS.prototype.loadModule = function(cg) {
 	$.sql = $.mysql_admin('sys', $.runPath);
 	if (cg.mysql) {
 		$.sql.setConfig(cg.mysql);
-		if (cg.mysql.state) {
-			$.sql.open();
-		}
 	}
 
 	if (!cg.sys.hot_reload) {
@@ -201,8 +198,6 @@ OS.prototype.initBase = function(cg) {
 		this.mqtt = mqtt;
 	}
 
-	// 启动计时器
-	$.timer.run();
 }
 
 /**
@@ -210,6 +205,9 @@ OS.prototype.initBase = function(cg) {
  * @param {String} state 状态
  */
 OS.prototype.main = async function(state) {
+	// 启动计时器
+	$.timer.run();
+
 	var cg = this.config;
 	var web_server = this.web_server;
 	var mqtt_server = this.mqtt_server;
@@ -243,6 +241,10 @@ OS.prototype.main = async function(state) {
  * @param {String} state 状态
  */
 OS.prototype.before = async function(state) {
+	var mysql = this.config.mysql;
+	if (mysql && mysql.state) {
+		await $.sql.open();
+	}
 	this.app = $.app_admin('sys');
 	await this.app.update();
 	await this.app.exec(null, 'init');

package/package.json

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