q-koa 7.7.3 → 7.7.8

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`

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
   }
 }

package/core/file/services/geo.js

@@ -1,6 +1,6 @@
 const axios = require('axios')
 const util = require('util')
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 const toLocationUrl =
   'https://apis.map.qq.com/ws/geocoder/v1/?location=%s&key=%s'
 const toLngAndLatUrl =

package/core/file/services/toutiao.js

@@ -1,7 +1,7 @@
 const util = require('util')
 const axios = require('axios')
-
-const { lodash } = require('multiple-quick-koa')
+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'
 const createQRCodeUrl = 'https://developer.toutiao.com/api/apps/qrcode'
@@ -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/weixin.js

@@ -1,16 +1,15 @@
 const util = require('util')
 const axios = require('axios')
 const getAccessTokenUrl = `https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s`
-const getTicketUrl = 'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi'
+const getTicketUrl =
+  'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi'
 const sha1 = require('sha1')
 const LRU = require('lru-cache')
 const cache = new LRU({
   max: 100,
-  maxAge: 1000 * 60 * 60
+  maxAge: 1000 * 60 * 60,
 })
-const {
-  lodash
-} = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 
 module.exports = class Singleton {
   constructor(config) {
@@ -24,7 +23,7 @@ module.exports = class Singleton {
      * 单例模式
      */
     if (!Singleton.instance) {
-        Singleton.instance = this
+      Singleton.instance = this
     }
     const previous = Singleton.instance.getConfig()
     if (!lodash.isEqual(previous, config)) {
@@ -33,7 +32,8 @@ module.exports = class Singleton {
     return Singleton.instance
   }
   init() {
-    if (!this.config.appid || !this.config.secrect) throw new Error('没有配置appid或secrect')
+    if (!this.config.appid || !this.config.secrect)
+      throw new Error('没有配置appid或secrect')
   }
   async getAccessToken() {
     const { appid, secrect, grant_type } = this.config
@@ -41,7 +41,7 @@ module.exports = class Singleton {
       return cache.get('access_token')
     }
     const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
-    const result = await axios.get(url).then(res => res.data)
+    const result = await axios.get(url).then((res) => res.data)
     if (result.errcode) throw new Error(result.errmsg)
 
     cache.set('access_token', result.access_token)
@@ -51,7 +51,7 @@ module.exports = class Singleton {
   async getTicket() {
     const access_token = await this.getAccessToken()
     const url = util.format(getTicketUrl, access_token)
-    const result = await axios.get(url).then(res => res.data)
+    const result = await axios.get(url).then((res) => res.data)
     if (result.errcode) throw new Error(result.errmsg)
 
     cache.set('ticket', result.ticket)
@@ -68,12 +68,21 @@ module.exports = class Singleton {
       timestamp,
       url,
       jsapi_ticket,
-      signature: sha1('jsapi_ticket=' + jsapi_ticket + '&noncestr=' + noncestr + '&timestamp=' + timestamp + '&url=' + url)
+      signature: sha1(
+        'jsapi_ticket=' +
+          jsapi_ticket +
+          '&noncestr=' +
+          noncestr +
+          '&timestamp=' +
+          timestamp +
+          '&url=' +
+          url
+      ),
     }
     return result
   }
 
-  getConfig () {
+  getConfig() {
     return this.config
   }
-}
+}

package/core/file/services/weixinMP.js

@@ -1,7 +1,7 @@
 const util = require('util')
 const axios = require('axios')
 
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
 const createQRCodeUrl =
@@ -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/file/utils/index.js

@@ -1,4 +1,4 @@
-const { lodash } = require('multiple-quick-koa')
+const { lodash } = require('q-koa')
 
 exports.getSetting = (config) => (type) =>
   config.find((i) => i.key === type).value

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.3",
+  "version": "7.7.8",
   "description": "",
   "main": "index.js",
   "scripts": {