q-koa 9.9.9 → 10.0.2

package/core/app.js

@@ -978,6 +978,7 @@ class APP {
             }
             const _str = formatPostFunction(include)
             const postInclude = nodeVm.runInNewContext(_str)
+            const strInclude = postInclude(app[appName])
             // const postInclude = include.toFunction();
             myInclude =
               app[appName] &&
@@ -985,8 +986,14 @@ class APP {
               app[appName].include[controller]
                 ? _.uniqWith(
                     [
-                      ...postInclude(app[appName]),
-                      ...app[appName].include[controller],
+                      ...strInclude,
+                      ...app[appName].include[controller].filter((item) => {
+                        return !strInclude.some(
+                          (i) =>
+                            (i.model && i.model.getName()) ===
+                            (item.model && item.model.getName())
+                        )
+                      }),
                     ],
                     _.isEqual
                   )

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": "9.9.9",
+  "version": "10.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {