q-koa 12.8.4 → 12.9.0

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

@@ -3,8 +3,13 @@ module.exports = {
   belongs: 'page',
   multiple: false,
   availableSort: false,
-  order: ['created_at'],
-  select: [{ key: 'user_id' }, { key: 'nick_name' }],
+  order: ['user_id', 'unionid'],
+  select: [
+    { key: 'user_id' },
+    { key: 'openid' },
+    { key: 'appid' },
+    { key: 'unionid' },
+  ],
   excludes: [],
   limit: 20,
   defaultOrder: [{ sort: 'descending', type: 'id' }],
@@ -19,5 +24,6 @@ module.exports = {
       fields: ['openid'],
     },
     { fields: ['user_id'] },
+    { fields: ['unionid', 'appid'] },
   ],
 }

package/core/file/plugins/open_user/model.js

@@ -57,3 +57,13 @@ exports.unionid = {
   sortOrder: 11,
   mock: () => Random.ctitle(),
 }
+
+exports.is_subscribe = {
+  type: Sequelize.BOOLEAN,
+  comment: '是否关注',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: true,
+  sortOrder: 12,
+  mock: () => Random.boolean(),
+}

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

@@ -1705,13 +1705,22 @@ exports.messagePush = async (ctx) => {
   if (ctx.request.method === 'GET') {
     ctx.body = echostr
   } else {
-    const result = ctx.request.body
+    const result =
+      ctx.request.xmlBody && ctx.request.xmlBody.xml
+        ? ctx.request.xmlBody.xml
+        : ctx.request.body
     if (!lodash.isEmpty(result)) {
       const event = result.Event
       if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
       if (event) {
         if (app.service.weixin[event]) {
           await app.service.weixin[event]({ ctx, app, result })
+        } else {
+          app.service.log.push({
+            app,
+            url: 'weixin/messagePush',
+            message: `没有${event}方法 ${JSON.stringify(result)}`,
+          })
         }
       } else {
         await app.service.weixin.handleUserMessage({

package/core/file/services/weixinOpen.js

@@ -0,0 +1,164 @@
+const util = require('util')
+const axios = require('axios')
+
+const { lodash } = require('q-koa')
+const getAccessTokenUrl =
+  'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
+
+const getOpenListUrl =
+  'https://api.weixin.qq.com/cgi-bin/user/get?access_token=%s'
+
+const getUserInfoUrl =
+  'https://api.weixin.qq.com/cgi-bin/user/info?access_token=%s&openid=%s&lang=zh_CN'
+
+const getUserInfoListUrl =
+  'https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token=%s'
+
+const sendMessageUrl =
+  'https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=%s'
+
+const getTemplateUrl =
+  'https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=%s'
+
+const LRU = require('lru-cache')
+const cache = new LRU({
+  max: 100,
+  maxAge: 1000 * 60 * 60,
+})
+
+module.exports = class Singleton {
+  constructor(config) {
+    this.config = {
+      ...config,
+      grant_type: 'client_credential',
+    }
+    /**
+     * 单例模式
+     */
+    if (!Singleton.instance) {
+      Singleton.instance = this
+    }
+    const previous = Singleton.instance.getConfig()
+    if (!lodash.isEqual(previous, config)) {
+      Singleton.instance = this
+    }
+    return Singleton.instance
+  }
+
+  init() {
+    if (!this.config.appid || !this.config.secrect) {
+      throw new Error('没有配置appid或secrect')
+    }
+  }
+
+  async getAccessToken() {
+    const { appid, secrect, grant_type } = this.config
+    if (cache.get(appid)) {
+      return cache.get(appid)
+    }
+    const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
+
+    const result = await axios.get(url).then((res) => res.data)
+    const { errcode, errmsg, access_token } = result
+
+    if (errcode) {
+      throw new Error(errmsg)
+    }
+
+    cache.set(appid, access_token)
+    return access_token
+  }
+
+  async getOpenList() {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getOpenListUrl, access_token)
+    const result = await axios.post(url).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getOpenList()
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async getUserInfo(openid) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getUserInfoUrl, access_token, openid)
+    const result = await axios.post(url).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getUserInfo(openid)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async getUserInfoList(list = []) {
+    const user_list = list.map((openid) => {
+      return {
+        openid,
+        lang: 'zh_CN',
+      }
+    })
+    const access_token = await this.getAccessToken()
+    const url = util.format(getUserInfoListUrl, access_token)
+    const result = await axios
+      .post(url, {
+        user_list,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getUserInfoList(list)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.user_info_list
+  }
+
+  async sendMessage(options) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(sendMessageUrl, access_token)
+    const formatOptions = {
+      ...options,
+      data: lodash.mapValues(options.data, (item) => {
+        return {
+          value: item,
+        }
+      }),
+    }
+
+    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.sendMessage(options)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async getTemplate() {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getTemplateUrl, access_token)
+    const result = await axios.post(url).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getTemplate()
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  getConfig() {
+    return this.config
+  }
+}

package/package.json

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