q-koa 12.9.2 → 12.9.4

package/core/app.js

@@ -588,24 +588,20 @@ class APP {
                   'page'
                 )
 
-                const _id =
-                  belongs === 'setting'
-                    ? {
-                        id: {
-                          type: Sequelize.TINYINT.UNSIGNED,
-                          allowNull: false,
-                          primaryKey: true,
-                          autoIncrement: true,
-                        },
-                      }
-                    : {
-                        id: {
-                          type: Sequelize.MEDIUMINT.UNSIGNED,
-                          allowNull: false,
-                          primaryKey: true,
-                          autoIncrement: true,
-                        },
-                      }
+                const idType = _.get(
+                  this.app[appName].config[folder],
+                  'idType',
+                  belongs === 'setting' ? 'TINYINT' : 'MEDIUMINT'
+                )
+
+                const _id = {
+                  id: {
+                    type: Sequelize[idType].UNSIGNED,
+                    allowNull: false,
+                    primaryKey: true,
+                    autoIncrement: true,
+                  },
+                }
 
                 const attributes = _.defaultsDeep(_.cloneDeep(_attributes), {
                   ..._id,
@@ -772,6 +768,29 @@ class APP {
         })
       }
     }
+    const start = moment().valueOf()
+    for (const fn of ['service', 'controller']) {
+      const cloneTarget = this.app[appName][fn]
+
+      this.app[appName][fn] = Object.keys(cloneTarget).reduce((a, b) => {
+        const modelService = cloneTarget[b]
+        const newB = Object.keys(modelService).reduce((_a, _b) => {
+          const bindFn = modelService[_b].bind(this.app[appName])
+          return {
+            ..._a,
+            [_b]: bindFn,
+          }
+        }, {})
+        return {
+          ...a,
+          [b]: newB,
+        }
+      }, {})
+    }
+
+    if (is_dev) {
+      console.log('挂载service bind', moment().valueOf() - start)
+    }
   }
 
   initModel(appName) {
@@ -936,6 +955,24 @@ class APP {
         ]
         for (let i = 0; i < hooksList.length; i++) {
           if (_.get(app, `${appName}.${hooksList[i]}.${controller}.${fn}`)) {
+            // if (hooksList[i] === 'controller') {
+            //   process.once('unhandledRejection', (reason, promise) => {
+            //     if (
+            //       this.app &&
+            //       this.app[appName] &&
+            //       this.app[appName].model &&
+            //       this.app[appName].model.log
+            //     ) {
+            //       this.app[appName].model.log.create({
+            //         url: ctx.request.href,
+            //         body: ctx.request.body,
+            //         message: 'promise unhandledRejection',
+            //         content: reason.stack,
+            //         header: ctx.request.header,
+            //       })
+            //     }
+            //   })
+            // }
             await app[appName][hooksList[i]][controller][fn](ctx)
           }
         }

package/core/file/plugins/mp_user/config.js

@@ -4,7 +4,12 @@ module.exports = {
   multiple: false,
   availableSort: false,
   order: ['created_at'],
-  select: [{ key: 'user_id' }, { key: 'nick_name' }, { key: 'openid' }],
+  select: [
+    { key: 'user_id' },
+    { key: 'nick_name' },
+    { key: 'appid' },
+    { key: 'openid' },
+  ],
   excludes: [],
   limit: 20,
   defaultOrder: [{ sort: 'descending', type: 'id' }],

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

@@ -682,6 +682,7 @@ exports.mockPay = async (ctx) => {
     throw new Error(`没配置${model}支付回调notify`)
   }
   await app.service[model].notify({
+    ctx,
     app,
     order_id,
     order: model,

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

@@ -925,9 +925,12 @@ exports.app_pay = async (ctx) => {
   // }
   const appConfig = getConfig(app)
 
-  const { mchId, key, partner_key, appId: appid } = await appConfig.getObject(
-    pay_config
-  )
+  const {
+    mchId,
+    key,
+    partner_key,
+    appId: appid,
+  } = await appConfig.getObject(pay_config)
 
   if (!appid) throw new Error(`appId不能存在`)
 

package/core/file/services/weixinMP.js

@@ -72,6 +72,11 @@ const getUserPortraitUrl =
 
 const getCommentInfoUrl =
   'https://api.weixin.qq.com/wxaapi/comment/commentinfo/get?commentId=%s&access_token=%s'
+const createActivityUrl =
+  'https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s'
+
+const setUpdatableMsgUrl =
+  'https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?access_token=%s'
 
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
@@ -864,6 +869,75 @@ module.exports = class Singleton {
     return result
   }
 
+  async createActivity() {
+    const access_token = await this.getAccessToken()
+    const url = util.format(createActivityUrl, access_token)
+
+    const result = await axios.get(url).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.createActivity()
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async setUpdatableMsg(target) {
+    const {
+      activity_id,
+      target_state,
+      member_count,
+      room_limit,
+      version_type,
+      path,
+    } = target
+    const access_token = await this.getAccessToken()
+    const url = util.format(setUpdatableMsgUrl, access_token)
+    const postData = {
+      activity_id,
+      target_state,
+      template_info: {
+        parameter_list: [
+          member_count
+            ? {
+                name: 'member_count',
+                value: member_count + '',
+              }
+            : null,
+          room_limit
+            ? {
+                name: 'room_limit',
+                value: room_limit + '',
+              }
+            : null,
+          path
+            ? {
+                name: 'path',
+                value: path + '',
+              }
+            : null,
+          version_type
+            ? {
+                name: 'version_type',
+                value: version_type + '',
+              }
+            : null,
+        ].filter(Boolean),
+      },
+    }
+    const result = await axios.post(url, postData).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.setUpdatableMsg(target)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   getConfig() {
     return this.config
   }

package/core/middlewares.js

@@ -63,24 +63,26 @@ exports.miResponse = (methods) =>
     methods,
   })
 
-exports.miCors = (arr = [], ip = '192.168.0.1') => async (ctx, next) => {
-  ctx.set('Access-Control-Allow-Origin', `${ctx.header.origin || '*'}`)
-  ctx.set('Access-Control-Allow-Credentials', true)
-  // ctx.set('Access-Control-Allow-Headers', '*');
-  ctx.set(
-    'Access-Control-Allow-Headers',
-    ` Origin, X-Requested-With, Content-Type, client-type, Accept, ${arr
-      .map((item) => `${item}-token`)
-      .join(', ')}`
-  )
-  ctx.set('server-ip', ip)
-  ctx.set('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS')
-  if (ctx.method === 'OPTIONS') {
-    ctx.body = 200
-  } else {
-    await next()
+exports.miCors =
+  (arr = [], ip = '192.168.0.1') =>
+  async (ctx, next) => {
+    ctx.set('Access-Control-Allow-Origin', `${ctx.header.origin || '*'}`)
+    ctx.set('Access-Control-Allow-Credentials', true)
+    // ctx.set('Access-Control-Allow-Headers', '*');
+    ctx.set(
+      'Access-Control-Allow-Headers',
+      ` Origin, X-Requested-With, Content-Type, client-type, Accept, ${arr
+        .map((item) => `${item}-token`)
+        .join(', ')}`
+    )
+    ctx.set('server-ip', ip)
+    ctx.set('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS')
+    if (ctx.method === 'OPTIONS') {
+      ctx.body = 200
+    } else {
+      await next()
+    }
   }
-}
 
 exports.miXmlBody = (config) =>
   xmlParser({

package/package.json

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