q-koa 7.7.2 → 7.7.7

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

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

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

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

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

@@ -1,5 +1,4 @@
-const { Validator,getAppByCtx } = require('multiple-quick-koa');
-
+const { Validator, getAppByCtx } = require('q-koa')
 
 exports.bulkUpdate = async (ctx) => {
   const params = {
@@ -8,22 +7,17 @@ exports.bulkUpdate = async (ctx) => {
       required: true,
       message: '请输入list',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
-exports.upsert = async ctx => {
-  const {
-    app
-  } = getAppByCtx(ctx);
+exports.upsert = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
 
-  const {
-    id,
-    parent_id
-  } = ctx.request.body
+  const { id, parent_id } = ctx.request.body
 
   if (id && parent_id && id === parent_id) throw new Error('不能分类到自己')
-};
+}
 
 exports.copyOther = async (ctx) => {
   const params = {
@@ -32,11 +26,11 @@ exports.copyOther = async (ctx) => {
       required: true,
       message: '请输入type, 需要复制哪个code',
     },
-    source:{
+    source: {
       type: 'string',
       required: true,
       message: '请输入source, 需要从哪个项目复制哪个（记得开启)',
-    }
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+    },
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

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

@@ -1,14 +1,10 @@
 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')
-const {
-  lodash,
-  getAppByCtx,
-  getConfig,
-  Sequelize,
-} = require('multiple-quick-koa')
+const { lodash, getAppByCtx, getConfig, Sequelize } = require('q-koa')
 
 exports.initModel = async (ctx) => {
   const { app } = getAppByCtx(ctx)
@@ -62,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(
@@ -254,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/system/service.js

@@ -1,4 +1,4 @@
-const { getConfig, lodash } = require('multiple-quick-koa')
+const { getConfig, lodash } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
 

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

@@ -1,4 +1,4 @@
-const { Validator, getAppByCtx } = require('multiple-quick-koa');
+const { Validator, getAppByCtx } = require('q-koa')
 
 exports.initModel = async (ctx) => {
   const params = {
@@ -7,34 +7,40 @@ exports.initModel = async (ctx) => {
       required: true,
       message: '请输入model',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.showAllSchemas = async (ctx) => {
-  const {app,appName} = getAppByCtx(ctx)
+  const { app, appName } = getAppByCtx(ctx)
 
   const params = {
     model: {
       type: 'string',
       required: true,
       message: '请输入model',
-      validator: (rule, value) => ((app[appName].model && app[appName].model[value]) ? Promise.resolve() : Promise.reject('没有这个模型')),
+      validator: (rule, value) =>
+        app[appName].model && app[appName].model[value]
+          ? Promise.resolve()
+          : Promise.reject('没有这个模型'),
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.dropModel = async (ctx) => {
-  const {app,appName} = getAppByCtx(ctx)
+  const { app, appName } = getAppByCtx(ctx)
 
   const params = {
     model: {
       type: 'string',
       required: true,
       message: '请输入model',
-      validator: (rule, value) => ((app[appName].model && app[appName].model[value]) ? Promise.resolve() : Promise.reject('没有这个模型')),
+      validator: (rule, value) =>
+        app[appName].model && app[appName].model[value]
+          ? Promise.resolve()
+          : Promise.reject('没有这个模型'),
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/plugins/todolist/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/toutiao/controller.js

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

package/core/file/plugins/toutiao_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/user/afterExecute.js

@@ -1,38 +1,43 @@
-const {
-  getAppByCtx,
-  getConfig,
-} = require('multiple-quick-koa');
+const { getAppByCtx, getConfig } = require('q-koa')
 
 exports.destroy = async (ctx) => {
-  const {
-    app,
-  } = getAppByCtx(ctx);
+  const { app } = getAppByCtx(ctx)
 
-  const {
-    id,
-  } = ctx.request.body;
-  
-  app.model.mp_user && app.model.mp_user.destroy({
-    where: {
-      user_id: id,
-    },
-  }).then(() => {
-    console.log(`删除${id}`);
-  }).catch(console.log);
+  const { id } = ctx.request.body
 
-  app.model.h5_user && app.model.h5_user.destroy({
-    where: {
-      user_id: id,
-    },
-  }).then(() => {
-    console.log(`删除${id}`);
-  }).catch(console.log);
+  app.model.mp_user &&
+    app.model.mp_user
+      .destroy({
+        where: {
+          user_id: id,
+        },
+      })
+      .then(() => {
+        console.log(`删除${id}`)
+      })
+      .catch(console.log)
 
-  app.model.toutiao_user && app.model.toutiao_user.destroy({
-    where: {
-      user_id: id,
-    },
-  }).then(() => {
-    console.log(`删除${id}`);
-  }).catch(console.log);
-};
+  app.model.h5_user &&
+    app.model.h5_user
+      .destroy({
+        where: {
+          user_id: id,
+        },
+      })
+      .then(() => {
+        console.log(`删除${id}`)
+      })
+      .catch(console.log)
+
+  app.model.toutiao_user &&
+    app.model.toutiao_user
+      .destroy({
+        where: {
+          user_id: id,
+        },
+      })
+      .then(() => {
+        console.log(`删除${id}`)
+      })
+      .catch(console.log)
+}

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

@@ -1,5 +1,5 @@
 const md5 = require('js-md5')
-const { getAppByCtx, getConfig } = require('multiple-quick-koa')
+const { getAppByCtx, getConfig } = require('q-koa')
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)

package/core/file/plugins/user/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.nick_name = {
   type: Sequelize.STRING,
@@ -8,7 +8,7 @@ exports.nick_name = {
   is_mock: false,
   defaultValue: '',
   sortOrder: 1,
-};
+}
 exports.name = {
   type: Sequelize.STRING,
   comment: '名字',
@@ -18,12 +18,18 @@ exports.name = {
   sortOrder: 2,
   mock: () => Random.word(5),
   get: function () {
-    return this.getDataValue('nick_name') || (this.getDataValue('mp_user') && this.getDataValue('mp_user').nick_name) ||
-    (this.getDataValue('h5_user') && this.getDataValue('h5_user').nick_name) ||
-    (this.getDataValue('toutiao_user') && this.getDataValue('toutiao_user').nick_name) ||
-    '匿名用户'
+    return (
+      this.getDataValue('nick_name') ||
+      (this.getDataValue('mp_user') &&
+        this.getDataValue('mp_user').nick_name) ||
+      (this.getDataValue('h5_user') &&
+        this.getDataValue('h5_user').nick_name) ||
+      (this.getDataValue('toutiao_user') &&
+        this.getDataValue('toutiao_user').nick_name) ||
+      '匿名用户'
+    )
   },
-};
+}
 
 exports.image = {
   type: Sequelize.VIRTUAL,
@@ -33,20 +39,25 @@ exports.image = {
   defaultValue: '',
   sortOrder: 3,
   get: function () {
-    return this.getDataValue('avatar') || (this.getDataValue('mp_user') && this.getDataValue('mp_user').avatar) ||
+    return (
+      this.getDataValue('avatar') ||
+      (this.getDataValue('mp_user') && this.getDataValue('mp_user').avatar) ||
       (this.getDataValue('h5_user') && this.getDataValue('h5_user').avatar) ||
-      (this.getDataValue('toutiao_user') && this.getDataValue('toutiao_user').avatar) ||
+      (this.getDataValue('toutiao_user') &&
+        this.getDataValue('toutiao_user').avatar) ||
       '//p0.meituan.net/codeman/bc1b8f0172cf718719edfb130ba171912425.jpg@120w_120h_1c_1e'
+    )
   },
-};
+}
 
 exports.avatar = {
   type: Sequelize.STRING,
   comment: '头像',
   allowNull: false,
-  defaultValue: '//p0.meituan.net/codeman/bc1b8f0172cf718719edfb130ba171912425.jpg@120w_120h_1c_1e',
+  defaultValue:
+    '//p0.meituan.net/codeman/bc1b8f0172cf718719edfb130ba171912425.jpg@120w_120h_1c_1e',
   mock: () => Random.image('100x100', Random.color(), Random.cword()),
-};
+}
 
 exports.code = {
   type: Sequelize.STRING(6),
@@ -54,14 +65,14 @@ exports.code = {
   comment: '验证码',
   defaultValue: '',
   mock: () => Random.string('number', 4),
-};
+}
 
 exports.sex_id = {
   type: Sequelize.INTEGER(11),
   allowNull: false,
   defaultValue: 4,
   comment: '性别',
-};
+}
 
 exports.password = {
   type: Sequelize.STRING(),
@@ -70,7 +81,7 @@ exports.password = {
   defaultValue: '7b17d87eb787c51b4da25ec1bed26c8d',
   set(value) {
     this.setDataValue('password', md5(value))
-  }
+  },
   // validate: {
   //   notNull: {
   //     msg: '密码不允许为空',
@@ -79,7 +90,7 @@ exports.password = {
   //     msg: '密码不允许为空',
   //   },
   // },
-};
+}
 
 exports.mobile = {
   type: Sequelize.STRING(),
@@ -93,4 +104,4 @@ exports.mobile = {
   //   },
   // },
   mock: () => Random.natural(13000000000, 19999999999),
-};
+}

package/core/file/plugins/user/test.js

@@ -1,71 +1,86 @@
-const axios = require('axios');
-const APP = require('multiple-quick-koa');
-const APP_CONFIG = require('../../config');
-const config = require('./config');
+const axios = require('axios')
+const APP = require('q-koa')
+const APP_CONFIG = require('../../config')
+const config = require('./config')
 
-const modelName = __dirname.split('/').reverse()[0];
+const modelName = __dirname.split('/').reverse()[0]
 const service = axios.create({
   baseURL: `http://localhost:${APP_CONFIG.port}/${modelName}`,
-});
-service.interceptors.request.use((config) => { config.headers['Client-Type'] = 2; return config; });
+})
+service.interceptors.request.use((config) => {
+  config.headers['Client-Type'] = 2
+  return config
+})
 
-service.interceptors.response.use(response => response.data, error => Promise.reject(error));
+service.interceptors.response.use(
+  (response) => response.data,
+  (error) => Promise.reject(error)
+)
 
-const sleep = time => new Promise(resolve => setTimeout(resolve, time * 1000));
+const sleep = (time) =>
+  new Promise((resolve) => setTimeout(resolve, time * 1000))
 
 describe(`${config.name}/${modelName}`, () => {
   beforeAll(async () => {
     try {
-      await axios.post('/');
+      await axios.post('/')
     } catch (e) {
-      console.log('正在启动服务器');
-      const app = new APP(APP_CONFIG);
-      await app.start();
+      console.log('正在启动服务器')
+      const app = new APP(APP_CONFIG)
+      await app.start()
     }
-  });
+  })
 
   test('错误登录', async () => {
     const res = await service.post('login', {
       name: 'chenlin1',
       password: 'sugar23',
-    });
-    expect(res.code).toBe(500);
-  });
+    })
+    expect(res.code).toBe(500)
+  })
 
   test('正确登录', async () => {
     const res = await service.post('login', {
       name: 'chenlin',
       password: 'sugar23',
-    });
-    expect(res.code).toBe(200);
-  });
+    })
+    expect(res.code).toBe(200)
+  })
 
   test('获取token', async () => {
-    const { data: { token } } = await service.post('login', {
+    const {
+      data: { token },
+    } = await service.post('login', {
       name: 'chenlin',
       password: 'sugar23',
-    });
-    expect(Boolean(token)).toBe(true);
-  });
+    })
+    expect(Boolean(token)).toBe(true)
+  })
 
   test('没有token信息', async () => {
-    const res = await service.post('getInfo', {});
-    expect(res.code).toBe(401);
-  });
+    const res = await service.post('getInfo', {})
+    expect(res.code).toBe(401)
+  })
 
   test('获取用户信息', async () => {
-    const { data: { token } } = await service.post('login', {
+    const {
+      data: { token },
+    } = await service.post('login', {
       name: 'chenlin',
       password: 'sugar23',
-    });
+    })
 
-    const res = await service.post('getInfo', {}, {
-      headers: {
-        'Client-Type': 2,
-        'X-Token': token,
-      },
-    });
+    const res = await service.post(
+      'getInfo',
+      {},
+      {
+        headers: {
+          'Client-Type': 2,
+          'X-Token': token,
+        },
+      }
+    )
 
-    expect(res.code).toBe(200);
-  });
-});
+    expect(res.code).toBe(200)
+  })
+})

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

