q-koa 12.5.1 → 12.5.4

package/core/app.js

@@ -290,6 +290,12 @@ class APP {
           console.log(
             `first app is http://localhost:3001/${appName}/setting/findOne`
           )
+        } else {
+          this.app[appName].service.log.push({
+            app: this.app[appName],
+            url: `http://${this.config.ip}:${this.port}/setting/findOne`,
+            message: `${this.config.ip}:${this.port}项目启动成功`,
+          })
         }
 
         const version = require('q-koa/package.json').version
@@ -1173,11 +1179,6 @@ class APP {
             ctx.SUCCESS(result)
           }
           if (fn === 'sum') {
-            const requiredInclude = myInclude.filter(
-              (item) =>
-                (item.where && !item.hasOwnProperty('required')) ||
-                (item.hasOwnProperty('required') && item.required)
-            )
             if (!(attributes && attributes.length === 1)) {
               throw new Error(`${fn}方法需要attributes一个`)
             }
@@ -1185,7 +1186,6 @@ class APP {
               attributes[0],
               {
                 where: _where,
-                include: requiredInclude,
               }
             )
             ctx.SUCCESS(result)

package/core/config.js

@@ -98,6 +98,7 @@ module.exports = {
       $lt: Sequelize.Op.lt,
       $lte: Sequelize.Op.lte,
       $between: Sequelize.Op.between,
+      $notBetween: Sequelize.Op.notBetween,
       $notIn: Sequelize.Op.notIn,
       $in: Sequelize.Op.in,
     },

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

@@ -1474,7 +1474,7 @@ exports.checkPay = async (ctx, _data) => {
   return { prefix, out_trade_no, ...payResult }
 }
 
-exports.checkPayOnly = async (ctx) => {
+exports.checkPayOnly = async (ctx, _data) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 
   const {
@@ -1484,7 +1484,7 @@ exports.checkPayOnly = async (ctx) => {
     pay_config = 'weixin_pay',
     type = 'MP-WEIXIN',
     out_trade_no: _out_trade_no,
-  } = ctx.request.body
+  } = _data || ctx.request.body
 
   const appConfig = getConfig(app)
   const app_id = (await appConfig.getObject(config)).app_id

package/package.json

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