q-koa 8.9.4 → 9.0.2

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

@@ -96,8 +96,15 @@ exports.initRoute = async (ctx) => {
     },
   ]
 
-  const permissionList = await app.model.permission.findAll()
-  const modelList = await app.model.model.findAll()
+  const permissionList = await app.model.permission.findAll({
+    attributes: ['id', 'name', 'controller'],
+    raw: true,
+  })
+  const modelList = await app.model.model.findAll({
+    attributes: ['id', 'belongs', 'model'],
+    raw: true,
+  })
+
   const roleList = await app.model.role.findAll()
   const rolePermission = lodash.uniq(
     roleList
@@ -105,7 +112,7 @@ exports.initRoute = async (ctx) => {
       .reduce((a, b) => [...a, ...b.permission_id], [])
   )
   for (let i = 0; i < permissionList.length; i++) {
-    const target = permissionList[i].toJSON()
+    const target = permissionList[i]
     if (target.controller === '') {
       await app.model.permission.destroy({
         where: {
@@ -128,18 +135,20 @@ exports.initRoute = async (ctx) => {
     const is_project = !model
     list = [
       ...list,
-      {
-        name: target.name,
-        parent_id,
-        url: is_project ? `/project/${appName}/` + target.controller : '',
-        model_id: model ? model.id : 0,
-        key: is_project
-          ? ''
-          : model && model.belongs
-          ? `${model.belongs}/${model.model}`
-          : '',
-      },
-    ]
+      model
+        ? {
+            name: target.name,
+            parent_id,
+            url: is_project ? `/project/` + target.controller : '',
+            model_id: model ? model.id : 0,
+            key: is_project
+              ? ''
+              : model && model.belongs
+              ? `${model.belongs}/${model.model}`
+              : '',
+          }
+        : null,
+    ].filter(Boolean)
   }
   const sortList = list.map((item) => {
     const sort = routesList.find((r) => r.name === item.name)

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

@@ -1,6 +1,7 @@
 const { getConfig, lodash } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
+const axios = require('axios')
 
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)

package/core/file/services/print.js

@@ -69,7 +69,7 @@ module.exports = class Singleton {
       const Print = new yly.Print(RpcClient)
       const res = await Print.index(this.config.machine_code, order_id, content)
 
-      if (res.code !== '0') {
+      if (res && res.error_description !== 'success') {
         throw new Error(res.error_description)
       }
     } catch (e) {

package/core/file/services/weixinMP.js

@@ -100,7 +100,14 @@ module.exports = class Singleton {
       return cache.get(appid)
     }
     const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
-    const { access_token } = await axios.get(url).then((res) => res.data)
+
+    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
   }

package/package.json

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