q-koa 13.4.2 → 13.4.5

package/core/app.js

@@ -222,6 +222,7 @@ class APP {
         this.app[appName].sign = async (user) => {
           const result = await jwt.sign(user, secret, {
             expiresIn,
+            algorithm: 'HS256',
           })
           return result
         }
@@ -248,7 +249,9 @@ class APP {
       }
 
       try {
-        const { user } = await verify(token, secret)
+        const { user } = await verify(token, secret, {
+          algorithms: ['HS256'],
+        })
         if (user) {
           if (this.config.log.request) {
             console.log('user id ---> ', appName, '--->', user.id, user.name)
@@ -893,15 +896,11 @@ class APP {
         const modelService = cloneTarget[b]
         const newB = Object.keys(modelService).reduce((_a, _b) => {
           const bindFn = modelService[_b].bind(this.app[appName])
-          return {
-            ..._a,
-            [_b]: bindFn,
-          }
+          _a[_b] = bindFn
+          return _a
         }, {})
-        return {
-          ...a,
-          [b]: newB,
-        }
+        a[b] = newB
+        return a
       }, {})
     }
 
@@ -914,10 +913,8 @@ class APP {
     const modelList = Object.keys(this.app[appName].model)
 
     const include = modelList.reduce((a, b) => {
-      return {
-        ...a,
-        [b]: [],
-      }
+      a[b] = []
+      return a
     }, {})
     this.app[appName] = _.defaultsDeep(
       {
@@ -1308,10 +1305,18 @@ class APP {
                 typeof where.id === 'string' &&
                 where.id.includes('/')
               ) {
+                const arr = where.id.split('?')
+
+                let obj = {}
+                if (arr[1] && arr[1].includes('id=')) {
+                  obj = {
+                    id: JSON.parse(arr[1].split('=')[1]),
+                  }
+                }
                 const _result = await _.get(
                   app[appName].controller,
-                  where.id.replace('/', '.')
-                )(ctx)
+                  arr[0].replace('/', '.')
+                )(ctx, obj)
                 where.id = _result
               }
 

package/core/config.js

@@ -7,6 +7,7 @@ module.exports = {
     dir: 'public',
   },
   is_check_admin: false,
+  is_token_name: true,
   log: {
     request: true,
   },
@@ -67,6 +68,7 @@ module.exports = {
         'log/create',
         'log/upsert',
         'auto/minute',
+        'auto/second',
       ].every((item) => {
         return !ctx.request.url.includes(item)
       })

package/core/file/plugins/administrator/config.js

@@ -3,7 +3,7 @@ module.exports = {
   belongs: 'auth',
   multiple: false,
   order: [],
-  select: [],
+  select: ['name'],
   excludes: ['query', 'post'],
   reference: [
     {

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

@@ -24,9 +24,15 @@ exports.login = async (ctx) => {
     result = hasUser
   }
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -431,20 +431,28 @@ exports.syncModel = async (ctx) => {
   ctx.SUCCESS('ok')
 }
 
-exports.verify = async (ctx) => {
+exports.verify = async (ctx, _data) => {
   const { app, appName } = getAppByCtx(ctx)
-  const { code } = ctx.request.body
+  const { code } = _data || ctx.request.body
+  if (!code) {
+    ctx.SUCCESS(null)
+    return null
+  }
   const verify = util.promisify(jwt.verify)
   const result = await verify(code, 'token')
   ctx.SUCCESS(result)
+  return result
 }
 
-const expressFn = async ({ app, express_number: _express_number }) => {
+const expressFn = async ({ app, express_number: _express_number, mobile }) => {
   const appConfig = getConfig(app)
-  const { app_code, express_mobile } = await appConfig.getObject('express')
+  const { app_code, express_mobile: default_express_mobile } =
+    await appConfig.getObject('express')
 
   const express_number = _express_number.replace(/\t/, '').trim()
 
+  const express_mobile = mobile || default_express_mobile
+
   const lastFour = express_mobile
     .split('')
     .slice(express_mobile.length - 4, express_mobile.length)
@@ -501,7 +509,7 @@ const expressFn = async ({ app, express_number: _express_number }) => {
 exports.express = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { express_number } = ctx.request.body
+  const { express_number, mobile } = ctx.request.body
 
   if (Array.isArray(express_number)) {
     const result = await Promise.all(
@@ -518,6 +526,7 @@ exports.express = async (ctx) => {
     const result = await expressFn({
       app,
       express_number,
+      mobile,
     })
 
     return ctx.SUCCESS(result)
@@ -674,3 +683,66 @@ exports.gpt = async (ctx) => {
   })
   await sleep(1000000)
 }
+
+exports.copyDB = async (ctx) => {
+  const { app, appName: currentAppName } = getAppByCtx(ctx)
+  const {
+    host = '',
+    ori_appname = '',
+    break_list = [],
+    limit = 3000,
+  } = ctx.request.body
+  if (!host) {
+    throw new Error(`?host`)
+  }
+  const list = Object.keys(app.model)
+  const appName = ori_appname || currentAppName
+
+  for (const model of list) {
+    if (break_list.includes(model)) {
+      console.log(`跳过`)
+      continue
+    }
+    const count = await app.model[model].count()
+    if (count > 0) {
+      console.log(`有数据，跳过`)
+      continue
+    }
+    await app.model[model].sync({
+      force: true,
+    })
+    const url = `${host}/${appName}/${model}/findAll`
+    for (let i = 0; i < 10000; i++) {
+      console.log(`page-${i}`)
+      const { code, data } = await axios
+        .post(url, {
+          offset: i * limit,
+          limit,
+          where: {
+            id: {
+              $gt: 0,
+            },
+          },
+          ...(model === 'setting'
+            ? {
+                raw: true,
+              }
+            : {}),
+          autoInclude: false,
+        })
+        .then((res) => res.data)
+
+      if (code !== 200) {
+        break
+      }
+      await app.model[model].bulkCreate(data)
+      if (data.length < limit) {
+        break
+      }
+    }
+
+    console.log(`${model}结束`)
+  }
+
+  ctx.SUCCESS('ok')
+}

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

@@ -147,9 +147,15 @@ exports.login_callback = async (ctx) => {
     ],
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     h5_user: result.h5_user
       ? {
           openid: result.h5_user && result.h5_user.openid,

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

@@ -33,11 +33,12 @@ exports.clearWeixin = async (ctx) => {
 exports.push = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
-  const { message = '测试通知' } = ctx.request.body
+  const { message = '测试通知', url } = ctx.request.body
 
   await app.service.log.push({
     app,
     message,
+    url,
   })
 
   ctx.SUCCESS('ok')

package/core/file/plugins/model/model.js

@@ -222,7 +222,7 @@ exports.alias = {
 
 exports.hookList = {
   type: Sequelize.JSON,
-  comment: 'hookd',
+  comment: 'hook',
   allowNull: false,
   defaultValue: [],
 }

package/core/file/plugins/model_attributes/config.js

@@ -3,7 +3,14 @@ module.exports = {
   belongs: 'auth',
   multiple: false,
   order: [],
-  select: [],
+  select: [
+    {
+      key: 'model_id',
+    },
+    {
+      key: 'name',
+    },
+  ],
   excludes: [],
   defaultOrder: [],
   comment: {},

package/core/file/plugins/permission/config.js

@@ -4,7 +4,11 @@ module.exports = {
   multiple: false,
   availableSort: false,
   order: [],
-  select: [],
+  select: [
+    {
+      key: 'controller',
+    },
+  ],
   excludes: [],
   limit: 20,
   defaultOrder: [],
@@ -12,4 +16,4 @@ module.exports = {
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
-};
+}

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

@@ -157,3 +157,47 @@ exports.html = async (ctx) => {
   </body>
   </html>`
 }
+
+exports.getList = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { type = 'is_custom' } = _data || ctx.request.body
+
+  const settingList = await app.model.setting.findAll({
+    where: {
+      $or: [
+        {
+          is_front: true,
+        },
+        type
+          ? {
+              extra: {
+                [type]: true,
+              },
+            }
+          : null,
+      ].filter(Boolean),
+    },
+    attributes: {
+      exclude: [
+        'name',
+        'created_at',
+        'updated_at',
+        'createdid',
+        'is_cache',
+        'is_front',
+        'is_control',
+        'extra',
+      ],
+    },
+  })
+
+  const payLoad = settingList.map((item) => {
+    return lodash.omit(item.toJSON(), [
+      'type',
+      item.parent_id === 0 ? '' : 'id',
+    ])
+  })
+  ctx.SUCCESS(payLoad)
+  return payLoad
+}

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

@@ -141,7 +141,13 @@ exports.extra = {
   sortOrder: 9,
   set: function (value) {
     try {
-      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      const dataValue =
+        value === null
+          ? {}
+          : typeof value === 'object'
+          ? value
+          : JSON.parse(value)
+
       this.setDataValue('extra', dataValue)
     } catch {
       throw new Error('extra值不合法')

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

@@ -78,13 +78,13 @@ exports.countAndMaxId = async (ctx, _data) => {
     ctx.SUCCESS(null)
     return null
   }
-  const count = await app.model[model].count()
-  const current = await app.model[model].findOne({
-    attributes: ['id', 'created_at'],
-    order: [['id', 'DESC']],
-  })
 
-  const current_max_id = current ? current.id : 0
+  const result = await app.sequelize.query(
+    `select * from INFORMATION_SCHEMA.TABLES where TABLE_SCHEMA = '${app.sequelize.config.database}' and TABLE_NAME = '${model}'`
+  )
+  const count = result[0][0].TABLE_ROWS
+
+  const current_max_id = result[0][0].AUTO_INCREMENT
 
   const lastMonth = await app.model[model].findOne({
     attributes: ['id'],
@@ -933,6 +933,40 @@ exports.checkIndex = async (ctx) => {
   }
 }
 
+exports.checkAttribute = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model } = ctx.request.body
+
+  if (!model) return ctx.ERROR('model不能为空')
+
+  const result = await app.sequelize.getQueryInterface().describeTable(model)
+
+  const attributeList = Object.keys(result).filter(
+    (item) => !['id', 'created_at', 'createdid', 'updated_at'].includes(item)
+  )
+
+  const currentAttributeList = Object.keys(app.attributes[model]).filter(
+    (item) => {
+      return app.attributes[model][item].type !== Sequelize.VIRTUAL
+    }
+  )
+
+  let flag = true
+  if (attributeList.length !== currentAttributeList.length) {
+    flag = false
+  }
+
+  const current = attributeList.filter(
+    (item) => !currentAttributeList.includes(item)
+  )
+
+  ctx.SUCCESS({
+    isSame: flag,
+    current,
+    remote: [],
+  })
+}
+
 exports.dropIndex = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { model, key } = ctx.request.body

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

@@ -80,6 +80,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             const omit = data && data.omit ? data.omit : []
             const pick = data && data.pick ? data.pick : []
             const cacheData = app.cache.get(`${model}`) || []
+
             const cacheList = cacheData
               .map((i) => (i.toJSON ? i.toJSON() : i))
               .filter((c) => {

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

@@ -160,10 +160,15 @@ exports.login = async (ctx) => {
       ...app.include.user,
     ],
   })
+  const is_token_name = app.appConfig.is_token_name
 
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -8,6 +8,8 @@ exports.login = async (ctx) => {
 
   const config = _config || ctx.request.header.config || 'weixin_mp'
 
+  const is_token_name = app.appConfig.is_token_name
+
   const where =
     process.env.NODE_ENV !== 'production'
       ? {
@@ -41,7 +43,11 @@ exports.login = async (ctx) => {
   if (_config === 'none') {
     const tokenResult = {
       id: result.id,
-      name: result.name,
+      ...(is_token_name
+        ? {
+            name: result.name,
+          }
+        : {}),
     }
     const token = await app.sign({
       user: tokenResult,
@@ -192,7 +198,11 @@ exports.login = async (ctx) => {
 
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -315,11 +325,12 @@ exports.checkLogin = async (ctx) => {
   const config = _config || 'weixin_mp'
   const appConfig = getConfig(app)
   if (ctx.request[`${appName}-user`] && ctx.request[`${appName}-user`].id) {
+    const { app_id: appid } = await appConfig.getObject(config)
     const h5_user_include = config.includes('h5')
       ? {
           model: app.model.h5_user,
           where: {
-            appid: (await appConfig.getObject(config)).app_id,
+            appid,
           },
           attributes: {
             exclude: ['created_at', 'updated_at', 'createdid'],
@@ -331,14 +342,18 @@ exports.checkLogin = async (ctx) => {
     const mp_user_include = config.includes('mp')
       ? {
           model: app.model.mp_user,
+          attributes: ['openid', 'unionid'],
           where: {
-            appid: (await appConfig.getObject(config)).app_id,
+            appid,
           },
         }
       : {
           model: app.model.mp_user,
+          attributes: ['openid', 'unionid'],
         }
+
     let result
+
     const includeDefault = [
       {
         model: app.model.github_user,
@@ -353,6 +368,7 @@ exports.checkLogin = async (ctx) => {
 
     if (app.appConfig.loginData) {
       const application = await getAppConfig({ app, config })
+
       const loginData = lodash.mergeWith(
         lodash.cloneDeep(app.appConfig.loginData),
         lodash.get(application, 'loginData', {}),
@@ -379,6 +395,7 @@ exports.checkLogin = async (ctx) => {
           ])
         ),
       }
+
       result = await app.model.user.findOne({
         where: {
           id: ctx.request[`${appName}-user`].id,
@@ -428,9 +445,15 @@ exports.checkLogin = async (ctx) => {
       }
     }
 
+    const is_token_name = app.appConfig.is_token_name
+
     const tokenResult = {
       id: result.id,
-      name: result.name,
+      ...(is_token_name
+        ? {
+            name: result.name,
+          }
+        : {}),
       mp_user: result.mp_user
         ? {
             openid: result.mp_user && result.mp_user.openid,
@@ -451,6 +474,7 @@ exports.checkLogin = async (ctx) => {
           }
         : {}),
     }
+
     const token = await app.sign({
       user: tokenResult,
     })

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

@@ -94,8 +94,17 @@ exports.mp_getPhone = async (ctx) => {
     (!exist.mp_user.appid || exist.mp_user.appid === app_id)
 
   if (mobileExist) {
-    app.service.log.push({ app, message: `系统已存在该手机号${phoneNumber}` })
-    return ctx.ERROR('系统已存在该手机号')
+    const formatMobile = (mobile) => {
+      if (!mobile) return ''
+      return mobile.slice(0, 3) + '*****' + mobile.slice(8, mobile.length)
+    }
+
+    const user_id = getUserByCtx(ctx)
+    app.service.log.push({
+      app,
+      message: `系统已存在该手机号${phoneNumber};${user_id}`,
+    })
+    return ctx.ERROR(`系统已存在该手机号`)
   }
 
   const userResult = await app.model.mp_user.findOne({
@@ -130,9 +139,15 @@ exports.mp_getPhone = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -251,9 +266,15 @@ exports.mp_getPhoneNew = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -492,9 +513,15 @@ exports.mp_login = async (ctx) => {
 
   if (!(result && result.id)) throw new Error('登录失败')
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -671,9 +698,15 @@ exports.h5_login_callback = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -805,9 +838,15 @@ exports.h5_login_info_callback = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -1013,6 +1052,7 @@ exports.mp_pay = async (ctx) => {
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
     profit_sharing = 'N',
+    mch_id = '',
   } = ctx.request.body
   if (price === 0) throw new Error('价格不能为0')
 
@@ -1036,7 +1076,7 @@ exports.mp_pay = async (ctx) => {
     key,
     pay_key: _pay_key,
     partner_key,
-  } = await appConfig.getObject(pay_config)
+  } = await appConfig.getObject(mch_id || pay_config)
 
   const pay_key = _pay_key || key || appName
   const { is_dev, site_host } = await appConfig.getObject('base')
@@ -1048,7 +1088,7 @@ exports.mp_pay = async (ctx) => {
 
   const wxpay = WXPay({
     appid: app_id,
-    mch_id: mchId,
+    mch_id: mchId || mch_id,
     partner_key, // 微信商户平台API密钥
   })
 
@@ -1645,6 +1685,7 @@ exports.checkPayOnly = async (ctx, _data) => {
   })
 
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
+  return { prefix, out_trade_no, ...payResult }
 }
 
 exports.checkRefund = async (ctx, _data) => {
@@ -2044,6 +2085,7 @@ exports.getCommentInfo = async (ctx, _data) => {
   const {
     content: {
       orderInfo: { busiOrderId },
+      content,
     },
   } = info
 
@@ -2060,6 +2102,7 @@ exports.getCommentInfo = async (ctx, _data) => {
   const result = {
     prefix,
     order_id,
+    content,
   }
   ctx.SUCCESS(result)
   return result

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

@@ -687,7 +687,7 @@ exports.pc_pay = async ({
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
   is_admin = false,
-  type = 'SCAN-WEIXIN',
+  type = 'PC-WEIXIN',
   prefix = '',
 }) => {
   if (!ctx) throw new Error('?ctx')
@@ -866,6 +866,60 @@ exports.removereceiver = async ({
   return res
 }
 
+const handleBillData = (result) => {
+  const arr = result.split('\r\n')
+  const list = arr.slice(1, arr.length - 3)
+  return {
+    header: arr[0],
+    list,
+    result: list.map((item) => {
+      const array = item.split(',')
+      const orderdate = array[20].substring(1).slice(2, 10)
+      const orderPrefix = array[6].substring(1).split('_')[1]
+      let order_id = 0
+      let prefix = ''
+      if (orderPrefix.includes('-')) {
+        order_id = Number(orderPrefix.split('-')[1])
+        prefix = orderPrefix.split('-')[0]
+      } else {
+        order_id = Number(orderPrefix)
+      }
+      let order_date
+      if (prefix) {
+        order_date = moment(array[0].substring(1)).format('YYYY-MM-DD') + ''
+      } else {
+        order_date = moment(
+          `${orderdate.slice(0, 4)}-${orderdate.slice(4, 6)}-${orderdate.slice(
+            6,
+            8
+          )}`
+        ).format('YYYY-MM-DD')
+      }
+      return {
+        created_at: array[0].substring(1),
+        transactionid: array[5].substring(1),
+        [`${[prefix, 'order_id'].filter(Boolean).join('_')}`]: order_id,
+        openid: array[7].substring(1),
+        price: Number(array[12].substring(1)),
+        refund_price: Number(array[16].substring(1)),
+        remark: array[20].substring(1),
+        rate_price: Number(array[22].substring(1)),
+        type: array[9].substring(1),
+        order_date,
+      }
+    }),
+    totalHeader: arr[arr.length - 3],
+    total: arr[arr.length - 2],
+    totalResult: {
+      number: Number(arr[arr.length - 2].split(',')[0].substring(1)),
+      total_price: Number(arr[arr.length - 2].split(',')[1].substring(1)),
+      refund_price: Number(arr[arr.length - 2].split(',')[2].substring(1)),
+      rate_price: Number(arr[arr.length - 2].split(',')[4].substring(1)),
+      price: Number(arr[arr.length - 2].split(',')[5].substring(1)),
+    },
+  }
+}
+
 exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...rest }) => {
   if (!ctx) throw new Error('?ctx')
   const { app, appName } = getAppByCtx(ctx)
@@ -887,58 +941,17 @@ exports.downloadBill = async ({ ctx, pay_config = 'weixin_pay', ...rest }) => {
 
   try {
     const result = await payObj.downloadBill(rest)
+    return handleBillData(result)
+  } catch {
+    return []
+  }
+}
 
-    const arr = result.split('\r\n')
-    const list = arr.slice(1, arr.length - 3)
-    return {
-      header: arr[0],
-      list,
-      result: list.map((item) => {
-        const array = item.split(',')
-        const orderdate = array[20].substring(1).slice(2, 10)
-        const orderPrefix = array[6].substring(1).split('_')[1]
-        let order_id = 0
-        let prefix = ''
-        if (orderPrefix.includes('-')) {
-          order_id = Number(orderPrefix.split('-')[1])
-          prefix = orderPrefix.split('-')[0]
-        } else {
-          order_id = Number(orderPrefix)
-        }
-        let order_date
-        if (prefix) {
-          order_date = moment(array[0].substring(1)).format('YYYY-MM-DD') + ''
-        } else {
-          order_date = moment(
-            `${orderdate.slice(0, 4)}-${orderdate.slice(
-              4,
-              6
-            )}-${orderdate.slice(6, 8)}`
-          ).format('YYYY-MM-DD')
-        }
-        return {
-          created_at: array[0].substring(1),
-          transactionid: array[5].substring(1),
-          [`${[prefix, 'order_id'].filter(Boolean).join('_')}`]: order_id,
-          openid: array[7].substring(1),
-          price: Number(array[12].substring(1)),
-          refund_price: Number(array[16].substring(1)),
-          remark: array[20].substring(1),
-          rate_price: Number(array[22].substring(1)),
-          type: array[9].substring(1),
-          order_date,
-        }
-      }),
-      totalHeader: arr[arr.length - 3],
-      total: arr[arr.length - 2],
-      totalResult: {
-        number: Number(arr[arr.length - 2].split(',')[0].substring(1)),
-        total_price: Number(arr[arr.length - 2].split(',')[1].substring(1)),
-        refund_price: Number(arr[arr.length - 2].split(',')[2].substring(1)),
-        rate_price: Number(arr[arr.length - 2].split(',')[4].substring(1)),
-        price: Number(arr[arr.length - 2].split(',')[5].substring(1)),
-      },
-    }
+exports.uploadBill = async ({ ctx, content }) => {
+  if (!ctx) throw new Error('?ctx')
+  if (!content) return []
+  try {
+    return handleBillData(content)
   } catch {
     return []
   }

package/core/file/services/weixinMP.js

@@ -65,6 +65,12 @@ const getShipTemplateUrl =
 const uploadShipUrl =
   'https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token=%s'
 
+const uploadPreShipUrl =
+  'https://api.weixin.qq.com/wxa/sec/order/opspecialorder?access_token=%s'
+
+const getShipOrderListUrl =
+  'https://api.weixin.qq.com/wxa/sec/order/get_order_list?access_token=%s'
+
 const setMsgJumpPathUrl =
   'https://api.weixin.qq.com/wxa/sec/order/set_msg_jump_path?access_token=%s'
 
@@ -117,6 +123,20 @@ const uploadPromise = (options) => {
   })
 }
 
+const https = require('https')
+
+// 1. 全局 HTTPS 连接池（微信专用）
+const wxHttpsAgent = new https.Agent({
+  keepAlive: true, // 开启长连接
+  keepAliveMsecs: 60000, // 空闲连接保留 60 秒
+  maxSockets: 30, // 最大并发连接（适配微信QPS，不超限）
+  maxFreeSockets: 10, // 保留空闲连接数
+  timeout: 8000, // 底层套接字超时
+  rejectUnauthorized: true,
+})
+
+axios.defaults.httpsAgent = wxHttpsAgent
+
 module.exports = class Singleton {
   constructor(config) {
     this.config = {
@@ -786,6 +806,44 @@ module.exports = class Singleton {
     return result
   }
 
+  async uploadPreShip(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(uploadPreShipUrl, 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.uploadPreShip(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async getShipOrderList(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getShipOrderListUrl, 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.getShipOrderList(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   async uploadImage(payLoad) {
     const access_token = await this.getAccessToken()
     const { upload_type, resp_type, ...rest } = payLoad

package/core/file/services/weixinOpen.js

@@ -1,6 +1,17 @@
 const util = require('util')
 const axios = require('axios')
+const https = require('https')
+// 1. 全局 HTTPS 连接池（微信专用）
+const wxHttpsAgent = new https.Agent({
+  keepAlive: true, // 开启长连接
+  keepAliveMsecs: 60000, // 空闲连接保留 60 秒
+  maxSockets: 30, // 最大并发连接（适配微信QPS，不超限）
+  maxFreeSockets: 10, // 保留空闲连接数
+  timeout: 8000, // 底层套接字超时
+  rejectUnauthorized: true,
+})
 
+axios.defaults.httpsAgent = wxHttpsAgent
 const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'

package/package.json

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