q-koa 7.9.2 → 7.9.5

package/core/config.js

@@ -73,7 +73,7 @@ module.exports = {
     timezone: '+08:00',
     port: 3306,
     pool: {
-      max: 30,
+      max: 10,
       min: 1,
     },
     operatorsAliases: {

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

@@ -104,7 +104,7 @@ exports.showTables = async (ctx) => {
         : app.config[_model]
     // const target = Object.keys(app.config[model])
 
-    // console.log(model,mock,app.mock && app.mock[model] && app.mock[model]())
+    if (!target) throw new Error(`检查是否有${_model}/config.js`)
     const model = target.model ? target.model : _model
     return {
       modelName: _model,

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

@@ -1,5 +1,5 @@
 const md5 = require('js-md5')
-const { getAppByCtx, getConfig } = require('q-koa')
+const { getAppByCtx, getConfig, lodash } = require('q-koa')
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -331,10 +331,12 @@ exports.checkLogin = async (ctx) => {
     const token = await app.sign({
       user: tokenResult,
     })
-
+    console.log('app.appConfig.loginData', app.appConfig.loginData)
     return ctx.SUCCESS({
       token,
-      user: result,
+      user: app.appConfig.loginData
+        ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
+        : result,
     })
   }
 

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

@@ -332,6 +332,19 @@ exports.mp_login = async (ctx) => {
         openid: post.openid,
       },
     })
+    if (app.attributes.user.mp_openid) {
+      app.model.user.update(
+        {
+          mp_openid: post.openid,
+        },
+        {
+          where: {
+            id: openIdUser.user_id,
+            mp_openid: '',
+          },
+        }
+      )
+    }
     uid = openIdUser.user_id
   } else {
     if (post.user_id) {
@@ -343,14 +356,14 @@ exports.mp_login = async (ctx) => {
     } else {
       try {
         await app.sequelize.transaction(async (transaction) => {
-          const user = await app.model.user.create(
-            {
-              mp_openid: post.openid,
-            },
-            {
-              transaction,
-            }
-          )
+          const target = app.attributes.user.mp_openid
+            ? {
+                mp_openid: post.openid,
+              }
+            : {}
+          const user = await app.model.user.create(target, {
+            transaction,
+          })
           uid = user.id
           await app.model.mp_user.create(
             {
@@ -726,10 +739,11 @@ exports.h5_pay = async (ctx) => {
     return_url,
     type,
     is_admin = false,
+    pay_config = 'weixin_pay',
   } = ctx.request.body
 
   const appConfig = getConfig(app)
-  const { appId, key, mchId } = await appConfig.getObject('weixin_pay')
+  const { appId, key, mchId } = await appConfig.getObject(pay_config)
   const { is_dev, site_host } = await appConfig.getObject('base')
 
   const payObj = new WeixinPay({
@@ -769,6 +783,7 @@ exports.mp_pay = async (ctx) => {
     out_trade_no,
     is_admin = false,
     config = 'weixin_mp',
+    pay_config = 'weixin_pay',
   } = ctx.request.body
 
   if (price === 0) throw new Error('价格不能为0')
@@ -788,7 +803,7 @@ exports.mp_pay = async (ctx) => {
   }
   const appConfig = getConfig(app)
 
-  const { mchId, key } = await appConfig.getObject('weixin_pay')
+  const { mchId, key } = await appConfig.getObject(pay_config)
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -1034,9 +1049,10 @@ const getRefundResultJson = async ({ req_info, app_key }) => {
 exports.refund_notify = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const result = ctx.request.xmlBody
+  const pay_config = ctx.request.query.pay_config || 'weixin_pay'
 
   const appConfig = getConfig(app)
-  const { key } = await appConfig.getObject('weixin_pay')
+  const { key } = await appConfig.getObject(pay_config)
 
   const { req_info } = result.xml
   const refundResult = await getRefundResultJson({
@@ -1097,7 +1113,12 @@ exports.article = async (ctx) => {
 exports.checkPay = async (ctx) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 
-  const { id, prefix } = ctx.request.body
+  const {
+    id,
+    prefix,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = ctx.request.body
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
   const result = await app.model[orderModel].findOne({
@@ -1108,8 +1129,8 @@ exports.checkPay = async (ctx) => {
   if (!result) return ctx.SUCCESS('找不到')
 
   const appConfig = getConfig(app)
-  const app_id = (await appConfig.getObject('weixin_mp')).app_id
-  const { mchId, key } = await appConfig.getObject('weixin_pay')
+  const app_id = (await appConfig.getObject(config)).app_id
+  const { mchId, key } = await appConfig.getObject(pay_config)
 
   const wxpay = WXPay({
     appid: app_id,
@@ -1149,18 +1170,22 @@ exports.init_mp_openid = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
   const list = await app.model.user.findAll({
+    limit: 1000,
+    order: [['id', 'DESC']],
     where: {
       mp_openid: '',
     },
     include: app.model.mp_user,
   })
 
-  const result = list.map((item) => {
-    return {
-      id: item.id,
-      mp_openid: item.mp_user.openid,
-    }
-  })
+  const result = list
+    .filter((item) => item.mp_user && item.mp_user.openid)
+    .map((item) => {
+      return {
+        id: item.id,
+        mp_openid: item.mp_user.openid,
+      }
+    })
 
   await app.model.user.bulkCreate(result, {
     updateOnDuplicate: ['mp_openid'],

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

@@ -12,11 +12,12 @@ exports.refund = async ({
   refund_fee,
   price,
   type = '',
+  pay_config = 'weixin_pay',
   ...rest
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject('weixin_pay')
+  const { mchId, key, appId } = await appConfig.getObject(pay_config)
   const { site_host } = await appConfig.getObject('base')
 
   const payObj = new Pay({
@@ -49,7 +50,7 @@ exports.refund = async ({
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
         site_host || 'api.kuashou.com'
-      }/${appName}/weixin/refund_notify`,
+      }/${appName}/weixin/refund_notify?pay_config=weixin_pay`,
     })
     if (result_code === 'SUCCESS') {
       return true
@@ -63,9 +64,9 @@ exports.refund = async ({
 
 exports.cash = async ({ ctx, id, user_id, number }) => {
   const { app, appName } = getAppByCtx(ctx)
-
+  const { pay_config = 'weixin_pay' } = ctx.request.body
   const appConfig = getConfig(app)
-  const { mchId, key, appId } = await appConfig.getObject('weixin_pay')
+  const { mchId, key, appId } = await appConfig.getObject(pay_config)
 
   const { is_dev } = await appConfig.getObject('base')
 
@@ -76,7 +77,7 @@ exports.cash = async ({ ctx, id, user_id, number }) => {
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${pay_config}/apiclient_cert.p12`
       )
     ), // 微信商户平台证书
   })

package/package.json

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