q-koa 13.7.0 → 13.7.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 dayjs = require('dayjs')
+const moment = require('dayjs')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
 const { LRUCache } = require('lru-cache')
@@ -241,7 +241,7 @@ class APP {
 
       if (url.length > 2 && this.config.log.request) {
         console.log(
-          dayjs().format('HH:mm:ss'),
+          moment().format('HH:mm:ss'),
           url,
           host,
           ctx.request.clientType
@@ -323,7 +323,7 @@ class APP {
       }
       this.server = this.app.listen(this.port, () => {
         console.log(
-          `${dayjs().format(
+          `${moment().format(
             'HH:mm:ss'
           )} server is running at http://localhost:${this.port}`
         )
@@ -923,7 +923,7 @@ class APP {
         }
       }
     }
-    const start = dayjs().valueOf()
+    const start = moment().valueOf()
     for (const fn of ['service']) {
       const cloneTarget = this.app[appName][fn]
 
@@ -940,7 +940,7 @@ class APP {
     }
 
     if (is_dev) {
-      console.log('挂载service bind', dayjs().valueOf() - start)
+      console.log('挂载service bind', moment().valueOf() - start)
     }
   }
 
@@ -2279,11 +2279,11 @@ APP.Random = Random
 APP.Validator = Validator
 APP.ServiceError = ServiceError
 APP.TransactionError = TransactionError
-APP.dayjs = dayjs
+APP.moment = moment
 APP.utils = require('./file/utils')
 APP.is_dev = is_dev
 
-global.dayjs = dayjs
+global.moment = moment
 global.Sequelize = Sequelize
 global.lodash = _
 

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

@@ -467,9 +467,9 @@ const expressFn = async ({ app, express_number: _express_number, mobile }) => {
       },
     })
     if (history) {
-      const diffNoLong = dayjs().diff(dayjs(history.updated_at), 'hour') < 1
+      const diffNoLong = moment().diff(moment(history.updated_at), 'hours') < 1
       const isTooLong =
-        dayjs().diff(dayjs(history.result.updateTime), 'day') > 30
+        moment().diff(moment(history.result.updateTime), 'days') > 30
 
       if (diffNoLong || isTooLong) {
         return history.result
@@ -753,7 +753,7 @@ exports.restart = async (ctx) => {
 
   const { hour: _hour } = ctx.request.query
 
-  const hour = dayjs().hour()
+  const hour = moment().hour()
   if (hour === Number(_hour)) {
     pm2.connect((err) => {
       console.log(err)

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 dayjs = require('dayjs')
+const moment = require('dayjs')
 
 exports.gpt = async ({ app, content }) => {
   if (!content) throw new ServiceError('?content')
@@ -34,7 +34,7 @@ exports.gpt = async ({ app, content }) => {
 }
 
 exports.formatXLSX = ({ header, data, fileName: _fileName }) => {
-  const fileName = `${_fileName || dayjs().format('YYYYMMDDHHmmss') + ''}.xlsx`
+  const fileName = `${_fileName || moment().format('YYYYMMDDHHmmss') + ''}.xlsx`
   const workbook = XLSX.utils.book_new()
   const worksheetData = [header, ...data]
   const worksheet = XLSX.utils.aoa_to_sheet(worksheetData)

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

@@ -1,4 +1,4 @@
-const { getAppByCtx, getConfig, lodash, dayjs, getService } = require('q-koa')
+const { getAppByCtx, getConfig, lodash, moment, getService } = require('q-koa')
 const util = require('util')
 const axios = require('axios')
 const qr = require('qr-image')
@@ -343,7 +343,7 @@ const updateTask = async ({ app, list, active_time, douyin }) => {
                 digg_count: statistics.digg_count,
                 download_count: statistics.download_count,
                 forward_count: statistics.forward_count,
-                created_at: dayjs(create_time * 1000),
+                created_at: moment(create_time * 1000),
                 is_reviewed,
                 name: title,
                 video_status: status[video_status],
@@ -366,7 +366,7 @@ exports.hotSearch = async (ctx) => {
 
   const hotWord = await app.model.hot_search.findOne()
   const minutes = hotWord
-    ? dayjs().diff(dayjs(hotWord.created_at), 'minute')
+    ? moment().diff(moment(hotWord.created_at), 'minutes')
     : 1000
 
   if (minutes < 30) {

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

@@ -1,4 +1,4 @@
-const { Sequelize, Random, lodash, dayjs } = require('q-koa')
+const { Sequelize, Random, lodash, moment } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING(),
@@ -74,9 +74,9 @@ exports.value = {
           ? 0
           : Number(this.getDataValue('value'))
       case 'datetime':
-        return dayjs(this.getDataValue('value')).format('YYYY-MM-DD HH:mm:ss')
+        return moment(this.getDataValue('value')).format('YYYY-MM-DD HH:mm:ss')
       case 'date':
-        return dayjs(this.getDataValue('value')).format('YYYY-MM-DD')
+        return moment(this.getDataValue('value')).format('YYYY-MM-DD')
       case 'image':
         return this.getDataValue('value').startsWith('//')
           ? `https:${this.getDataValue('value')}`

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

@@ -3,7 +3,7 @@ const path = require('path')
 const fsPromise = require('fs/promises')
 const { VM } = require('vm2')
 const axios = require('axios')
-const { lodash, getAppByCtx, getConfig, Sequelize, dayjs } = require('q-koa')
+const { lodash, getAppByCtx, getConfig, Sequelize, moment } = require('q-koa')
 const { LRUCache } = require('lru-cache')
 const cache = new LRUCache({
   max: 10,
@@ -90,7 +90,7 @@ exports.countAndMaxId = async (ctx, _data) => {
     attributes: ['id'],
     where: {
       created_at: {
-        $lt: dayjs().add(-1, 'month'),
+        $lt: moment().add(-1, 'months'),
       },
     },
     order: [['id', 'DESC']],
@@ -822,7 +822,7 @@ exports.mockPay = async (ctx) => {
     ...(rest.transactionid
       ? {}
       : {
-          transactionid: dayjs().valueOf() + '',
+          transactionid: moment().valueOf() + '',
         }),
   })
   ctx.SUCCESS('ok')

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

@@ -1,5 +1,5 @@
 const md5 = require('js-md5')
-const { getAppByCtx, getConfig, lodash, dayjs } = require('q-koa')
+const { getAppByCtx, getConfig, lodash, moment } = require('q-koa')
 const { getAppConfig } = require('../../utils')
 
 exports.login = async (ctx) => {
@@ -229,11 +229,11 @@ exports.login = async (ctx) => {
 
   if (
     result.updated_at &&
-    dayjs().diff(dayjs(result.updated_at), 'hour') > 24
+    moment().diff(moment(result.updated_at), 'hours') > 24
   ) {
     app.model.user.upsert({
       id: result.id,
-      updated_at: dayjs(),
+      updated_at: moment(),
     })
   }
 
@@ -481,11 +481,11 @@ exports.checkLogin = async (ctx) => {
 
     if (
       result.updated_at &&
-      dayjs().diff(dayjs(result.updated_at), 'hour') > 24
+      moment().diff(moment(result.updated_at), 'hours') > 24
     ) {
       app.model.user.upsert({
         id: result.id,
-        updated_at: dayjs(),
+        updated_at: moment(),
       })
     }
     return ctx.SUCCESS({

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

@@ -2,7 +2,7 @@ const {
   lodash,
   getAppByCtx,
   getConfig,
-  dayjs,
+  moment,
   ServiceError,
   getUserByCtx,
 } = require('q-koa')
@@ -551,11 +551,11 @@ exports.mp_login = async (ctx) => {
 
   if (
     result.updated_at &&
-    dayjs().diff(dayjs(result.updated_at), 'hour') > 24
+    moment().diff(moment(result.updated_at), 'hours') > 24
   ) {
     app.model.user.upsert({
       id: result.id,
-      updated_at: dayjs(),
+      updated_at: moment(),
     })
   }
 
@@ -1614,7 +1614,7 @@ exports.query_url_link = async (ctx, _data) => {
   const result = await weixinMp.queryUrlLink(url_link)
   const payLoad = {
     ...result,
-    is_out: result.expire_time * 1000 - dayjs().valueOf() < 0,
+    is_out: result.expire_time * 1000 - moment().valueOf() < 0,
   }
 
   ctx.SUCCESS(payLoad)
@@ -2389,25 +2389,25 @@ exports.getUserPortrait = async (ctx) => {
   weixinMp.init()
 
   let obj = {}
-  const diff = dayjs().hour() > 8 ? -1 : -2
+  const diff = moment().hour() > 8 ? -1 : -2
   if (type === 'day') {
     obj = {
-      begin_date: dayjs().add(diff, 'day').format('YYYYMMDD'),
-      end_date: dayjs().add(diff, 'day').format('YYYYMMDD'),
+      begin_date: moment().add(diff, 'days').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   } else if (type === 'week') {
     obj = {
-      begin_date: dayjs()
-        .add(-6 + diff, 'day')
+      begin_date: moment()
+        .add(-6 + diff, 'days')
         .format('YYYYMMDD'),
-      end_date: dayjs().add(diff, 'day').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   } else if (type === 'month') {
     obj = {
-      begin_date: dayjs()
-        .add(-29 + diff, 'day')
+      begin_date: moment()
+        .add(-29 + diff, 'days')
         .format('YYYYMMDD'),
-      end_date: dayjs().add(diff, 'day').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   }
   console.log('obj', obj)
@@ -2423,9 +2423,9 @@ exports.getVisitTrend = async (ctx, _data) => {
   const { config = 'weixin_mp', type = 'day', date } = _data || ctx.request.body
   const { app_id, app_secrect } = await appConfig.getObject(config)
 
-  const diff = dayjs().hour() > 8 ? -1 : -2
+  const diff = moment().hour() > 8 ? -1 : -2
 
-  const begin_date = dayjs(date ? date : dayjs().add(diff, 'day')).format(
+  const begin_date = moment(date ? date : moment().add(diff, 'days')).format(
     'YYYYMMDD'
   )
 
@@ -2433,8 +2433,8 @@ exports.getVisitTrend = async (ctx, _data) => {
     const target = await app.model.weixin_visit.findOne({
       where: {
         ref_date: date
-          ? Number(dayjs(date).format('YYYYMMDD'))
-          : Number(dayjs(begin_date).format('YYYYMMDD')),
+          ? Number(moment(date).format('YYYYMMDD'))
+          : Number(moment(begin_date).format('YYYYMMDD')),
       },
     })
     if (target) {
@@ -2448,7 +2448,7 @@ exports.getVisitTrend = async (ctx, _data) => {
   if (type === 'day') {
     obj = {
       begin_date,
-      end_date: dayjs(date ? date : dayjs().add(diff, 'day')).format(
+      end_date: moment(date ? date : moment().add(diff, 'days')).format(
         'YYYYMMDD'
       ),
     }
@@ -2467,7 +2467,7 @@ exports.getVisitTrend = async (ctx, _data) => {
   } else {
     return app.controller.weixin.getVisitTrend(ctx, {
       type,
-      date: dayjs(date).add(-1, 'day').format('YYYYMMDD'),
+      date: moment(date).add(-1, 'days').format('YYYYMMDD'),
     })
   }
 

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

@@ -3,7 +3,7 @@ const {
   getAppConfig,
   getConfig,
   lodash,
-  dayjs,
+  moment,
   sleep,
 } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
@@ -1010,9 +1010,9 @@ const handleBillData = (result) => {
       }
       let order_date
       if (prefix) {
-        order_date = dayjs(array[0].substring(1)).format('YYYY-MM-DD') + ''
+        order_date = moment(array[0].substring(1)).format('YYYY-MM-DD') + ''
       } else {
-        order_date = dayjs(
+        order_date = moment(
           `${orderdate.slice(0, 4)}-${orderdate.slice(4, 6)}-${orderdate.slice(
             6,
             8
@@ -1150,7 +1150,7 @@ exports.union_downloadBill = async ({
   })
 
   const result = await allinpay.downloadBill({
-    date: date || dayjs().add(-1, 'day').format('YYYYMMDD'),
+    date: date || moment().add(-1, 'days').format('YYYYMMDD'),
   })
 
   if (result && result.url) {
@@ -1292,7 +1292,7 @@ exports.union_downloadBill = async ({
         const orderTarget = orderList.find((o) => o.id === item.order_id)
         openid = orderTarget.user && orderTarget.user.mp_openid
         remark = `订单${orderTarget.orderid}`
-        order_date = dayjs(orderTarget.created_at).format('YYYY-MM-DD')
+        order_date = moment(orderTarget.created_at).format('YYYY-MM-DD')
         application_id = orderTarget.application_id
       } else if (item.member_order_id) {
         const orderTarget = member_order_list.find(
@@ -1300,7 +1300,7 @@ exports.union_downloadBill = async ({
         )
         openid = orderTarget.user && orderTarget.user.mp_openid
         remark = `购买${orderTarget.application.name}会员${item.member_order_id}`
-        order_date = dayjs(orderTarget.created_at).format('YYYY-MM-DD')
+        order_date = moment(orderTarget.created_at).format('YYYY-MM-DD')
         application_id = orderTarget.application_id
       }
       returnRes.push({

package/core/file/services/weixinArticle.js

@@ -1,5 +1,5 @@
 const cheerio = require('cheerio')
-const dayjs = require('dayjs')
+const moment = require('dayjs')
 
 exports.handleHtml = async function (html) {
   const $ = cheerio.load(html, {
@@ -40,7 +40,7 @@ exports.handleHtml = async function (html) {
   // html = deal(html)
   // html = html.replace('url("', 'url(\'')
   // html = html.replace('")', '\')')
-  const publish_time = dayjs(parseInt(ct + '000'))
+  const publish_time = moment(parseInt(ct + '000'))
   return {
     asyncTasks,
     image,

package/core/file/utils/index.js

@@ -1,7 +1,7 @@
 const { lodash } = require('q-koa')
 const Sequelize = require('sequelize')
 const md5 = require('md5')
-const dayjs = require('dayjs')
+const moment = require('dayjs')
 const _ = require('lodash')
 
 const findConfig = (type) => (item) =>
@@ -354,22 +354,22 @@ const filterFunction = (target, data) => {
     if (_.isObject(target[key])) {
       if ('$gt' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
-          return dayjs(data[key]).diff(dayjs(target[key].$gt), 'second') > 0
+          return moment(data[key]).diff(moment(target[key].$gt), 'seconds') > 0
         }
         return data[key] > target[key].$gt
       } else if ('$gte' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
-          return dayjs(data[key]).diff(dayjs(target[key].$gt), 'second') >= 0
+          return moment(data[key]).diff(moment(target[key].$gt), 'seconds') >= 0
         }
         return data[key] >= target[key].$gte
       } else if ('$lt' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
-          return dayjs(target[key].$lt).diff(dayjs(data[key]), 'second') < 0
+          return moment(target[key].$lt).diff(moment(data[key]), 'seconds') < 0
         }
         return data[key] < target[key].$lt
       } else if ('$lte' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
-          return dayjs(target[key].$lte).diff(dayjs(data[key]), 'second') <= 0
+          return moment(target[key].$lte).diff(moment(data[key]), 'seconds') <= 0
         }
         return data[key] <= target[key].$lte
       } else if ('$notIn' in target[key]) {

package/package.json

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