q-koa 12.8.1 → 12.8.4

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

@@ -28,21 +28,25 @@ exports.login = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
   const token = await app.sign({
     user: tokenResult,

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

@@ -167,21 +167,25 @@ exports.login = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
 
   const token = await app.sign({

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

@@ -185,21 +185,25 @@ exports.login = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
+      ? {
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
+        }
+      : {}),
+    ...(result.toutiao_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
         }
-      : null,
+      : {}),
   }
   const token = await app.sign({
     user: tokenResult,
@@ -409,21 +413,25 @@ exports.checkLogin = async (ctx) => {
       id: result.id,
       name: result.name,
       mobile: result.mobile,
-      h5_user: result.h5_user
-        ? {
-            openid: result.h5_user && result.h5_user.openid,
-          }
-        : null,
       mp_user: result.mp_user
         ? {
             openid: result.mp_user && result.mp_user.openid,
           }
         : null,
-      toutiao_user: result.toutiao_user
+      ...(result.h5_user
         ? {
-            openid: result.toutiao_user && result.toutiao_user.openid,
+            h5_user: {
+              openid: result.h5_user && result.h5_user.openid,
+            },
           }
-        : null,
+        : {}),
+      ...(result.toutiao_user
+        ? {
+            toutiao_user: {
+              openid: result.toutiao_user && result.toutiao_user.openid,
+            },
+          }
+        : {}),
     }
     const token = await app.sign({
       user: tokenResult,

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

@@ -126,21 +126,25 @@ exports.mp_getPhone = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
 
   const token = await app.sign({
@@ -244,21 +248,25 @@ exports.mp_getPhoneNew = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
 
   const token = await app.sign({
@@ -470,21 +478,25 @@ exports.mp_login = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
 
   const token = await app.sign({
@@ -646,21 +658,25 @@ exports.h5_login_callback = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
         }
-      : null,
+      : {}),
+    ...(result.toutiao_user
+      ? {
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
+        }
+      : {}),
   }
 
   const token = await app.sign({
@@ -777,21 +793,25 @@ exports.h5_login_info_callback = async (ctx) => {
     id: result.id,
     name: result.name,
     mobile: result.mobile,
-    h5_user: result.h5_user
-      ? {
-          openid: result.h5_user && result.h5_user.openid,
-        }
-      : null,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
         }
       : null,
-    toutiao_user: result.toutiao_user
+    ...(result.h5_user
+      ? {
+          h5_user: {
+            openid: result.h5_user && result.h5_user.openid,
+          },
+        }
+      : {}),
+    ...(result.toutiao_user
       ? {
-          openid: result.toutiao_user && result.toutiao_user.openid,
+          toutiao_user: {
+            openid: result.toutiao_user && result.toutiao_user.openid,
+          },
         }
-      : null,
+      : {}),
   }
 
   const token = await app.sign({
@@ -1401,7 +1421,7 @@ exports.refund_notify = async (ctx) => {
     : Number(out_refund_no.split('-')[1])
   const type = out_refund_no.includes('_') ? out_refund_no.split('_')[1] : ''
   const model = prefix ? `${prefix}_order` : 'order'
-  console.log(`微信退款回调 ${refundResult}`)
+
   if (app.service[model] && app.service[model].refund_notify) {
     await app.service[model].refund_notify({
       app,

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.title,
+      page_title: title,
       is_permanent: true,
     }
 

package/package.json

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