q-koa 13.7.1 → 13.7.2

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

@@ -467,9 +467,9 @@ const expressFn = async ({ app, express_number: _express_number, mobile }) => {
       },
     })
     if (history) {
-      const diffNoLong = moment().diff(moment(history.updated_at), 'hour') < 1
+      const diffNoLong = moment().diff(moment(history.updated_at), 'hours') < 1
       const isTooLong =
-        moment().diff(moment(history.result.updateTime), 'day') > 30
+        moment().diff(moment(history.result.updateTime), 'days') > 30
 
       if (diffNoLong || isTooLong) {
         return history.result

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

@@ -366,7 +366,7 @@ exports.hotSearch = async (ctx) => {
 
   const hotWord = await app.model.hot_search.findOne()
   const minutes = hotWord
-    ? moment().diff(moment(hotWord.created_at), 'minute')
+    ? moment().diff(moment(hotWord.created_at), 'minutes')
     : 1000
 
   if (minutes < 30) {

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

@@ -90,7 +90,7 @@ exports.countAndMaxId = async (ctx, _data) => {
     attributes: ['id'],
     where: {
       created_at: {
-        $lt: moment().add(-1, 'month'),
+        $lt: moment().add(-1, 'months'),
       },
     },
     order: [['id', 'DESC']],

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

@@ -229,7 +229,7 @@ exports.login = async (ctx) => {
 
   if (
     result.updated_at &&
-    moment().diff(moment(result.updated_at), 'hour') > 24
+    moment().diff(moment(result.updated_at), 'hours') > 24
   ) {
     app.model.user.upsert({
       id: result.id,
@@ -481,7 +481,7 @@ exports.checkLogin = async (ctx) => {
 
     if (
       result.updated_at &&
-      moment().diff(moment(result.updated_at), 'hour') > 24
+      moment().diff(moment(result.updated_at), 'hours') > 24
     ) {
       app.model.user.upsert({
         id: result.id,

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

@@ -551,7 +551,7 @@ exports.mp_login = async (ctx) => {
 
   if (
     result.updated_at &&
-    moment().diff(moment(result.updated_at), 'hour') > 24
+    moment().diff(moment(result.updated_at), 'hours') > 24
   ) {
     app.model.user.upsert({
       id: result.id,
@@ -2392,22 +2392,22 @@ exports.getUserPortrait = async (ctx) => {
   const diff = moment().hour() > 8 ? -1 : -2
   if (type === 'day') {
     obj = {
-      begin_date: moment().add(diff, 'day').format('YYYYMMDD'),
-      end_date: moment().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: moment()
-        .add(-6 + diff, 'day')
+        .add(-6 + diff, 'days')
         .format('YYYYMMDD'),
-      end_date: moment().add(diff, 'day').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   } else if (type === 'month') {
     obj = {
       begin_date: moment()
-        .add(-29 + diff, 'day')
+        .add(-29 + diff, 'days')
         .format('YYYYMMDD'),
-      end_date: moment().add(diff, 'day').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   }
   console.log('obj', obj)
@@ -2425,7 +2425,7 @@ exports.getVisitTrend = async (ctx, _data) => {
 
   const diff = moment().hour() > 8 ? -1 : -2
 
-  const begin_date = moment(date ? date : moment().add(diff, 'day')).format(
+  const begin_date = moment(date ? date : moment().add(diff, 'days')).format(
     'YYYYMMDD'
   )
 
@@ -2448,7 +2448,7 @@ exports.getVisitTrend = async (ctx, _data) => {
   if (type === 'day') {
     obj = {
       begin_date,
-      end_date: moment(date ? date : moment().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: moment(date).add(-1, 'day').format('YYYYMMDD'),
+      date: moment(date).add(-1, 'days').format('YYYYMMDD'),
     })
   }
 

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

@@ -1150,7 +1150,7 @@ exports.union_downloadBill = async ({
   })
 
   const result = await allinpay.downloadBill({
-    date: date || moment().add(-1, 'day').format('YYYYMMDD'),
+    date: date || moment().add(-1, 'days').format('YYYYMMDD'),
   })
 
   if (result && result.url) {

package/core/file/utils/index.js

@@ -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 moment(data[key]).diff(moment(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 moment(data[key]).diff(moment(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 moment(target[key].$lt).diff(moment(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 moment(target[key].$lte).diff(moment(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.1",
+  "version": "13.7.2",
   "description": "",
   "main": "index.js",
   "scripts": {