@@ -1,4 +1,4 @@
-const { Validator } = require('multiple-quick-koa');
+const { Validator } = require('q-koa')
 
 exports.login = async (ctx) => {
   const params = {
@@ -12,10 +12,9 @@ exports.login = async (ctx) => {
       required: true,
       message: '请输入密码',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
-
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.register = async (ctx) => {
   const params = {
@@ -39,6 +38,6 @@ exports.register = 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/video/controller.js

@@ -1,15 +1,13 @@
 const qqVideo = require('../../services/qqVideo')
-const { getAppByCtx } = require('multiple-quick-koa')
+const { getAppByCtx } = require('q-koa')
 
-exports.qq = async ctx => {
+exports.qq = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
-  const {
-    vid
-  } = ctx.request.body
+  const { vid } = ctx.request.body
 
   const video = await qqVideo(vid)
   // if (true) throw new Error('账号密码错误');
 
   return ctx.SUCCESS(video)
-}
+}

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

@@ -1,4 +1,4 @@
-const { Validator } = require('multiple-quick-koa');
+const { Validator } = require('q-koa')
 
 exports.qq = async (ctx) => {
   const params = {
@@ -7,6 +7,6 @@ exports.qq = async (ctx) => {
       required: true,
       message: '请输入腾讯vid',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

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

@@ -1,9 +1,9 @@
-const { lodash, getAppByCtx, getConfig } = require('multiple-quick-koa')
+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')

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

@@ -1,7 +1,8 @@
-const { getAppByCtx, getConfig } = require('multiple-quick-koa')
+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,
@@ -21,7 +22,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`
@@ -71,7 +72,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`