q-koa 10.0.1 → 10.0.3

package/core/app.js

@@ -442,7 +442,9 @@ class APP {
         this.app[appName].appConfig &&
         this.app[appName].appConfig.router
       ) {
-        this.app[appName].appConfig.router(router)(this.app[appName])
+        try {
+          this.app[appName].appConfig.router(router)(this.app[appName])
+        } catch (e) {}
       }
 
       if (this.config.defaultRouter) {
@@ -520,7 +522,15 @@ class APP {
     )
     const publicExist = fs.existsSync(pluginDir)
     if (!publicExist) await fsPromise.mkdir(pluginDir)
-    const pluginDirResult = await fsPromise.readdir(pluginDir)
+    const excludesModel = _.get(
+      this.app[appName],
+      'appConfig.excludesModel',
+      []
+    )
+    const pluginDirList = await fsPromise.readdir(pluginDir)
+    const pluginDirResult = pluginDirList.filter(
+      (item) => !excludesModel.includes(item)
+    )
     for (let i = 0; i < pluginDirResult.length; i++) {
       const folder = pluginDirResult[i]
       const isFolder = fs

package/core/file/services/weixinMP.js

@@ -41,8 +41,16 @@ const getOrderUrl =
 const refundOrderUrl =
   'https://api.weixin.qq.com/shop/pay/refundorder?access_token=%s'
 
-const path = require('path')
-const fs = require('fs')
+const addGoodUrl = 'https://api.weixin.qq.com/shop/spu/add?access_token=%s'
+
+const getCategoryUrl = 'https://api.weixin.qq.com/shop/cat/get?access_token=%s'
+
+const getBrandListUrl =
+  'https://api.weixin.qq.com/shop/account/get_brand_list?access_token=%s'
+
+const uploadImageUrl =
+  'https://api.weixin.qq.com/shop/img/upload?access_token=%s'
+
 const fsPromise = require('fs/promises')
 const LRU = require('lru-cache')
 const request = require('request')
@@ -51,7 +59,6 @@ const cache = new LRU({
   maxAge: 1000 * 60 * 60,
 })
 const uuid = require('node-uuid')
-const { rest } = require('lodash')
 
 const uploadPromise = (options) => {
   return new Promise((resolve, reject) => {
@@ -571,6 +578,81 @@ module.exports = class Singleton {
     return result.data
   }
 
+  async addGood(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(addGoodUrl, access_token)
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.addGood(payLoad)
+      }
+      // return payLoad
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.data
+  }
+
+  async getCategory(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getCategoryUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getCategory(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.third_cat_list
+  }
+
+  async getBrandList(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getBrandListUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getBrandList(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.data
+  }
+
+  async uploadImage(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(uploadImageUrl, access_token)
+
+    const result = await uploadPromise({
+      url,
+      formData: payLoad,
+    })
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.uploadImage(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.img_info
+  }
+
   getConfig() {
     return this.config
   }

package/package.json

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