q-koa 7.7.3 → 7.7.8

package/core/app.js

@@ -3,6 +3,7 @@ const Router = require('koa-router')
 const _ = require('lodash')
 const path = require('path')
 const fs = require('fs')
+const fsPromise = require('fs/promises')
 const Sequelize = require('sequelize')
 const moment = require('moment')
 const { EventEmitter } = require('events')
@@ -242,7 +243,7 @@ class APP {
     //   console.log(content);
     // });
 
-    starter.on('loadAll', () => {
+    starter.on('loadAll', async () => {
       const appName = this.config.includes[0]
       this.server = this.app.listen(this.port, () => {
         console.log(`server is running at http://localhost:${this.port}`)
@@ -261,7 +262,7 @@ class APP {
             appName: appName,
           })
         } else {
-          fs.writeFileSync(
+          await fsPromise.writeFile(
             `${rootDirectory}/${APP_DIR}/${appName}/${PLUGINS_DIR}/model/service.js`,
             ''
           )
@@ -294,7 +295,7 @@ class APP {
   }
 
   async initApp() {
-    let dirList = fs.readdirSync(
+    let dirList = await fsPromise.readdir(
       path.resolve(__dirname, `${rootDirectory}/${APP_DIR}`)
     )
     dirList = dirList.filter((item) => this.config.includes.includes(item))
@@ -359,7 +360,7 @@ class APP {
           this.initFile(appName)
         }
 
-        this.initPlugin(appName)
+        await this.initPlugin(appName)
         this.app[appName].event = new EventEmitter()
 
         const cacheConfig = _.get(this.app[appName], 'appConfig.cache', {
@@ -372,7 +373,7 @@ class APP {
           maxAge: cacheConfig.maxAge,
         })
 
-        this.initModel(appName)
+        await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
         if (taskConfig.is_available) {
           this.initTask(appName)
@@ -421,18 +422,21 @@ class APP {
     }
   }
 
-  initTask(appName) {
+  async initTask(appName) {
     console.log(chalk.red(`启动任务${appName}`))
     const taskDir = path.resolve(
       __dirname,
       `${rootDirectory}/${APP_DIR}/${appName}/task`
     )
     const publicExist = fs.existsSync(taskDir)
-    if (!publicExist) fs.mkdirSync(taskDir)
-    fs.readdirSync(taskDir).forEach((folder) => {
+    if (!publicExist) await fsPromise.mkdir(taskDir)
+    const list = await fsPromise.readdir(taskDir)
+    for (let i = 0; i < list.length; i++) {
+      const folder = list[i]
       const isFolder = fs.lstatSync(path.resolve(taskDir, folder)).isDirectory()
       if (isFolder) {
-        fs.readdirSync(path.resolve(taskDir, folder)).forEach((filename) => {
+        const folderDir = await fsPromise.readdir(path.resolve(taskDir, folder))
+        folderDir.forEach((filename) => {
           if (filename === 'index.js') {
             const task = require(path.resolve(
               __dirname,
@@ -447,23 +451,27 @@ class APP {
           }
         })
       }
-    })
+    }
   }
 
-  initPlugin(appName) {
+  async initPlugin(appName) {
     const pluginDir = path.resolve(
       __dirname,
       `${rootDirectory}/${APP_DIR}/${appName}/${PLUGINS_DIR}`
     )
     const publicExist = fs.existsSync(pluginDir)
-    if (!publicExist) fs.mkdirSync(pluginDir)
-
-    fs.readdirSync(pluginDir).forEach((folder) => {
+    if (!publicExist) await fsPromise.mkdir(pluginDir)
+    const pluginDirResult = await fsPromise.readdir(pluginDir)
+    for (let i = 0; i < pluginDirResult.length; i++) {
+      const folder = pluginDirResult[i]
       const isFolder = fs
         .lstatSync(path.resolve(pluginDir, folder))
         .isDirectory()
       if (isFolder) {
-        fs.readdirSync(path.resolve(pluginDir, folder)).forEach((filename) => {
+        const folderResult = await fsPromise.readdir(
+          path.resolve(pluginDir, folder)
+        )
+        folderResult.forEach((filename) => {
           const extname = path.extname(filename)
           if (extname === '.js') {
             const n = path.basename(filename, extname)
@@ -658,7 +666,7 @@ class APP {
           }
         })
       }
-    })
+    }
   }
 
   initModel(appName) {

package/core/file/plugins/administrator/controller.js

@@ -1,4 +1,4 @@
-const { getAppByCtx } = require('multiple-quick-koa')
+const { getAppByCtx } = require('q-koa')
 const md5 = require('js-md5')
 
 const superAdmin = {

package/core/file/plugins/administrator/model.js

@@ -1,5 +1,5 @@
-const { Sequelize, Random } = require('multiple-quick-koa');
-const md5 = require('js-md5');
+const { Sequelize, Random } = require('q-koa')
+const md5 = require('js-md5')
 
 exports.name = {
   type: Sequelize.STRING,
@@ -9,7 +9,7 @@ exports.name = {
   defaultValue: '',
   sortOrder: 1,
   mock: () => Random.cword(5),
-};
+}
 
 exports.password = {
   type: Sequelize.STRING,
@@ -21,7 +21,7 @@ exports.password = {
   set: function (value) {
     this.setDataValue('password', md5(value))
   },
-};
+}
 
 exports.role_id = {
   type: Sequelize.MEDIUMINT.UNSIGNED,
@@ -30,8 +30,7 @@ exports.role_id = {
   is_mock: false,
   defaultValue: 0,
   sortOrder: 3,
-  
-};
+}
 
 exports.query = {
   type: Sequelize.JSON,
@@ -40,8 +39,7 @@ exports.query = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 4,
-};
-
+}
 
 exports.post = {
   type: Sequelize.JSON,
@@ -50,4 +48,4 @@ exports.post = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 5,
-};
+}

package/core/file/plugins/administrator/validate.js

@@ -1,4 +1,4 @@
-const { Validator, getAppByCtx } = require('multiple-quick-koa')
+const { Validator, getAppByCtx } = require('q-koa')
 
 exports.login = async (ctx) => {
   const params = {

package/core/file/plugins/alipay/controller.js

@@ -1,6 +1,6 @@
 const Alipay = require('../../services/alipay')
 
-const { getAppByCtx, getConfig } = require('multiple-quick-koa')
+const { getAppByCtx, getConfig } = require('q-koa')
 exports.h5_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 

package/core/file/plugins/cloudfunction/model.js

@@ -1,15 +1,15 @@
-const { Sequelize } = require('multiple-quick-koa');
+const { Sequelize } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
   comment: '函数名',
   allowNull: false,
   defaultValue: '',
-};
+}
 
 exports.code_content = {
   type: Sequelize.TEXT,
   comment: '执行程序',
   allowNull: false,
   defaultValue: '',
-};
+}

package/core/file/plugins/common/controller.js

@@ -1,7 +1,8 @@
 const fs = require('fs')
+const fsPromise = require('fs/promises')
 const path = require('path')
 const crypto = require('crypto')
-const { Random, lodash, getAppByCtx, getConfig } = require('multiple-quick-koa')
+const { Random, lodash, getAppByCtx, getConfig } = require('q-koa')
 const Captchapng = require('captchapng')
 const qr = require('qr-image')
 const OSS = require('ali-oss')
@@ -36,7 +37,7 @@ exports.upload = async (ctx) => {
 
   const { site_host } = await appConfig.getObject('base')
 
-  const reader = fs.readFileSync(file.path)
+  const reader = await fsPromise.readFile(file.path)
 
   const fsHash = crypto.createHash('md5')
   fsHash.update(reader)
@@ -66,7 +67,7 @@ exports.upload = async (ctx) => {
   )
   if (isExists) return ctx.SUCCESS(responseData)
 
-  fs.writeFileSync(targetPath, reader)
+  await fsPromise.writeFile(targetPath, reader)
   return ctx.SUCCESS(responseData)
 }
 
@@ -220,7 +221,7 @@ exports.swagger = async (ctx) => {
     `${process.cwd()}/app/${appName}/plugins`
   )
   const apis = []
-  const pathList = fs.readdirSync(filePath)
+  const pathList = await fsPromise.readdir(filePath)
   for (let i = 0; i < pathList.length; i++) {
     const folder = pathList[i]
     const isFolder = fs.lstatSync(path.resolve(filePath, folder)).isDirectory()
@@ -240,7 +241,10 @@ exports.swagger = async (ctx) => {
       const controllerFilePath = path.resolve(filePath, folder, 'controller.js')
       const isControllerExist = fs.existsSync(controllerFilePath)
       if (isControllerExist) {
-        const controllerFile = fs.readFileSync(controllerFilePath, 'utf-8')
+        const controllerFile = await fsPromise.readFile(
+          controllerFilePath,
+          'utf-8'
+        )
         const annotations = controllerFile.match(annotationsReg)
 
         if (annotations) {

package/core/file/plugins/common/validate.js

@@ -1,4 +1,4 @@
-const { Validator } = require('multiple-quick-koa');
+const { Validator } = require('q-koa')
 
 exports.email = async (ctx) => {
   const params = {
@@ -12,24 +12,25 @@ exports.email = async (ctx) => {
       required: true,
       message: '请输入邮件主题',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
-exports.sendMessage = async ctx => {
+exports.sendMessage = async (ctx) => {
   const params = {
     mobile: {
       type: 'string',
       required: true,
       validator: (rule, value) => {
-        return /^[1][1,2,3,4,5,7,8,9][0-9]{9}$/.test(value) ? Promise.resolve() : Promise.reject('请输入正确手机号');
-      }
+        return /^[1][1,2,3,4,5,7,8,9][0-9]{9}$/.test(value)
+          ? Promise.resolve()
+          : Promise.reject('请输入正确手机号')
+      },
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
+  }
+  await new Validator(params).validate(ctx.request.body)
 }
 
-
 exports.schedule = async (ctx) => {
   const params = {
     to: {
@@ -42,6 +43,6 @@ exports.schedule = async (ctx) => {
       required: true,
       message: '请输入邮件主题',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/plugins/douyin/controller.js

@@ -1,10 +1,4 @@
-const {
-  getAppByCtx,
-  getConfig,
-  lodash,
-  moment,
-  getService,
-} = require('multiple-quick-koa')
+const { getAppByCtx, getConfig, lodash, moment, getService } = require('q-koa')
 const util = require('util')
 const axios = require('axios')
 const qr = require('qr-image')

package/core/file/plugins/douyin/validate.js

@@ -1,40 +1,38 @@
-const { Validator } = require('multiple-quick-koa')
+const { Validator } = require('q-koa')
 /**
-* 
-* 详情 https://www.jianshu.com/p/2105c48b45c7
-* 
-*/
-exports.hotVideo = async ctx => {
+ *
+ * 详情 https://www.jianshu.com/p/2105c48b45c7
+ *
+ */
+exports.hotVideo = async (ctx) => {
   const params = {
     word: {
       type: 'string',
       required: true,
       message: '请输入热词',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
-
-exports.videoList = async ctx => {
+exports.videoList = async (ctx) => {
   const params = {
     id: {
       type: 'number',
       required: true,
       message: '请输入id',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
-exports.fansData = async ctx => {
+exports.fansData = async (ctx) => {
   const params = {
     id: {
       type: 'number',
       required: true,
       message: '请输入id',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
-
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/plugins/douyin_user/model.js

@@ -1,4 +1,4 @@
-const { Sequelize } = require('multiple-quick-koa')
+const { Sequelize } = require('q-koa')
 
 exports.openid = {
   type: Sequelize.STRING,

package/core/file/plugins/good_sku/controller.js

@@ -1,4 +1,4 @@
-const { getAppByCtx, lodash } = require('multiple-quick-koa')
+const { getAppByCtx, lodash } = require('q-koa')
 
 exports.update = async (ctx) => {
   const { app } = getAppByCtx(ctx)

package/core/file/plugins/h5_user/model.js

@@ -1,4 +1,4 @@
-const { Sequelize, Random } = require('multiple-quick-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.openid = {
   type: Sequelize.STRING,

package/core/file/plugins/lang/model.js

@@ -1,15 +1,15 @@
-const { Sequelize } = require('multiple-quick-koa');
+const { Sequelize } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
   comment: '名字',
   allowNull: false,
   defaultValue: '',
-};
+}
 
 exports.key = {
   type: Sequelize.STRING,
   comment: 'key',
   allowNull: false,
   defaultValue: '',
-};
+}

package/core/file/plugins/language/model.js

@@ -1,4 +1,4 @@
-const { Sequelize } = require('multiple-quick-koa');
+const { Sequelize } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,
@@ -13,15 +13,14 @@ exports.name = {
       msg: '名字不允许为空',
     },
   },
-};
-
+}
 
 exports.lang_id = {
   type: Sequelize.INTEGER(11),
   comment: '语言',
   allowNull: false,
   defaultValue: 1,
-};
+}
 
 exports.key = {
   type: Sequelize.STRING,
@@ -36,7 +35,7 @@ exports.key = {
       msg: 'key值不允许为空',
     },
   },
-};
+}
 
 exports.value = {
   type: Sequelize.STRING,
@@ -51,4 +50,4 @@ exports.value = {
       msg: 'value值不允许为空',
     },
   },
-};
+}

package/core/file/plugins/log/controller.js

@@ -1,4 +1,4 @@
-const { getAppByCtx } = require('multiple-quick-koa')
+const { getAppByCtx } = require('q-koa')
 
 exports.clearWeixin = async (ctx) => {
   const { app } = getAppByCtx(ctx)

package/core/file/plugins/log/model.js

@@ -1,4 +1,4 @@
-const { Sequelize } = require('multiple-quick-koa')
+const { Sequelize } = require('q-koa')
 
 exports.url = {
   type: Sequelize.STRING,

package/core/file/plugins/model/controller.js

@@ -1,7 +1,8 @@
-const { getAppByCtx, lodash } = require('multiple-quick-koa')
+const { getAppByCtx, lodash } = require('q-koa')
 
 const fs = require('fs')
 const path = require('path')
+const fsPromise = require('fs/promises')
 
 exports.getModel = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -19,7 +20,7 @@ exports.getModel = async (ctx) => {
     )
   )
   if (!existFile) return ctx.SUCCESS('')
-  const file = fs.readFileSync(
+  const file = await fsPromise.readFile(
     path.resolve(
       __dirname,
       `${process.cwd()}/app/${appName}/plugins/${model}/${option}.js`
@@ -54,7 +55,7 @@ exports.createFile = async (ctx) => {
     `${process.cwd()}/app/${appName}/plugins/${plugin}`
   )
   const exist = fs.existsSync(pluginDirPath)
-  if (!exist) fs.mkdirSync(pluginDirPath)
+  if (!exist) await fsPromise.mkdir(pluginDirPath)
   const list = ['config', 'model', 'controller']
 
   for (let i = 0; i < list.length; i++) {
@@ -62,8 +63,10 @@ exports.createFile = async (ctx) => {
     if (!obj[type]) {
       continue
     }
-    fs.writeFileSync(path.resolve(pluginDirPath, `${type}.js`), obj[type])
+    await fsPromise.writeFile(
+      path.resolve(pluginDirPath, `${type}.js`),
+      obj[type]
+    )
   }
-  // fs.writeFileSync(path.resolve(pluginDirPath, 'config.js'), desc)
   ctx.SUCCESS('ok')
 }

package/core/file/plugins/model/model.js

@@ -1,4 +1,4 @@
-const { Sequelize } = require('multiple-quick-koa')
+const { Sequelize } = require('q-koa')
 
 exports.model = {
   type: Sequelize.STRING,

package/core/file/plugins/model/service.js

@@ -1,12 +1,12 @@
 const fs = require('fs')
 const path = require('path')
-
+const fsPromise = require('fs/promises')
 exports.loadModel = async ({ app, appName }) => {
-  const data = fs.readdirSync(
+  const data = await fsPromise.readdir(
     path.resolve(__dirname, `${process.cwd()}/app/${appName}/plugins`)
   )
 
-  const modelList = await app.model.model.findAll({ raw: true })
+  // const modelList = await app.model.model.findAll({ raw: true })
 
   await Promise.all(
     ['model', 'model_attributes'].map((item) =>
@@ -34,32 +34,32 @@ exports.loadModel = async ({ app, appName }) => {
       __dirname,
       `../${result[i]}/config.js`
     )
-
     const modelExist = fs.existsSync(filePath)
     const defaultModelExist = fs.existsSync(defaultFilePath)
     const configExist = fs.existsSync(configPath)
     if (configExist) {
-      const config = fs.readFileSync(configPath, 'utf-8')
+      const config = (await fsPromise.readFile(configPath, 'utf-8'))
         ? require(configPath)
         : require(defaultConfigPath)
 
       const modelFile =
         defaultModelExist || modelExist
-          ? fs.readFileSync(filePath, 'utf-8')
-            ? fs.readFileSync(filePath, 'utf-8')
-            : fs.readFileSync(defaultFilePath, 'utf-8')
+          ? (await fsPromise.readFile(filePath, 'utf-8'))
+            ? await fsPromise.readFile(filePath, 'utf-8')
+            : await fsPromise.readFile(defaultFilePath, 'utf-8')
           : null
 
       const model = modelFile
-        ? fs.readFileSync(filePath, 'utf-8')
+        ? (await fsPromise.readFile(filePath, 'utf-8'))
           ? require(filePath)
           : require(defaultFilePath)
         : {}
       const attributes = modelFile ? modelFile.match(/exports.(.*)=/g) : []
       const types = modelFile ? modelFile.match(/Sequelize.(.*),\n/g) : {}
 
-      const ori_target = modelList.find((m) => m.model === result[i])
-      const id = ori_target ? ori_target.id : null
+      // const ori_target = modelList.find((m) => m.model === result[i])
+      // const id = ori_target ? ori_target.id : null
+      const id = i + 1
       const obj = {
         id,
         model: result[i],

package/core/file/plugins/model/validate.js

@@ -1,6 +1,4 @@
-const {
-  Validator
-} = require('multiple-quick-koa');
+const { Validator } = require('q-koa')
 
 exports.getModel = async (ctx) => {
   const params = {
@@ -9,9 +7,9 @@ exports.getModel = async (ctx) => {
       required: true,
       message: '请输入model',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.createModel = async (ctx) => {
   const params = {
@@ -25,10 +23,9 @@ exports.createModel = async (ctx) => {
       required: true,
       message: '请输入desc详情',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
-
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.createFile = async (ctx) => {
   const params = {
@@ -37,6 +34,6 @@ exports.createFile = async (ctx) => {
       required: true,
       message: '请输入plugin',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/plugins/model_attributes/model.js

@@ -1,4 +1,4 @@
-const { Sequelize, Random } = require('multiple-quick-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.model_id = {
   type: Sequelize.INTEGER(11),

package/core/file/plugins/mp_user/model.js

@@ -1,4 +1,4 @@
-const { Sequelize, Random } = require('multiple-quick-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.openid = {
   type: Sequelize.STRING,

package/core/file/plugins/permission/model.js

@@ -1,4 +1,4 @@
-const { Sequelize } = require('multiple-quick-koa')
+const { Sequelize } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,

package/core/file/plugins/role/controller.js

@@ -1,4 +1,4 @@
-const { getAppByCtx } = require('multiple-quick-koa')
+const { getAppByCtx } = require('q-koa')
 
 exports.init = async (ctx) => {
   const { app } = getAppByCtx(ctx)

package/core/file/plugins/role/model.js

@@ -1,4 +1,4 @@
-const { Sequelize, Random } = require('multiple-quick-koa')
+const { Sequelize, Random } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING,

package/core/file/plugins/role_permission/controller.js

@@ -1,4 +1,4 @@
-const { getAppByCtx } = require('multiple-quick-koa')
+const { getAppByCtx } = require('q-koa')
 
 exports.edit = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)