q-koa 13.0.1 → 13.0.2

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

@@ -150,19 +150,29 @@ exports.login = async (ctx) => {
         ].filter((item) => item.model)
       : []
   if (app.appConfig.loginData) {
+    const application = await getAppConfig({ app, config })
+
+    const loginData = lodash.mergeWith(
+      app.appConfig.loginData,
+      lodash.get(application, 'loginData', {}),
+      (objValue, srcValue) => {
+        if (lodash.isArray(objValue)) {
+          return objValue.concat(srcValue)
+        }
+      }
+    )
     const include = includeDefault.filter((i) => {
-      return app.appConfig.loginData.excludeInclude.every((m) => {
+      return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
 
-    const application = await getAppConfig({ app, config })
     const exclude_list = lodash.get(application, 'exclude_list', [])
 
     const attributes = {
       exclude: Array.from(
         new Set([
-          ...app.appConfig.loginData.attributes.exclude,
+          ...loginData.attributes.exclude,
           ...(Array.isArray(exclude_list) ? exclude_list : []),
         ])
       ),
@@ -342,20 +352,31 @@ exports.checkLogin = async (ctx) => {
       },
       ...app.include.user,
     ].filter((item) => item.model)
+
     if (app.appConfig.loginData) {
+      const application = await getAppConfig({ app, config })
+
+      const loginData = lodash.mergeWith(
+        app.appConfig.loginData,
+        lodash.get(application, 'loginData', {}),
+        (objValue, srcValue) => {
+          if (lodash.isArray(objValue)) {
+            return objValue.concat(srcValue)
+          }
+        }
+      )
       const include = includeDefault.filter((i) => {
-        return app.appConfig.loginData.excludeInclude.every((m) => {
+        return loginData.excludeInclude.every((m) => {
           return app.model[m] !== i.model
         })
       })
 
-      const application = await getAppConfig({ app, config })
       const exclude_list = lodash.get(application, 'exclude_list', [])
 
       const attributes = {
         exclude: Array.from(
           new Set([
-            ...app.appConfig.loginData.attributes.exclude,
+            ...loginData.attributes.exclude,
             ...(Array.isArray(exclude_list) ? exclude_list : []),
           ])
         ),

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

@@ -442,12 +442,24 @@ exports.mp_login = async (ctx) => {
   ].filter((item) => item.model)
 
   if (app.appConfig.loginData) {
+    const application = await getAppConfig({ app, config })
+    const loginData = lodash.mergeWith(
+      app.appConfig.loginData,
+      lodash.get(application, 'loginData', {}),
+      (objValue, srcValue) => {
+        if (lodash.isArray(objValue)) {
+          return objValue.concat(srcValue)
+        }
+      }
+    )
     const include = includeDefault.filter((i) => {
-      return app.appConfig.loginData.excludeInclude.every((m) => {
+      return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
-    const { exclude_list = [] } = await getAppConfig({ app, config })
+
+    const exclude_list = lodash.get(application, 'exclude_list', [])
+
     const attributes = {
       exclude: Array.from(
         new Set([

package/package.json

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