q-koa 9.8.0 → 9.8.2

package/core/app.js

@@ -21,7 +21,8 @@ const util = require('util')
 const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
-const { getObject } = require('./file/utils')
+const { getObject, getAppConfig } = require('./file/utils')
+
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -2001,4 +2002,6 @@ APP.getConfig = (app) => ({
   },
 })
 
+APP.getAppConfig = getAppConfig
+
 module.exports = APP

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,
   })
 }
 
@@ -898,7 +950,7 @@ exports.mp_pay = async (ctx) => {
       throw new Error(
         payResult.return_msg === '签名错误，请检查后再试'
           ? payResult.return_msg + '（商户号/APIv2/关联）'
-          : payResult.return_msg
+          : payResult.err_code_des + '（商户号/APIv2/关联）'
       )
     }
     throw new Error(`支付失败，请重试`)

package/core/file/utils/index.js

@@ -1,5 +1,12 @@
 const { lodash } = require('q-koa')
 
+const findConfig = (type) => (item) =>
+  item.key === type ||
+  item.config === type ||
+  item.pay_config === type ||
+  (item.ToUserName && item.ToUserName === type) ||
+  (item.appId && item.appId === type)
+
 exports.getSetting = (config) => (type) =>
   config.find((i) => i.key === type).value
 
@@ -34,18 +41,12 @@ exports.getObject = (config, app) => async (type) => {
     flag = true
   }
 
-  const findConfig = (item) =>
-    item.key === type ||
-    item.config === type ||
-    item.pay_config === type ||
-    (item.ToUserName && item.ToUserName === type) ||
-    (item.appId && item.appId === type)
   if (app) {
     const applicationList = app.cache.get('application')
-    if (applicationList && applicationList.find(findConfig)) {
+    if (applicationList && applicationList.find(findConfig(type))) {
       flag = true
       return {
-        ...applicationList.find(findConfig),
+        ...applicationList.find(findConfig(type)),
         ...temObj,
       }
     }
@@ -58,7 +59,7 @@ exports.getObject = (config, app) => async (type) => {
           const formatData = JSON.parse(JSON.stringify(result))
           app.cache.set('application', formatData)
 
-          const target = formatData.find(findConfig)
+          const target = formatData.find(findConfig(type))
           if (target) {
             flag = true
             return {
@@ -159,12 +160,12 @@ exports.getImageType = (fileBuffer) => {
   return ''
 }
 
-exports.getAppConfig = async ({ app, config }) => {
-  if (!config || !app) return null
+exports.getAppConfig = async ({ app, config, key }) => {
+  if (!(app && (config || key))) return null
   const application =
     app.cache.get('application') || (await app.model.application.findAll())
 
-  const target = application.find((a) => a.config === config)
+  const target = application.find(findConfig(config || key))
 
   return target
 }

package/package.json

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