q-koa 8.1.1 → 8.1.5

package/core/app.js

@@ -133,10 +133,11 @@ class APP {
     this.app.use(async (ctx, next) => {
       const verify = util.promisify(jwt.verify)
       const { url, host, ip, method } = ctx.request
+
+      if (ctx.request.header['user-agent'].startsWith('Tencent Security')) {
+        return ctx.ERROR('error')
+      }
       if (this.config.blackList.includes(ip)) {
-        if (this.config.log.request) {
-          console.log('IP==>', ip)
-        }
         return ctx.ERROR('error')
       }
       const appName = url.split('/')[1]
@@ -254,7 +255,7 @@ class APP {
     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}`)
+        console.log(`${moment().format('HH:mm:ss')} server is running at http://localhost:${this.port}`)
         console.log(
           `first app is http://localhost:3001/${appName}/setting/findOne`
         )
@@ -1021,7 +1022,7 @@ class APP {
                     continue
                   }
                   const model = myInclude[j].model
-                  const modelName = model.getName()
+                  const modelName = myInclude[j].as || model.getName()
 
                   if (app[appName].attributes[controller][modelName + '_id']) {
                     const idList = rows
@@ -1085,7 +1086,7 @@ class APP {
                       continue
                     }
                     const model = myInclude[j].model
-                    const modelName = model.getName()
+                    const modelName = myInclude[j].as || model.getName()
                     if (
                       app[appName].attributes[controller][modelName + '_id']
                     ) {

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

@@ -12,6 +12,7 @@ const jwt = require('jsonwebtoken')
 
 const Email = require('../../services/email')
 const Geo = require('../../services/geo')
+const Express = require('../../services/express')
 
 const annotationsReg = /(?:^|\n|\r)\s*\/\*[\s\S]*?\*\/\s*(?:\r|\n|$)/g
 const apiReg = /@api(Name|Desc|Param|Route|Return)(\s+)(.*)\n/g
@@ -400,3 +401,21 @@ exports.verify = async (ctx) => {
   const result = await verify(code, 'token')
   ctx.SUCCESS(result)
 }
+
+exports.express = async (ctx) => {
+  const { app } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+  const { app_code } = await appConfig.getObject('express')
+
+  const express = new Express({
+    app_code,
+  })
+
+  const { id, express_number } = ctx.request.body
+
+  const result = await express.send({
+    no: express_number,
+  })
+
+  ctx.SUCCESS(result)
+}

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

@@ -223,7 +223,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
       setting: obj.setting.map((i) => {
         if (i.code === 'is_check' && i.value === false) {
           return {
-            ...i.toJSON(),
+            ...(i.toJSON ? i.toJSON() : i),
             value: apiVersion === cacheVersion,
           }
         }

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

@@ -780,7 +780,7 @@ exports.mp_pay = async (ctx) => {
     return_url,
     prefix = '',
     type,
-    out_trade_no,
+    out_trade_no: _out_trade_no,
     is_admin = false,
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
@@ -829,22 +829,18 @@ exports.mp_pay = async (ctx) => {
     type === 'H5-WEIXIN'
       ? ctx.request[`${appName}-user`].h5_user
       : ctx.request[`${appName}-user`].mp_user
-  const {
-    appId: appid,
-    nonceStr: nonce_str,
-    package: prepay_id,
-    paySign: sign,
-    signType,
-    timeStamp,
-  } = await pay({
+
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${appName}_${prefix}-${order_id}_${type}`
+    : `${appName}_${order_id}_${type}`
+
+  const prePayResult = await pay({
     openid: userDetail.openid,
     body: name,
     detail: '公众号支付测试',
-    out_trade_no: out_trade_no
-      ? out_trade_no
-      : prefix
-      ? `${appName}_${prefix}-${order_id}_${type}`
-      : `${appName}_${order_id}_${type}`,
+    out_trade_no,
     total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
     spbill_create_ip: '192.168.2.210',
     notify_url: `http://${
@@ -852,6 +848,24 @@ exports.mp_pay = async (ctx) => {
     }/${appName}/weixin/notify`,
   })
 
+  const checkOrder = (obj) => {
+    return new Promise((resolve, reject) => {
+      wxpay.queryOrder(obj, function (err, order) {
+        if (err) throw new Error(err)
+        resolve(order)
+      })
+    })
+  }
+
+  const {
+    appId: appid,
+    nonceStr: nonce_str,
+    package: prepay_id,
+    paySign: sign,
+    signType,
+    timeStamp,
+  } = prePayResult
+
   if (prepay_id.includes('undefined')) {
     const model = type === 'H5-WEIXIN' ? 'h5_user' : 'mp_user'
     const userTarget = await app.model[model].findOne({
@@ -863,6 +877,13 @@ exports.mp_pay = async (ctx) => {
       throw new Error(
         `appid不符，用户appid${userTarget.appid},付款appid${app_id}`
       )
+
+    const payResult = await checkOrder({
+      out_trade_no,
+    })
+    if (payResult.trade_state_desc === '支付成功') {
+      return ctx.SUCCESS('ok')
+    }
     throw new Error(`支付失败，请重试`)
   }
   return ctx.SUCCESS({
@@ -994,6 +1015,8 @@ exports.qr_code = async (ctx) => {
       accessKeySecret,
       bucket,
       region,
+      cdn_host,
+      oss_host,
     } = await appConfig.getObject('oss')
     if (!(accessKeyId && accessKeySecret && bucket && region)) {
       throw new Error('没有配置oss设置')
@@ -1015,8 +1038,13 @@ exports.qr_code = async (ctx) => {
     }.png`
     const result = await client.put(fileName, buffer)
     if (result.res && result.res.status === 200) {
-      const url = result.url
-      return ctx.SUCCESS(url)
+      if (oss_host && cdn_host) {
+        const url = result.url.replace(oss_host, cdn_host)
+        return ctx.SUCCESS(url)
+      } else {
+        const url = result.url
+        return ctx.SUCCESS(url)
+      }
     } else {
       throw new Error(result.res.statusMessage)
     }
@@ -1200,7 +1228,6 @@ exports.checkPay = async (ctx) => {
   const payResult = await checkOrder({
     out_trade_no,
   })
-
   if (payResult.trade_state_desc === '支付成功') {
     const order_price = Number(payResult.total_fee) / 100
     await app.service[orderModel].notify({

package/core/file/services/aliSms.js

@@ -27,7 +27,6 @@ module.exports = class Singleton {
   }
 
   async send({ mobile, TemplateCode, TemplateParam }) {
-    console.log('JSON.stringify(TemplateParam)')
     const result = await this.client.request(
       'SendSms',
       {

package/package.json

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