q-koa 12.8.4 → 12.8.5

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: ['created_at', '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/package.json

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