q-koa 12.9.3 → 12.9.5

package/core/app.js

@@ -22,7 +22,7 @@ const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
 const { getObject, getAppConfig } = require('./file/utils')
-
+const { push } = require('./file/plugins/log/service')
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -472,6 +472,10 @@ class APP {
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
       } catch (e) {
+        push({
+          appName,
+          message: `${appName}数据库连接失败`,
+        })
         console.log(`${appName}数据库连接失败`)
         console.log(e)
         throw new Error(e.message)
@@ -588,24 +592,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,
@@ -793,7 +793,7 @@ class APP {
     }
 
     if (is_dev) {
-      console.log(moment().valueOf() - start)
+      console.log('挂载service bind', moment().valueOf() - start)
     }
   }
 
@@ -959,24 +959,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,
-                  })
-                }
-              })
-            }
+            // 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/log/service.js

@@ -1,4 +1,5 @@
-const { lodash, getConfig } = require('q-koa')
+const { getConfig } = require('q-koa')
+const lodash = require('lodash')
 const axios = require('axios')
 
 const is_dev = process.env.NODE_ENV !== 'production'
@@ -38,10 +39,17 @@ exports.push = async ({ app, appName = '通知', url, message }) => {
     return
   }
   if (log_push_url) {
-    const appConfig = getConfig(app)
-    const { site_name, logo_image, logo_img } = await appConfig.getObject(
-      'base'
-    )
+    let site_name = appName
+    let logo_image = ''
+    let logo_img = ''
+    if (app) {
+      const appConfig = getConfig(app)
+      const res = await appConfig.getObject('base')
+
+      site_name = res.site_name
+      logo_image = res.logo_image
+      logo_img = res.logo_img
+    }
 
     const queryObject = {
       ...(is_dev ? {} : { url: encodeURIComponent(url) }),

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不能存在`)
 
@@ -1960,3 +1963,89 @@ exports.getCommentInfo = async (ctx, _data) => {
   ctx.SUCCESS(result)
   return result
 }
+
+exports.createActivity = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { config = 'weixin_mp' } = _data || ctx.request.body
+  const appConfig = getConfig(app)
+  const {
+    app_id,
+    app_secrect,
+    template_type = 'start',
+    limit_number = 5,
+    room_limit = 100,
+    activityId = '',
+  } = await appConfig.getObject(config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const template = {
+    start: '21B034D08C5615B9889CE362BB957B1EE69A584B',
+    present: '666F374D69D16C932E45D7E7D9F10CEF6177F5F5',
+  }
+
+  if (!activityId) {
+    const { activity_id: activityId } = await weixinMp.createActivity()
+  }
+
+  const payLoad = {
+    withShareTicket: true,
+    isUpdatableMessage: true,
+    activityId,
+    templateInfo: {
+      parameterList: [
+        {
+          name: 'member_count',
+          value: limit_number + '',
+        },
+        {
+          name: 'room_limit',
+          value: room_limit + '',
+        },
+      ],
+      templateld: template[template_type],
+    },
+  }
+  ctx.SUCCESS(payLoad)
+  return payLoad
+}
+
+exports.setUpdatableMsg = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const {
+    config = 'weixin_mp',
+    activity_id,
+    target_state = 0,
+    room_limit,
+    member_count,
+    path,
+    version_type,
+  } = _data || ctx.request.body
+
+  if (!activity_id) throw new ServiceError('?activity_id')
+
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const result = await weixinMp.setUpdatableMsg({
+    activity_id,
+    target_state,
+    room_limit,
+    member_count,
+    path,
+    version_type,
+  })
+
+  ctx.SUCCESS(result)
+  return result
+}

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

@@ -373,14 +373,8 @@ exports.qr_code = async ({
 
     return qr_image
   } else {
-    const {
-      accessKeyId,
-      accessKeySecret,
-      bucket,
-      region,
-      cdn_host,
-      oss_host,
-    } = await appConfig.getObject('oss')
+    const { accessKeyId, accessKeySecret, bucket, region, cdn_host, oss_host } =
+      await appConfig.getObject('oss')
     if (!(accessKeyId && accessKeySecret && bucket && region)) {
       throw new Error('没有配置oss设置')
     }

package/core/file/services/weixinMP.js

@@ -1,7 +1,7 @@
 const util = require('util')
 const axios = require('axios')
 
-const { lodash } = require('q-koa')
+const { lodash, ServiceError } = require('q-koa')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
 const getPhoneNumberUrl =
@@ -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,88 @@ 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) {
+    let {
+      activity_id,
+      target_state,
+      member_count,
+      room_limit,
+      version_type,
+      path,
+    } = target
+
+    if (target_state === 1) {
+      version_type = version_type || 'release'
+      path = path || 'pages/index/index'
+      room_limit = null
+      member_count = null
+    } else {
+      version_type = ''
+      path = ''
+    }
+    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),
+      },
+    }
+    if (!postData.template_info.parameter_list.length) {
+      throw new ServiceError('?parameter_list length 0')
+    }
+    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.3",
+  "version": "12.9.5",
   "description": "",
   "main": "index.js",
   "scripts": {