q-koa 12.9.4 → 12.9.6

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)

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/weixin/controller.js

@@ -925,12 +925,9 @@ 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不能存在`)
 
@@ -1963,3 +1960,89 @@ exports.getCommentInfo = async (ctx, _data) => {
   ctx.SUCCESS(result)
   return result
 }
+
+exports.createActivity = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+  let {
+    config = 'weixin_mp',
+    template_type = 'start',
+    limit_number = 5,
+    room_limit = 100,
+    activityId = '',
+  } = _data || ctx.request.body
+  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 template = {
+    start: '21B034D08C5615B9889CE362BB957B1EE69A584B',
+    present: '666F374D69D16C932E45D7E7D9F10CEF6177F5F5',
+  }
+
+  if (!activityId) {
+    const res = await weixinMp.createActivity()
+    activityId = res.activity_id
+  }
+
+  const payLoad = {
+    withShareTicket: true,
+    isUpdatableMessage: true,
+    activityId,
+    templateInfo: {
+      parameterList: [
+        {
+          name: 'member_count',
+          value: limit_number + '',
+        },
+        {
+          name: 'room_limit',
+          value: room_limit + '',
+        },
+      ],
+      templateId: 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 =
@@ -885,7 +885,7 @@ module.exports = class Singleton {
   }
 
   async setUpdatableMsg(target) {
-    const {
+    let {
       activity_id,
       target_state,
       member_count,
@@ -893,6 +893,16 @@ module.exports = class Singleton {
       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 = {
@@ -927,6 +937,9 @@ module.exports = class Singleton {
         ].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) {

package/package.json

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