q-koa 13.2.1 → 13.2.2

package/core/app.js

@@ -2201,7 +2201,9 @@ APP.getConfig = (app) => ({
               /^(http:\/\/|https:\/\/)?(\d{1,3}\.){3}\d{1,3}:\d{1,5}/
             )
           })
-          .filter((host) => !host.includes(app.appConfig.ip))
+          .filter((host) =>
+            app.appConfig.ip ? !host.includes(app.appConfig.ip) : false
+          )
 
         Promise.all(
           ipHost.map((host) => {

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

@@ -1,4 +1,4 @@
-const { getConfig, lodash } = require('q-koa')
+const { getConfig, lodash, Sequelize } = require('q-koa')
 const { formatLiteralObj } = require('../../utils')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')

package/core/file/utils/index.js

@@ -2,6 +2,7 @@ const { lodash } = require('q-koa')
 const Sequelize = require('sequelize')
 const md5 = require('md5')
 const moment = require('moment')
+const _ = require('lodash')
 
 const findConfig = (type) => (item) =>
   item.key === type ||
@@ -208,14 +209,19 @@ exports.signResult = (params, salt) => {
   return md5(signStr)
 }
 
-function isDateTime(str) {
-  const dateRegex = /^[\u4e00-\u9fa5]{4}-[\u4e00-\u9fa5]{2}-[\u4e00-\u9fa5]{2}$/
+const isDateTime = (str) => {
+  const dateRegex =
+    /^(\d{4}-\d{2}-\d{2})([T\s](\d{2}:\d{2}(:\d{2}(\.\d+)?)?)([+-]\d{2}:\d{2}|Z)?)?$/
   return dateRegex.test(str)
 }
-
 const $lt = {
   check: (param) => typeof param === 'string',
   result: (param, key) => {
+    if (isDateTime(param[key])) {
+      return {
+        [key]: param[key],
+      }
+    }
     return {
       [key]: Sequelize.literal(param[key]),
     }
@@ -233,6 +239,11 @@ const $between = {
   check: (param) =>
     Array.isArray(param) && param.every((p) => typeof param === 'string'),
   result: (param, key) => {
+    if (param[key].every((i) => isDateTime(i))) {
+      return {
+        [key]: param[key],
+      }
+    }
     return {
       [key]: param[key].map(Sequelize.literal),
     }
@@ -266,12 +277,11 @@ exports.formatLiteralObj = (target) => {
 
 exports.filterFunction = (target, data) => {
   if (!target) {
-    console.error(`target为null`)
     return false
   }
   return Object.keys(target).every((key) => {
     if (key.includes('.')) {
-      return lodash.get(data, key) === target[key]
+      return _.get(data, key) === target[key]
     }
     if (typeof target[key] === 'boolean') {
       return Boolean(data[key]) === target[key]
@@ -279,48 +289,49 @@ exports.filterFunction = (target, data) => {
     if (Array.isArray(target[key])) {
       return target[key].includes(data[key])
     }
-    if (lodash.isObject(target[key])) {
-      if (Object.prototype.hasOwnProperty.call(target[key], '$gt')) {
+    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), 'seconds') > 0
         }
         return data[key] > target[key].$gt
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$gte')) {
+      } 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 data[key] >= target[key].$gte
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$lt')) {
+      } else if ('$lt' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
           return moment(target[key].$gt).diff(moment(data[key]), 'seconds') < 0
         }
         return data[key] < target[key].$lt
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$lte')) {
+      } else if ('$lte' in target[key]) {
         if (key.endsWith('time') || key.endsWith('_at')) {
           return moment(target[key].$gt).diff(moment(data[key]), 'seconds') <= 0
         }
         return data[key] <= target[key].$lte
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$notIn')) {
+      } else if ('$notIn' in target[key]) {
         return !target[key].$notIn.includes(data[key])
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$in')) {
+      } else if ('$in' in target[key]) {
         return target[key].$in.includes(data[key])
-      } else if (
-        Object.prototype.hasOwnProperty.call(target[key], '$between')
-      ) {
+      } else if ('$between' in target[key]) {
         if (
           !Array.isArray(target[key].$between) ||
           target[key].$between.length !== 2
         ) {
-          throw new Error(`$between example : [2,5]`)
+          throw new Error('$between example : [2,5]')
         }
         const min = target[key].$between[0]
         const max = target[key].$between[1]
         return data[key] >= min && data[key] <= max
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$ne')) {
+      } else if ('$ne' in target[key]) {
         return data[key] !== target[key].$ne
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$neq')) {
+      } else if ('$neq' in target[key]) {
         return data[key] !== target[key].$neq
-      } else if (Object.prototype.hasOwnProperty.call(target[key], '$eq')) {
+      } else if ('$eq' in target[key]) {
+        if (Array.isArray(target[key].$eq)) {
+          return JSON.stringify(data[key]) === JSON.stringify(target[key].$eq)
+        }
         return data[key] === target[key].$eq
       }
       return data[key] === target[key]

package/package.json

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