q-koa 13.8.0 → 13.8.2

package/core/app.js

@@ -6,7 +6,7 @@ const fs = require('fs')
 const fsPromise = require('fs/promises')
 const Sequelize = require('sequelize')
 const redis = require('redis')
-const moment = require('dayjs')
+const moment = require('moment')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
 const { LRUCache } = require('lru-cache')

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

@@ -1,7 +1,7 @@
 const { getConfig, ServiceError } = require('q-koa')
 const axios = require('axios')
 const XLSX = require('xlsx')
-const moment = require('dayjs')
+const moment = require('moment')
 
 exports.gpt = async ({ app, content }) => {
   if (!content) throw new ServiceError('?content')

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

@@ -1326,14 +1326,15 @@ exports.union_pay = async (ctx) => {
     acct: userDetail.openid,
   })
 
+  const payInfo = JSON.parse(res.payinfo)
   const obj = {
     signData: JSON.stringify({
       requestPaymentInfo: {
-        timeStamp: JSON.parse(res.payinfo).timeStamp,
-        package: JSON.parse(res.payinfo).package,
-        signType: JSON.parse(res.payinfo).signType,
-        paySign: JSON.parse(res.payinfo).paySign,
-        nonceStr: JSON.parse(res.payinfo).nonceStr,
+        timeStamp: payInfo.timeStamp,
+        package: payInfo.package,
+        signType: payInfo.signType,
+        paySign: payInfo.paySign,
+        nonceStr: payInfo.nonceStr,
       },
     }),
     mode: 'retail_pay_indirect_goods',

package/core/file/services/print.js

@@ -9,7 +9,7 @@ const yly = require('yly-nodejs-sdk')
 module.exports = class Singleton {
   static _instanceMap = new Map()
   constructor(config) {
-    const key = config.cid
+    const key = `${config.cid}_${config.machine_code}`
     if (Singleton._instanceMap.has(key)) {
       return Singleton._instanceMap.get(key)
     }

package/core/file/services/weixinArticle.js

@@ -1,5 +1,5 @@
 const cheerio = require('cheerio')
-const moment = require('dayjs')
+const moment = require('moment')
 
 exports.handleHtml = async function (html) {
   const $ = cheerio.load(html, {

package/core/file/utils/index.js

@@ -1,7 +1,7 @@
 const { lodash } = require('q-koa')
 const Sequelize = require('sequelize')
 const md5 = require('md5')
-const moment = require('dayjs')
+const moment = require('moment')
 const _ = require('lodash')
 
 const findConfig = (type) => (item) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.0",
+  "version": "13.8.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -62,6 +62,7 @@
     "xlsx": "^0.18.5",
     "pm2": "^7.0.1",
     "dayjs": "^1.11.13",
+    "moment": "^2.30.1",
     "form-data": "^4.0.0",
     "adm-zip": "^0.6.0"
   },