q-koa 9.7.6 → 9.8.1

package/core/app.js

@@ -873,7 +873,11 @@ class APP {
 
       if (fn === 'updateSort') {
         if (cacheModel.includes(controller)) {
-          ctx.app[appName].cache.set(`${controller}`, null)
+          if (ctx.app[appName].redisClient) {
+            ctx.app[appName].redisClient.publish('cache clear', `${controller}`)
+          } else {
+            ctx.app[appName].cache.set(`${controller}`, null)
+          }
         }
       }
 
@@ -1759,6 +1763,16 @@ class APP {
             const result = await app[appName].model[controller][fn](list)
             ctx.SUCCESS(result)
           }
+          if (cacheModel.includes(controller)) {
+            if (ctx.app[appName].redisClient) {
+              ctx.app[appName].redisClient.publish(
+                'cache clear',
+                `${controller}`
+              )
+            } else {
+              ctx.app[appName].cache.set(`${controller}`, null)
+            }
+          }
         }
 
         if (fn === 'upsert' || fn === 'create') {
@@ -1788,7 +1802,14 @@ class APP {
           ctx.SUCCESS(flag)
 
           if (cacheModel.includes(controller)) {
-            ctx.app[appName].cache.set(`${controller}`, null)
+            if (ctx.app[appName].redisClient) {
+              ctx.app[appName].redisClient.publish(
+                'cache clear',
+                `${controller}`
+              )
+            } else {
+              ctx.app[appName].cache.set(`${controller}`, null)
+            }
           }
         }
 
@@ -1813,7 +1834,14 @@ class APP {
           ctx.SUCCESS(result)
 
           if (cacheModel.includes(controller)) {
-            ctx.app[appName].cache.set(`${controller}`, null)
+            if (ctx.app[appName].redisClient) {
+              ctx.app[appName].redisClient.publish(
+                'cache clear',
+                `${controller}`
+              )
+            } else {
+              ctx.app[appName].cache.set(`${controller}`, null)
+            }
           }
         }
 

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

@@ -1,9 +1,15 @@
 const md5 = require('js-md5')
 const { getAppByCtx, getConfig, lodash } = require('q-koa')
 const { getAppConfig } = require('../../utils')
+
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
-  const { mobile, password, ...rest } = ctx.request.body
+  const { mobile, password, config: _config, ...rest } = ctx.request.body
+
+  const config = _config || ctx.request.header.config || 'weixin_mp'
+  const appConfig = getConfig(app)
+  const { app_id } = await appConfig.getObject(config)
+
   const where =
     process.env.NODE_ENV !== 'production'
       ? {
@@ -86,26 +92,73 @@ exports.login = async (ctx) => {
   /**
    * 查出最新用户，存token并返回
    */
-  result = await app.model.user.findOne({
-    where: {
-      id: result.id,
-    },
-    include: [
-      {
-        model: app.model.github_user,
-      },
-      {
+  const h5_user_include = config.includes('h5')
+    ? {
         model: app.model.h5_user,
-      },
-      {
+        where: {
+          appid: app_id,
+        },
+        attributes: {
+          exclude: ['created_at', 'updated_at', 'createdid'],
+        },
+      }
+    : {
+        model: app.model.h5_user,
+      }
+  const mp_user_include = config.includes('mp')
+    ? {
+        model: app.model.mp_user,
+        where: {
+          appid: app_id,
+        },
+      }
+    : {
         model: app.model.mp_user,
+      }
+  const includeDefault = [
+    {
+      model: app.model.github_user,
+    },
+    h5_user_include,
+    mp_user_include,
+    {
+      model: app.model.toutiao_user,
+    },
+    ...app.include.user,
+  ].filter((item) => item.model)
+
+  if (app.appConfig.loginData) {
+    const include = includeDefault.filter((i) => {
+      return app.appConfig.loginData.excludeInclude.every((m) => {
+        return app.model[m] !== i.model
+      })
+    })
+    const { exclude_list = [] } = await getAppConfig({ app, config })
+    const attributes = {
+      exclude: Array.from(
+        new Set([
+          ...app.appConfig.loginData.attributes.exclude,
+          ...(Array.isArray(exclude_list) ? exclude_list : []),
+        ])
+      ),
+    }
+    result = await app.model.user.findOne({
+      where: {
+        id: result.id,
       },
-      {
-        model: app.model.toutiao_user,
+      attributes,
+      include,
+    })
+  } else {
+    result = await app.model.user.findOne({
+      where: {
+        id: result.id,
       },
-      ...app.include.user,
-    ].filter((item) => item.model),
-  })
+      include: includeDefault,
+    })
+  }
+
+  if (!result) throw new Error('账号密码错误,或者不属于当前应用')
 
   const tokenResult = {
     id: result.id,
@@ -133,7 +186,9 @@ exports.login = async (ctx) => {
 
   return ctx.SUCCESS({
     token,
-    user: result,
+    user: app.appConfig.loginData
+      ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
+      : result,
   })
 }
 

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

@@ -11,6 +11,7 @@ const WXBizDataCrypt = require('../../services/weixinCrypt')
 const weixinArticle = require('../../services/weixinArticle')
 const fxp = require('fast-xml-parser')
 const crypto = require('crypto')
+const { getAppConfig } = require('../../utils')
 
 const check = ({ timestamp, nonce, signature, token }) => {
   const tmp = [token, timestamp, nonce].sort().join('')
@@ -387,25 +388,74 @@ exports.mp_login = async (ctx) => {
     }
   }
 
-  const result = await app.model.user.findOne({
-    where: {
-      id: uid,
-    },
-    include: [
-      {
+  const h5_user_include = config.includes('h5')
+    ? {
         model: app.model.h5_user,
-      },
-      {
+        where: {
+          appid: app_id,
+        },
+        attributes: {
+          exclude: ['created_at', 'updated_at', 'createdid'],
+        },
+      }
+    : {
+        model: app.model.h5_user,
+      }
+  const mp_user_include = config.includes('mp')
+    ? {
         model: app.model.mp_user,
+        where: {
+          appid: app_id,
+        },
+      }
+    : {
+        model: app.model.mp_user,
+      }
+  let result
+  const includeDefault = [
+    {
+      model: app.model.github_user,
+    },
+    h5_user_include,
+    mp_user_include,
+    {
+      model: app.model.toutiao_user,
+    },
+    ...app.include.user,
+  ].filter((item) => item.model)
+
+  if (app.appConfig.loginData) {
+    const include = includeDefault.filter((i) => {
+      return app.appConfig.loginData.excludeInclude.every((m) => {
+        return app.model[m] !== i.model
+      })
+    })
+    const { exclude_list = [] } = await getAppConfig({ app, config })
+    const attributes = {
+      exclude: Array.from(
+        new Set([
+          ...app.appConfig.loginData.attributes.exclude,
+          ...(Array.isArray(exclude_list) ? exclude_list : []),
+        ])
+      ),
+    }
+    result = await app.model.user.findOne({
+      where: {
+        id: uid,
       },
-      {
-        model: app.model.toutiao_user,
+      attributes,
+      include,
+    })
+  } else {
+    result = await app.model.user.findOne({
+      where: {
+        id: uid,
       },
-      ...app.include.user,
-    ].filter((item) => item.model),
-  })
+      include: includeDefault,
+    })
+  }
 
-  if (!result.id) throw new Error('登录失败')
+  if (!(result && result.id)) throw new Error('登录失败')
 
   const tokenResult = {
     id: result.id,
@@ -434,7 +484,9 @@ exports.mp_login = async (ctx) => {
 
   return ctx.SUCCESS({
     token,
-    user: result,
+    user: app.appConfig.loginData
+      ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
+      : result,
   })
 }
 

package/package.json

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

package/core/file/plugins/application/afterExecute.js

@@ -1,13 +0,0 @@
-const { getAppByCtx, getConfig } = require('q-koa')
-
-exports.upsert = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
-  const appConfig = getConfig(app)
-  appConfig.update('application')
-}
-
-exports.bulkCreate = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
-  const appConfig = getConfig(app)
-  appConfig.update('application')
-}