q-koa 13.8.10 → 13.8.12

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

@@ -86,19 +86,17 @@ exports.init = async (ctx) => {
     raw: true,
   })
 
-  let list = []
+  const list = []
   let number = 0
   for (let i = 0; i < parentList.length; i++) {
     number += 1
+    const parentId = number
     const { id: parent_id, ...rest } = parentList[i]
-    list = [
-      ...list,
-      {
-        id: number,
-        ...rest,
-        parent_id: 0,
-      },
-    ]
+    list.push({
+      id: parentId,
+      ...rest,
+      parent_id: 0,
+    })
     const childList = await app.model.setting.findAll({
       where: {
         parent_id,
@@ -106,20 +104,15 @@ exports.init = async (ctx) => {
       order: [['id', 'ASC']],
       raw: true,
     })
-    list = [
-      ...list,
-      ...childList.map((item, index) => {
-        const { id: child_id, ...restChild } = item
-        const id = number + index + 1
-
-        return {
-          id,
-          ...restChild,
-          parent_id: number,
-        }
-      }),
-    ]
-    number += childList.length
+    for (let j = 0; j < childList.length; j++) {
+      number += 1
+      const { id: child_id, ...restChild } = childList[j]
+      list.push({
+        id: number,
+        ...restChild,
+        parent_id: parentId,
+      })
+    }
   }
 
   await app.model.setting.sync({ force: true })

package/core/file/services/weixinMP.js

@@ -127,7 +127,7 @@ const hmacSha256 = (data, secret) => {
   return crypto.createHmac('sha256', secret).update(data).digest('hex')
 }
 const uploadPromise = async (url, formData) => {
-  const response = await axios.post(url, formData, {
+  const response = await wxAxios.post(url, formData, {
     headers: formData.getHeaders(),
   })
   return response.data
@@ -145,7 +145,10 @@ const wxHttpsAgent = new https.Agent({
   rejectUnauthorized: true,
 })
 
-axios.defaults.httpsAgent = wxHttpsAgent
+// 微信专用 axios 实例，避免修改全局 axios.defaults 影响其他模块
+const wxAxios = axios.create({
+  httpsAgent: wxHttpsAgent,
+})
 
 module.exports = class Singleton {
   static _instanceMap = new Map()
@@ -177,7 +180,7 @@ module.exports = class Singleton {
     }
     const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
 
-    const result = await axios.get(url).then((res) => res.data)
+    const result = await wxAxios.get(url).then((res) => res.data)
     const { errcode, errmsg, access_token } = result
 
     if (errcode) {
@@ -191,7 +194,7 @@ module.exports = class Singleton {
   async getExpress() {
     const access_token = await this.getAccessToken()
     const url = util.format(getExpressUrl, access_token)
-    const result = await axios.post(url).then((res) => res.data)
+    const result = await wxAxios.post(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -231,7 +234,7 @@ module.exports = class Singleton {
       service,
     }
 
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -263,7 +266,7 @@ module.exports = class Singleton {
       username,
     }
 
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -285,7 +288,7 @@ module.exports = class Singleton {
       username,
       role,
     }
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -335,7 +338,7 @@ module.exports = class Singleton {
       closeShare: 1,
       closeKf: 1,
     }
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -366,7 +369,7 @@ module.exports = class Singleton {
       start,
       limit,
     }
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -380,7 +383,7 @@ module.exports = class Singleton {
   async getPhoneNumber(code) {
     const access_token = await this.getAccessToken()
     const url = util.format(getPhoneNumberUrl, access_token)
-    const result = await axios.post(url, { code }).then((res) => res.data)
+    const result = await wxAxios.post(url, { code }).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -405,7 +408,7 @@ module.exports = class Singleton {
         : '',
     }
 
-    const result = await axios.post(url, payLoad).then((res) => res.data)
+    const result = await wxAxios.post(url, payLoad).then((res) => res.data)
 
     if (result.errcode) {
       if (result.errcode === 40001) {
@@ -421,7 +424,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(queryUrlLinkUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         url_link,
       })
@@ -458,7 +461,7 @@ module.exports = class Singleton {
       is_permanent: true,
     }
 
-    const result = await axios.post(url, payLoad).then((res) => res.data)
+    const result = await wxAxios.post(url, payLoad).then((res) => res.data)
 
     if (result.errcode) {
       if (result.errcode === 40001) {
@@ -486,7 +489,7 @@ module.exports = class Singleton {
       },
     }
 
-    const result = await axios.post(url, payLoad).then((res) => res.data)
+    const result = await wxAxios.post(url, payLoad).then((res) => res.data)
 
     if (result.errcode) {
       if (result.errcode === 40001) {
@@ -512,7 +515,7 @@ module.exports = class Singleton {
     }
     const creatuuid = uuid.v1()
 
-    const bufferResult = await axios
+    const bufferResult = await wxAxios
       .post(url, payLoad, {
         responseType: 'arraybuffer',
       })
@@ -548,7 +551,7 @@ module.exports = class Singleton {
         : '',
     }
 
-    const bufferResult = await axios
+    const bufferResult = await wxAxios
       .post(url, payLoad, {
         responseType: 'arraybuffer',
       })
@@ -579,7 +582,7 @@ module.exports = class Singleton {
         }
       }),
     }
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -593,7 +596,7 @@ module.exports = class Singleton {
   async handleMessage(options) {
     const access_token = await this.getAccessToken()
     const url = util.format(handleMessageUrl, access_token)
-    const result = await axios.post(url, options).then((res) => res.data)
+    const result = await wxAxios.post(url, options).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -611,7 +614,7 @@ module.exports = class Singleton {
     }
     const access_token = await this.getAccessToken()
     const url = util.format(handleTypingUrl, access_token)
-    const result = await axios.post(url, options).then((res) => res.data)
+    const result = await wxAxios.post(url, options).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -628,7 +631,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(uploadFile, access_token, 'image')
     const fullUrl = imgUrl.startsWith('//') ? `http:${imgUrl}` : imgUrl
-    const stream = (await axios.get(fullUrl, { responseType: 'stream' })).data
+    const stream = (await wxAxios.get(fullUrl, { responseType: 'stream' })).data
     const formData = new FormData()
     formData.append('media', stream)
     const uploadResult = await uploadPromise(url, formData)
@@ -645,7 +648,7 @@ module.exports = class Singleton {
   async invokeService(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(serviceMarketUrl, access_token)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -663,7 +666,7 @@ module.exports = class Singleton {
   async createOrder(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(createOrderUrl, access_token)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -682,7 +685,7 @@ module.exports = class Singleton {
   async getOrder(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(getOrderUrl, access_token)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -701,7 +704,7 @@ module.exports = class Singleton {
   async refundOrder(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(refundOrderUrl, access_token)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -720,8 +723,7 @@ module.exports = class Singleton {
   async addGood(payLoad) {
     const access_token = await this.getAccessToken()
     const url = util.format(addGoodUrl, access_token)
-    console.log('payLoad', payLoad)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -741,7 +743,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getCategoryUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -760,7 +762,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getBrandListUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -779,7 +781,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getShipTemplateUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -798,7 +800,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(uploadShipUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -817,7 +819,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(uploadPreShipUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -836,7 +838,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getShipOrderListUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -862,7 +864,7 @@ module.exports = class Singleton {
       resp_type
     )
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...rest,
       })
@@ -882,7 +884,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(setMsgJumpPathUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -901,7 +903,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getDeliveryListUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -920,7 +922,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getUserPortraitUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -955,7 +957,7 @@ module.exports = class Singleton {
       )
     }
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         ...payLoad,
       })
@@ -977,7 +979,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(getCommentInfoUrl, commentId, access_token)
 
-    const result = await axios.get(url).then((res) => res.data)
+    const result = await wxAxios.get(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -995,7 +997,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(createActivityUrl, access_token)
 
-    const result = await axios.get(url).then((res) => res.data)
+    const result = await wxAxios.get(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1062,7 +1064,7 @@ module.exports = class Singleton {
     if (!postData.template_info.parameter_list.length) {
       throw new ServiceError('?parameter_list length 0')
     }
-    const result = await axios.post(url, postData).then((res) => res.data)
+    const result = await wxAxios.post(url, postData).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1083,7 +1085,7 @@ module.exports = class Singleton {
   }) {
     const weixinLoginUrl = `https://api.weixin.qq.com/sns/jscode2session?appid=${this.config.appid}&secret=${this.config.secrect}&js_code=${code}&grant_type=authorization_code`
 
-    const weixinResult = await axios.get(weixinLoginUrl).then((res) => res.data)
+    const weixinResult = await wxAxios.get(weixinLoginUrl).then((res) => res.data)
 
     const { session_key } = weixinResult
 
@@ -1119,7 +1121,7 @@ module.exports = class Singleton {
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
 
     const url = util.format(requestUrl, access_token, pay_sig)
-    const result = await axios.post(url, signData).then((res) => res.data)
+    const result = await wxAxios.post(url, signData).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1145,7 +1147,7 @@ module.exports = class Singleton {
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
 
     const url = util.format(requestUrl, access_token, pay_sig)
-    const result = await axios.post(url, signData).then((res) => res.data)
+    const result = await wxAxios.post(url, signData).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1171,7 +1173,7 @@ module.exports = class Singleton {
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
 
     const url = util.format(requestUrl, access_token, pay_sig)
-    const result = await axios.post(url, signData).then((res) => res.data)
+    const result = await wxAxios.post(url, signData).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1186,7 +1188,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(b2bPreStoreUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         retail_info_list: list,
       })
@@ -1216,7 +1218,7 @@ module.exports = class Singleton {
     const pay_sig = hmacSha256(`${uri}&${JSON.stringify(signData)}`, app_key)
 
     const url = util.format(requestUrl, access_token, pay_sig)
-    const result = await axios.post(url, signData).then((res) => res.data)
+    const result = await wxAxios.post(url, signData).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -1231,7 +1233,7 @@ module.exports = class Singleton {
     const access_token = await this.getAccessToken()
     const url = util.format(b2bSendMessageUrl, access_token)
 
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         type,
         to_user_list,

package/core/file/services/weixinOpen.js

@@ -11,7 +11,10 @@ const wxHttpsAgent = new https.Agent({
   rejectUnauthorized: true,
 })
 
-axios.defaults.httpsAgent = wxHttpsAgent
+// 微信专用 axios 实例，避免修改全局 axios.defaults 影响其他模块
+const wxAxios = axios.create({
+  httpsAgent: wxHttpsAgent,
+})
 const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
@@ -65,7 +68,7 @@ module.exports = class Singleton {
     }
     const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
 
-    const result = await axios.get(url).then((res) => res.data)
+    const result = await wxAxios.get(url).then((res) => res.data)
     const { errcode, errmsg, access_token } = result
 
     if (errcode) {
@@ -79,7 +82,7 @@ module.exports = class Singleton {
   async getOpenList() {
     const access_token = await this.getAccessToken()
     const url = util.format(getOpenListUrl, access_token)
-    const result = await axios.post(url).then((res) => res.data)
+    const result = await wxAxios.post(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -93,7 +96,7 @@ module.exports = class Singleton {
   async getUserInfo(openid) {
     const access_token = await this.getAccessToken()
     const url = util.format(getUserInfoUrl, access_token, openid)
-    const result = await axios.post(url).then((res) => res.data)
+    const result = await wxAxios.post(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -113,7 +116,7 @@ module.exports = class Singleton {
     })
     const access_token = await this.getAccessToken()
     const url = util.format(getUserInfoListUrl, access_token)
-    const result = await axios
+    const result = await wxAxios
       .post(url, {
         user_list,
       })
@@ -140,7 +143,7 @@ module.exports = class Singleton {
       }),
     }
 
-    const result = await axios.post(url, formatOptions).then((res) => res.data)
+    const result = await wxAxios.post(url, formatOptions).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()
@@ -154,7 +157,7 @@ module.exports = class Singleton {
   async getTemplate() {
     const access_token = await this.getAccessToken()
     const url = util.format(getTemplateUrl, access_token)
-    const result = await axios.post(url).then((res) => res.data)
+    const result = await wxAxios.post(url).then((res) => res.data)
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.clear()

package/core/file/utils/index.js

@@ -359,7 +359,7 @@ const filterFunction = (target, data) => {
         return data[key] > target[key].$gt
       } else if ('$gte' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
-          return moment(data[key]).diff(moment(target[key].$gt), 'seconds') >= 0
+          return moment(data[key]).diff(moment(target[key].$gte), 'seconds') >= 0
         }
         return data[key] >= target[key].$gte
       } else if ('$lt' in target[key]) {

package/package.json

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