mm_os 3.0.1 → 3.0.3

package/core/com/mqtt/index.js

@@ -184,7 +184,9 @@ MQTT.prototype.init = function(config) {
  * @param {Object} config 配置参数
  */
 MQTT.prototype.start = function() {
-	this.start_timer();
+	setTimeout(() => {
+		this.start_timer();
+	}, 2000)
 	this.connecting = true;
 	var err;
 	try {

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.1",
+	"version": "3.0.3",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {