q-koa 7.7.5 → 7.8.0

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/common/controller.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const fsPromise = require('fs/promises')
 const path = require('path')
 const crypto = require('crypto')
 const { Random, lodash, getAppByCtx, getConfig } = require('q-koa')
@@ -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/model/controller.js

@@ -2,6 +2,7 @@ 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/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/system/controller.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const fsPromise = require('fs/promises')
 const { VM } = require('vm2')
 const axios = require('axios')
 const cheerio = require('cheerio')
@@ -57,7 +58,8 @@ exports.showTables = async (ctx) => {
     `${process.cwd()}/app/${appName}/plugins`
   )
   let aliasModelList = []
-  fs.readdirSync(pluginDir).forEach((folder) => {
+  const allList = await fsPromise.readdir(pluginDir)
+  allList.forEach((folder) => {
     const isFolder = fs.lstatSync(path.resolve(pluginDir, folder)).isDirectory()
     const hasConfig = fs.existsSync(
       path.resolve(
@@ -249,7 +251,7 @@ exports.getImage = async (ctx) => {
     __dirname,
     `${process.cwd()}/public/upload`
   )}`
-  const files = fs.readdirSync(targetDir)
+  const files = await fsPromise.readdir(targetDir)
   const images = files.filter((file) =>
     /\w(\.gif|\.jpeg|\.png|\.jpg|\.bmp)/i.test(file)
   )

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

@@ -3,7 +3,7 @@ const { lodash, getAppByCtx, getConfig } = require('q-koa')
 const path = require('path')
 const axios = require('axios')
 const OAuth = require('wechat-oauth')
-const WXPay = require('weixin-pay')
+const WXPay = require('weixin-pay-fork')
 const WeixinPay = require('../../services/weixinPay')
 const WeixinMp = require('../../services/weixinMP')
 const Weixin = require('../../services/weixin')
@@ -956,15 +956,19 @@ exports.refund_notify = async (ctx) => {
   const prefix =
     out_trade_no.split('_').length === 4 ? out_trade_no.split('_')[1] : ''
 
-  const order_id = Number(out_refund_no)
+  const order_id = out_trade_no.includes('_')
+    ? Number(out_trade_no.split('_')[0])
+    : Number(out_trade_no)
+  const type = out_trade_no.includes('_') ? out_trade_no.split('_')[1] : ''
   const model = prefix ? `${prefix}_order` : 'order'
-  console.log(out_refund_no, '微信支付回调-----', model)
+  console.log(out_refund_no, '微信支付回调-----', type, model)
   if (app.service[model] && app.service[model].refund_notify) {
     await app.service[model].refund_notify({
       app,
       order_id,
       order: model,
       refund_price,
+      type,
     })
   }
 

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

@@ -2,6 +2,7 @@ const { getAppByCtx, getConfig } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
 const fs = require('fs')
 const path = require('path')
+const fsPromise = require('fs/promises')
 
 exports.refund = async ({
   ctx,
@@ -10,6 +11,7 @@ exports.refund = async ({
   total_fee,
   refund_fee,
   price,
+  type = '',
   ...rest
 }) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -21,7 +23,7 @@ exports.refund = async ({
     appId: appId,
     mchId: mchId,
     key: key, // 微信商户平台API密钥,
-    pfx: fs.readFileSync(
+    pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
         `${process.cwd()}/app/${appName}/plugins/weixin/apiclient_cert.p12`
@@ -42,7 +44,7 @@ exports.refund = async ({
     const { result_code, err_code_des } = await payObj.refund({
       ...rest,
       out_trade_no,
-      out_refund_no: id + '',
+      out_refund_no: id + '_' + type,
       total_fee: Math.round((total_fee || refund_fee || price) * 100),
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
@@ -71,7 +73,7 @@ exports.cash = async ({ ctx, id, user_id, number }) => {
     appId: appId,
     mchId: mchId,
     key: key, // 微信商户平台API密钥,
-    pfx: fs.readFileSync(
+    pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
         `${process.cwd()}/app/${appName}/plugins/weixin/apiclient_cert.p12`

package/core/file/services/toutiao.js

@@ -1,6 +1,6 @@
 const util = require('util')
 const axios = require('axios')
-
+const fsPromise = require('fs/promises')
 const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://developer.toutiao.com/api/apps/token?grant_type=%s&appid=%s&secret=%s'
@@ -88,7 +88,7 @@ module.exports = class Singleton {
       }
       throw new Error(bufferResult.errmsg)
     }
-    await fs.writeFileSync(
+    await fsPromise.writeFile(
       `${this.config.targetPath}/${creatuuid}.png`,
       bufferResult
     )

package/core/file/services/weixinMP.js

@@ -31,6 +31,7 @@ const addOrderUrl =
 
 const path = require('path')
 const fs = require('fs')
+const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
 const request = require('request')
 const cache = new LRU({
@@ -313,7 +314,7 @@ module.exports = class Singleton {
       }
       throw new Error(bufferResult.errmsg)
     }
-    await fs.writeFileSync(
+    await fsPromise.writeFile(
       `${this.config.targetPath}/${creatuuid}.png`,
       bufferResult
     )

package/core/restc/lib/index.js

@@ -4,7 +4,10 @@ const fs = require('fs')
 const path = require('path')
 const Gateway = require('./utils/gateway.js')
 
-const content = fs.readFileSync(path.join(__dirname, '../faas/index.html'), 'utf-8')
+const content = fs.readFileSync(
+  path.join(__dirname, '../faas/index.html'),
+  'utf-8'
+)
 
 const cache = new WeakMap()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "7.7.5",
+  "version": "7.8.0",
   "description": "",
   "main": "index.js",
   "scripts": {