q-koa 8.5.0 → 8.5.3

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

@@ -104,7 +104,9 @@ exports.showTables = async (ctx) => {
     const defaultConfigPath = path.resolve(__dirname, `../${_model}/config.js`)
     const defaultConfigExist = fs.existsSync(defaultConfigPath)
     const target =
-      Object.keys(app.config[_model]).length === 0 && defaultConfigExist
+      app.config[_model] &&
+      Object.keys(app.config[_model]).length === 0 &&
+      defaultConfigExist
         ? require(defaultConfigPath)
         : app.config[_model]
     // const target = Object.keys(app.config[model])

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

@@ -112,6 +112,7 @@ exports.cash = async ({
   if (result.err_code_des) throw new Error(result.err_code_des)
   return result
 }
+
 exports.qr_code = async ({
   app,
   page,
@@ -168,17 +169,35 @@ exports.qr_code = async ({
     const fileName = `${
       String(new Date().getTime()).split('').reverse().join('') + Math.random()
     }.png`
-    const result = await client.put(fileName, buffer)
-    if (result.res && result.res.status === 200) {
-      if (oss_host && cdn_host) {
-        const url = result.url.replace(oss_host, cdn_host)
+
+    const handelResult = (result) => {
+      if (result && result.res && result.res.status === 200) {
+        if (oss_host && cdn_host) {
+          const url = result.url.replace(oss_host, cdn_host)
+          return url
+        } else {
+          return result.url
+        }
+      } else {
+        return null
+      }
+    }
+    try {
+      const result = await client.put(fileName, buffer)
+      const url = handelResult(result)
+      if (url) {
         return url
       } else {
-        const url = result.url
+        throw new Error(`发生错误，请重试`)
+      }
+    } catch (e) {
+      const result = await client.put(fileName, buffer)
+      const url = handelResult(result)
+      if (url) {
         return url
+      } else {
+        throw new Error(`发生错误，请重试`)
       }
-    } else {
-      throw new Error(result.res.statusMessage)
     }
   }
 }

package/core/file/utils/index.js

@@ -15,7 +15,7 @@ exports.getList = (config) => (type) => {
   return list
 }
 
-exports.getObject = (config) => (type) => {
+exports.getObject = (config, app) => async (type) => {
   if (app) {
     const applicationList = await app.cache.get('application')
     if (

package/package.json

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