q-koa 7.7.3 → 7.7.5

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

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

@@ -1,4 +1,4 @@
-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')

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

@@ -1,4 +1,4 @@
-const { Validator } = require('multiple-quick-koa');
+const { Validator } = require('q-koa')
 
 exports.getConfig = async (ctx) => {
   const params = {
@@ -7,27 +7,27 @@ exports.getConfig = async (ctx) => {
       required: true,
       message: '请输入url',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.h5_pay = async (ctx) => {
   /**
    * 判断微信
    */
-  const userAgent = ctx.userAgent._agent.source;
-  const isWeixin = /MicroMessenger/i.test(userAgent);
-  if (isWeixin) throw new Error('请用手机浏览器打开');
-};
+  const userAgent = ctx.userAgent._agent.source
+  const isWeixin = /MicroMessenger/i.test(userAgent)
+  if (isWeixin) throw new Error('请用手机浏览器打开')
+}
 
 exports.wx_pay = async (ctx) => {
   /**
    * 判断微信
    */
-  const userAgent = ctx.userAgent._agent.source;
-  const isWeixin = /MicroMessenger/i.test(userAgent);
-  if (!isWeixin) throw new Error('请在微信里打开');
-};
+  const userAgent = ctx.userAgent._agent.source
+  const isWeixin = /MicroMessenger/i.test(userAgent)
+  if (!isWeixin) throw new Error('请在微信里打开')
+}
 
 exports.pay = async (ctx) => {
   const params = {
@@ -46,9 +46,9 @@ exports.pay = async (ctx) => {
       required: 1,
       message: '请输入支付金额',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.mp_login = async (ctx) => {
   const params = {
@@ -57,10 +57,9 @@ exports.mp_login = async (ctx) => {
       required: true,
       message: '需要code登录',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
-
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.qr_code = async (ctx) => {
   const params = {
@@ -79,10 +78,9 @@ exports.qr_code = async (ctx) => {
       required: false,
       message: 'scene 参数 object',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
-
+  }
+  await new Validator(params).validate(ctx.request.body)
+}
 
 exports.sendMessage = async (ctx) => {
   const params = {
@@ -99,13 +97,14 @@ exports.sendMessage = async (ctx) => {
     data: {
       type: 'object',
       required: true,
-      message: 'data | {name1:{value:\'苏晓光\'},number2:{value:\'32323\'},thing5:{value:\'xxx\'}}',
+      message:
+        "data | {name1:{value:'苏晓光'},number2:{value:'32323'},thing5:{value:'xxx'}}",
     },
     page: {
       type: 'string',
       required: false,
       message: '请输入页面链接：pages/index/index',
     },
-  };
-  await new Validator(params).validate(ctx.request.body);
-};
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/services/aliSms.js

@@ -1,45 +1,46 @@
-const Core = require('@alicloud/pop-core');
-const {
-  lodash
-} = require('multiple-quick-koa')
+const Core = require('@alicloud/pop-core')
+const { lodash } = require('q-koa')
 module.exports = class Sms {
-  constructor (config) {
+  constructor(config) {
     this.config = {
       accessKeyId: config.accessKeyId, // 开发者账号id
       accessKeySecret: config.accessKeySecret, // 开发者token
       SignName: config.SignName, // 应用id
-      param: Array.from({
-        length: config.number || 4
-      }, () => lodash.random(0, 9)).join(''),
-    };
+      param: Array.from(
+        {
+          length: config.number || 4,
+        },
+        () => lodash.random(0, 9)
+      ).join(''),
+    }
     this.client = new Core({
       accessKeyId: this.config.accessKeyId,
       accessKeySecret: this.config.accessKeySecret,
       endpoint: 'https://dysmsapi.aliyuncs.com',
-      apiVersion: '2017-05-25'
-    });
+      apiVersion: '2017-05-25',
+    })
   }
 
-  async send ({
-    mobile,
-    TemplateCode,
-    TemplateParam
-  }) {
+  async send({ mobile, TemplateCode, TemplateParam }) {
     // if(!mobile) throw new Error('请输入手机号码')
-    const result = await this.client.request('SendSms', {
-      PhoneNumbers: mobile,
-      SignName: this.config.SignName,
-      TemplateCode,
-      TemplateParam: JSON.stringify({
-        code: this.config.param
-      })
-    }, {
-      method: 'POST'
-    })
+    const result = await this.client.request(
+      'SendSms',
+      {
+        PhoneNumbers: mobile,
+        SignName: this.config.SignName,
+        TemplateCode,
+        TemplateParam: JSON.stringify({
+          code: this.config.param,
+        }),
+      },
+      {
+        method: 'POST',
+      }
+    )
     return result
   }
 
-  getCode () {
+  getCode() {
     return this.config.param
   }
-};
+}

package/core/file/services/alipay.js

@@ -1,5 +1,5 @@
 const crypto = require('crypto')
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 module.exports = class Singleton {
   constructor(config) {
     this.config = {

package/core/file/services/amap.js

@@ -1,5 +1,5 @@
 const axios = require('axios')
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 
 const queryFn = (obj) => {
   const query = Object.keys(obj)
@@ -10,7 +10,7 @@ const queryFn = (obj) => {
   return query.replace('&', '?')
 }
 module.exports = class Singleton {
-  constructor (key) {
+  constructor(key) {
     this.key = key
 
     /**
@@ -26,7 +26,7 @@ module.exports = class Singleton {
     return Singleton.instance
   }
 
-  async geo ({ address }) {
+  async geo({ address }) {
     if (!this.key) throw new Error('没有key')
 
     const obj = {
@@ -43,7 +43,7 @@ module.exports = class Singleton {
     return data.geocodes
   }
 
-  async regeo ({ longitude, latitude }) {
+  async regeo({ longitude, latitude }) {
     if (!this.key) throw new Error('没有key')
 
     const obj = {
@@ -60,7 +60,7 @@ module.exports = class Singleton {
     return data
   }
 
-  async getDistrict ({
+  async getDistrict({
     keywords,
     subdistrict,
     page,
@@ -89,7 +89,7 @@ module.exports = class Singleton {
     return data
   }
 
-  getConfig () {
+  getConfig() {
     return this.key
   }
 }

package/core/file/services/douyin.js

@@ -1,6 +1,6 @@
 const util = require('util')
 const axios = require('axios')
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 
 const commonTokenUrl =
   'https://open.douyin.com/oauth/client_token/?client_key=%s&client_secret=%s&grant_type=client_credential'

package/core/file/services/express.js

@@ -1,8 +1,8 @@
 const axios = require('axios')
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 const send_url = 'http://wuliu.market.alicloudapi.com/kdi'
 module.exports = class Singleton {
-  constructor (config) {
+  constructor(config) {
     this.config = {
       app_code: config.app_code,
     }
@@ -20,7 +20,7 @@ module.exports = class Singleton {
     return Singleton.instance
   }
 
-  async send ({ no }) {
+  async send({ no }) {
     const result = await axios({
       method: 'GET',
       url: `${send_url}?no=${no}`,
@@ -31,7 +31,7 @@ module.exports = class Singleton {
     return result.result
   }
 
-  getConfig () {
+  getConfig() {
     return this.config
   }
 }