q-koa 12.7.4 → 12.8.3

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

@@ -4,6 +4,7 @@ const md5 = require('js-md5')
 const superAdmin = {
   name: 'admin',
   password: 'admin123',
+  is_dev: true,
 }
 
 exports.login = async (ctx) => {

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

@@ -338,11 +338,14 @@ exports.mp_login = async (ctx) => {
 
   let uid
   if (openIdUser) {
-    await app.model.mp_user.update(post, {
-      where: {
-        openid: post.openid,
-      },
-    })
+    await app.model.mp_user.update(
+      lodash.omit(post, openIdUser.user_id ? ['user_id'] : []),
+      {
+        where: {
+          openid: post.openid,
+        },
+      }
+    )
     if (app.attributes.user.mp_openid) {
       app.model.user.update(
         {
@@ -1218,12 +1221,13 @@ exports.url_link = async (ctx) => {
 exports.short_link = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { page, scene, config = 'weixin_mp' } = ctx.request.body
+  const { page, scene, title, config = 'weixin_mp' } = ctx.request.body
   if (!app.service.weixin) throw new Error(`weixin可能没有service.js`)
   const result = await app.service.weixin.short_link({
     app,
     page,
     scene,
+    title,
     config,
   })
   ctx.SUCCESS(result)

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

@@ -450,7 +450,13 @@ exports.url_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
   return result
 }
 
-exports.short_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
+exports.short_link = async ({
+  app,
+  page,
+  scene,
+  title,
+  config = 'weixin_mp',
+}) => {
   const appConfig = getConfig(app)
   const { app_id, app_secrect } = await appConfig.getObject(config)
   const weixinMp = new WeixinMp({
@@ -461,6 +467,7 @@ exports.short_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
   const result = await weixinMp.createShortLink({
     page,
     scene,
+    title,
   })
   return result
 }

package/core/file/services/weixinMP.js

@@ -370,7 +370,7 @@ module.exports = class Singleton {
   }
 
   async createShortLink(options) {
-    const { page, scene, ...rest } = options
+    const { page, scene, title, ...rest } = options
     const access_token = await this.getAccessToken()
     const url = util.format(createShortLinkUrl, access_token)
     const query = options.scene
@@ -381,7 +381,7 @@ module.exports = class Singleton {
     const payLoad = {
       ...rest,
       page_url: options.page + (query ? '?' + query : ''),
-      page_title: options.page_title,
+      page_title: title,
       is_permanent: true,
     }
 

package/package.json

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