q-koa 13.0.4 → 13.0.8

package/core/app.js

@@ -1171,7 +1171,9 @@ class APP {
                 },
               }
               const $between = {
-                check: (param) => Array.isArray(param),
+                check: (param) =>
+                  Array.isArray(param) &&
+                  param.every((p) => p.includes('now()')),
                 result: (param, key) => {
                   return {
                     [key]: param[key].map(Sequelize.literal),

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

@@ -153,7 +153,7 @@ exports.login = async (ctx) => {
     const application = await getAppConfig({ app, config })
 
     const loginData = lodash.mergeWith(
-      app.appConfig.loginData,
+      lodash.cloneDeep(app.appConfig.loginData),
       lodash.get(application, 'loginData', {}),
       (objValue, srcValue) => {
         if (lodash.isArray(objValue)) {
@@ -355,9 +355,8 @@ exports.checkLogin = async (ctx) => {
 
     if (app.appConfig.loginData) {
       const application = await getAppConfig({ app, config })
-
       const loginData = lodash.mergeWith(
-        app.appConfig.loginData,
+        lodash.cloneDeep(app.appConfig.loginData),
         lodash.get(application, 'loginData', {}),
         (objValue, srcValue) => {
           if (lodash.isArray(objValue)) {
@@ -365,6 +364,7 @@ exports.checkLogin = async (ctx) => {
           }
         }
       )
+
       const include = includeDefault.filter((i) => {
         return loginData.excludeInclude.every((m) => {
           return app.model[m] !== i.model

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

@@ -444,7 +444,7 @@ exports.mp_login = async (ctx) => {
   if (app.appConfig.loginData) {
     const application = await getAppConfig({ app, config })
     const loginData = lodash.mergeWith(
-      app.appConfig.loginData,
+      lodash.cloneDeep(app.appConfig.loginData),
       lodash.get(application, 'loginData', {}),
       (objValue, srcValue) => {
         if (lodash.isArray(objValue)) {

package/core/file/services/express.js

@@ -38,11 +38,12 @@ module.exports = class Singleton {
         throw new Error(result.msg)
       }
     } catch (e) {
+      const message = ` ${no} ${e.message || '物流服务暂不可用'}`
       push({
         appName: 'express',
-        message: '物流服务暂不可用',
+        message,
       })
-      throw new Error('物流服务暂不可用')
+      throw new Error(message)
     }
   }
 

package/package.json

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