feat(@142vip/egg-mysql): mysql实例自动加载

Author: mmdapl

packages/egg-mysql/agent.js

@@ -1,27 +1,16 @@
-const { registerPlugin } = require('@142vip/egg')
-const { RegisterEggPluginName } = require('@142vip/egg')
-const { createMysqlInstance } = require('./core/mysql')
+const { RegisterEggPluginName, EggPluginBoot } = require('@142vip/egg')
+const { createEggMysqlInstance } = require('./core/mysql')
 
 /**
  * agent启动器
  */
-class EggMysqlAgentBoot {
+class EggMysqlAgentBoot extends EggPluginBoot {
   constructor(agent) {
-    this.agent = agent
-  }
-
-  configWillLoad() {
-    console.log(this.agent)
-  }
-
-  configDidLoad() {
-  }
-
-  async didLoad() {
-    // 所有文件已加载，此时可以启动插件。
-    if (this.agent.config[RegisterEggPluginName.EGG_MYSQL]) {
-      registerPlugin(RegisterEggPluginName.EGG_MYSQL, this.agent, createMysqlInstance)
-    }
+    super({
+      pluginName: RegisterEggPluginName.EGG_MYSQL,
+      appOrAgent: agent,
+      createEggPluginInstance: createEggMysqlInstance,
+    })
   }
 }
 

packages/egg-mysql/app.js

@@ -1,45 +1,13 @@
-const { registerPlugin } = require('@142vip/egg')
-const { RegisterEggPluginName } = require('@142vip/egg')
-const { createMysqlInstance } = require('./core/mysql')
+const { RegisterEggPluginName, EggPluginBoot } = require('@142vip/egg')
+const { createEggMysqlInstance } = require('./core/mysql')
 
-class EggMysqlAppBoot {
+class EggMysqlAppBoot extends EggPluginBoot {
   constructor(app) {
-    this.app = app
-  }
-
-  configWillLoad() {
-    // 预备调用 configDidLoad，
-    // Config 和 plugin 文件已被引用，
-    // 这是修改配置的最后机会。
-    console.log(this.app)
-  }
-
-  configDidLoad() {
-    // Config 和 plugin 文件已加载。
-  }
-
-  async didLoad() {
-    // 所有文件已加载，此时可以启动插件。
-    if (this.app.config[RegisterEggPluginName.EGG_MYSQL]) {
-      console.log(111, this.app.config.mysql)
-      registerPlugin(RegisterEggPluginName.EGG_MYSQL, this.app, createMysqlInstance)
-    }
-  }
-
-  async willReady() {
-    // 所有插件已启动，这里可以执行一些在应用准备好之前的操作。
-  }
-
-  async didReady() {
-    // Worker 已准备好，可以执行一些不会阻塞应用启动的操作。
-  }
-
-  async serverDidReady() {
-    // 服务器已监听。
-  }
-
-  async beforeClose() {
-    // 应用关闭前执行的操作。
+    super({
+      pluginName: RegisterEggPluginName.EGG_MYSQL,
+      appOrAgent: app,
+      createEggPluginInstance: createEggMysqlInstance,
+    })
   }
 }
 

packages/egg-mysql/core/mysql.js

@@ -1,6 +1,5 @@
 const { VipEggPluginLogger } = require('@142vip/egg')
 const mysql = require('mysql2/promise')
-const { name: pkgName } = require('../package.json')
 const { createDataBase } = require('./database')
 
 async function creatPool(config) {
@@ -27,19 +26,20 @@ async function creatPool(config) {
 /**
  * 创建MySQL实例
  */
-function createMysqlInstance(config, app) {
-  const pluginLogger = VipEggPluginLogger.getInstance(pkgName, app)
-
+async function createEggMysqlInstance(pluginConfig, app) {
+  const pluginLogger = VipEggPluginLogger.getInstance(pluginConfig, app)
   try {
-    const client = creatPool(config)
-    pluginLogger.info(`DataBase create success , the name is ${config.database}`)
+    const client = await creatPool(pluginConfig)
+    pluginLogger.info(`dataBase create success , the name is ${pluginConfig.database}`)
     return client
   }
+
   catch (e) {
-    pluginLogger.error(`DataBase create failed ，check egg-sequelize-plus config carefully ${e.message}`)
+    pluginLogger.error(`dataBase create failed,check config carefully!!!!`)
+    pluginLogger.error(e.message)
   }
 }
 
 module.exports = {
-  createMysqlInstance,
+  createEggMysqlInstance,
 }