q-koa 13.8.24 → 13.8.26

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, getUserByCtx, getConfig, lodash } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx, getUserByCtx, getConfig } = require('q-koa')
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -6,7 +7,6 @@ exports.login = async (ctx) => {
   const appConfig = getConfig(app)
   const { is_dev } = await appConfig.getObject('base')
   const { uuid } = ctx.request.body
-  console.log(uuid)
   if (!app.attributes.user.uuid) throw new Error(`没有uuid字段`)
 
   const hasUser = await app.model.user.findOne({

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, getConfig, lodash, moment, getService } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx, getConfig, moment, getService } = require('q-koa')
 const util = require('util')
 const axios = require('axios')
 const qr = require('qr-image')
@@ -91,12 +92,12 @@ exports.login_callback = async (ctx) => {
   const rest = userInfoResult.data
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickname', null),
-      avatar: lodash.get(rest, 'avatar', null),
-      country: lodash.get(rest, 'country', null),
-      city: lodash.get(rest, 'city', null),
-      province: lodash.get(rest, 'province', null),
-      gender: lodash.get(rest, 'gender', null),
+      nick_name: rest.nickname ?? null,
+      avatar: rest.avatar ?? null,
+      country: rest.country ?? null,
+      city: rest.city ?? null,
+      province: rest.province ?? null,
+      gender: rest.gender ?? null,
       openid: rest.open_id,
       user_id: user_id ? Number(user_id) : null,
       access_token: access_token || '',
@@ -206,7 +207,6 @@ exports.createImg = async (ctx) => {
   // const result = await axios.get(url, {
   //   client_key: app_id,
   // }).then(res => res.data)
-  console.log('失败先检查client_key')
   const img = qr.image(url, {
     size: 2,
   })

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, lodash } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx } = require('q-koa')
 
 exports.update = async (ctx) => {
   const { app } = getAppByCtx(ctx)

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

@@ -1,5 +1,5 @@
-const { getConfig } = require('q-koa')
 const lodash = require('lodash')
+const { getConfig } = require('q-koa')
 const axios = require('axios')
 
 const is_dev = process.env.NODE_ENV !== 'production'

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, lodash } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx } = require('q-koa')
 
 const fs = require('fs')
 const path = require('path')

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

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const fsPromise = require('fs/promises')
-const { lodash } = require('q-koa')
+const lodash = require('lodash')
 exports.loadModel = async ({ app, appName }) => {
   const data = await fsPromise.readdir(
     path.resolve(__dirname, `${process.cwd()}/app/${appName}/plugins`)

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, lodash } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx } = require('q-koa')
 
 exports.bulkUpdate = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, getConfig, lodash, is_dev } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx, getConfig, is_dev } = require('q-koa')
 
 const fs = require('fs')
 const path = require('path')

package/core/file/plugins/setting/model.js

@@ -1,4 +1,5 @@
-const { Sequelize, Random, lodash, moment } = require('q-koa')
+const lodash = require('lodash')
+const { Sequelize, Random, moment } = require('q-koa')
 
 exports.name = {
   type: Sequelize.STRING(),

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

@@ -3,7 +3,8 @@ const path = require('path')
 const fsPromise = require('fs/promises')
 const { VM } = require('vm2')
 const axios = require('axios')
-const { lodash, getAppByCtx, getConfig, Sequelize, moment } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx, getConfig, Sequelize, moment } = require('q-koa')
 const { LRUCache } = require('lru-cache')
 const cache = new LRUCache({
   max: 10,

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

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

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

@@ -1,4 +1,5 @@
-const { getAppByCtx, getConfig, getService, lodash } = require('q-koa')
+const lodash = require('lodash')
+const { getAppByCtx, getConfig, getService } = require('q-koa')
 
 const util = require('util')
 const axios = require('axios')
@@ -97,18 +98,17 @@ exports.login = async (ctx) => {
 
   if (!openid) {
     const msg = `找不到openid, errcode:${res.errcode} app_id:${app_id} app_secrect:${app_secrect}`
-    console.log(msg)
-    throw new Error('头条登录失败')
+    throw new Error(msg)
   }
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickName', null),
-      avatar: lodash.get(rest, 'avatarUrl', null),
-      country: lodash.get(rest, 'country', null),
-      city: lodash.get(rest, 'city', null),
-      province: lodash.get(rest, 'province', null),
-      gender: lodash.get(rest, 'gender', null),
+      nick_name: rest.nickName ?? null,
+      avatar: rest.avatarUrl ?? null,
+      country: rest.country ?? null,
+      city: rest.city ?? null,
+      province: rest.province ?? null,
+      gender: rest.gender ?? null,
       openid,
       user_id: lodash.get(ctx.request, `${appName}-user.id`, null),
     },

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

@@ -1,6 +1,7 @@
 const md5 = require('js-md5')
-const { getAppByCtx, getConfig, lodash, moment } = require('q-koa')
-const { getAppConfig } = require('../../utils')
+const lodash = require('lodash')
+const { getAppByCtx, getConfig, moment } = require('q-koa')
+const { getCachedLoginData } = require('../../utils')
 
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -155,31 +156,19 @@ exports.login = async (ctx) => {
         ].filter((item) => item.model)
       : []
   if (app.appConfig.loginData) {
-    const application = await getAppConfig({ app, config })
-
-    const loginData = lodash.mergeWith(
-      lodash.cloneDeep(app.appConfig.loginData),
-      lodash.get(application, 'loginData', {}),
-      (objValue, srcValue) => {
-        if (lodash.isArray(objValue)) {
-          return objValue.concat(srcValue)
-        }
-      }
-    )
+    const { loginData, excludeList } = await getCachedLoginData({
+      app,
+      config,
+    })
     const include = includeDefault.filter((i) => {
       return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
 
-    const exclude_list = lodash.get(application, 'exclude_list', [])
-
     const attributes = {
       exclude: Array.from(
-        new Set([
-          ...loginData.attributes.exclude,
-          ...(Array.isArray(exclude_list) ? exclude_list : []),
-        ])
+        new Set([...loginData.attributes.exclude, ...excludeList])
       ),
     }
     result = await app.model.user.findOne({
@@ -367,17 +356,11 @@ exports.checkLogin = async (ctx) => {
     ].filter((item) => item.model)
 
     if (app.appConfig.loginData) {
-      const application = await getAppConfig({ app, config })
-
-      const loginData = lodash.mergeWith(
-        lodash.cloneDeep(app.appConfig.loginData),
-        lodash.get(application, 'loginData', {}),
-        (objValue, srcValue) => {
-          if (lodash.isArray(objValue)) {
-            return objValue.concat(srcValue)
-          }
-        }
-      )
+      const { loginData, excludeList } = await getCachedLoginData({
+        app,
+        config,
+        lodash,
+      })
 
       const include = includeDefault.filter((i) => {
         return loginData.excludeInclude.every((m) => {
@@ -385,14 +368,9 @@ exports.checkLogin = async (ctx) => {
         })
       })
 
-      const exclude_list = lodash.get(application, 'exclude_list', [])
-
       const attributes = {
         exclude: Array.from(
-          new Set([
-            ...loginData.attributes.exclude,
-            ...(Array.isArray(exclude_list) ? exclude_list : []),
-          ])
+          new Set([...loginData.attributes.exclude, ...excludeList])
         ),
       }
 

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

@@ -20,7 +20,7 @@ const fxp = require('fast-xml-parser')
 const crypto = require('crypto')
 const path = require('path')
 const fsPromise = require('fs/promises')
-const { getAppConfig } = require('../../utils')
+const { getCachedLoginData } = require('../../utils')
 
 const AllinPay = require('../../services/allinpay')
 
@@ -338,10 +338,10 @@ exports.mp_login = async (ctx) => {
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickName', null),
-      avatar: lodash.get(rest, 'avatarUrl', null),
+      nick_name: rest.nickName ?? null,
+      avatar: rest.avatarUrl ?? null,
       openid,
-      unionid: lodash.get(res, 'unionid', null),
+      unionid: res.unionid ?? null,
       appid: app_id,
       user_id: lodash.get(ctx.request, `${appName}-user.id`, null),
     },
@@ -368,6 +368,7 @@ exports.mp_login = async (ctx) => {
    */
 
   const openIdUser = await app.model.mp_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },
@@ -375,14 +376,12 @@ exports.mp_login = async (ctx) => {
 
   let uid
   if (openIdUser) {
-    await app.model.mp_user.update(
-      lodash.omit(post, openIdUser.user_id ? ['user_id'] : []),
-      {
-        where: {
-          openid: post.openid,
-        },
-      }
-    )
+    const { user_id: _omit, ...updatePost } = post
+    await app.model.mp_user.update(updatePost, {
+      where: {
+        openid: post.openid,
+      },
+    })
     if (app.attributes.user.mp_openid) {
       app.model.user.update(
         {
@@ -428,8 +427,7 @@ exports.mp_login = async (ctx) => {
           )
         })
       } catch (e) {
-        console.log('mp_user.create出错了', { ...post })
-        throw new Error(e)
+        throw e
       }
     }
   }
@@ -471,30 +469,19 @@ exports.mp_login = async (ctx) => {
   ].filter((item) => item.model)
 
   if (app.appConfig.loginData) {
-    const application = await getAppConfig({ app, config })
-    const loginData = lodash.mergeWith(
-      lodash.cloneDeep(app.appConfig.loginData),
-      lodash.get(application, 'loginData', {}),
-      (objValue, srcValue) => {
-        if (lodash.isArray(objValue)) {
-          return objValue.concat(srcValue)
-        }
-      }
-    )
+    const { loginData, excludeList } = await getCachedLoginData({
+      app,
+      config,
+    })
     const include = includeDefault.filter((i) => {
       return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
 
-    const exclude_list = lodash.get(application, 'exclude_list', [])
-
     const attributes = {
       exclude: Array.from(
-        new Set([
-          ...app.appConfig.loginData.attributes.exclude,
-          ...(Array.isArray(exclude_list) ? exclude_list : []),
-        ])
+        new Set([...loginData.attributes.exclude, ...excludeList])
       ),
     }
     result = await app.model.user.findOne({
@@ -617,7 +604,6 @@ exports.h5_login_callback = async (ctx) => {
     new Promise((resolve, reject) => {
       client.getAccessToken(c, (err, result) => {
         if (err) {
-          console.log('err===', err)
           return reject(err.data)
         }
         return resolve(result.data)
@@ -627,15 +613,14 @@ exports.h5_login_callback = async (ctx) => {
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(data, 'nickname', null),
-      avatar: lodash.get(data, 'headimgurl', null),
+      nick_name: data.nickname ?? null,
+      avatar: data.headimgurl ?? null,
       openid: data.openid,
       appid: app_id,
       user_id: user_id ? Number(user_id) : null,
     },
     (item) => item !== null
   )
-  console.log('post', post)
   /**
    * 查询是否已经有openid
    *
@@ -655,6 +640,7 @@ exports.h5_login_callback = async (ctx) => {
    */
 
   const openIdUser = await app.model.h5_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },
@@ -754,26 +740,23 @@ exports.h5_login_info_callback = async (ctx) => {
     new Promise((resolve, reject) => {
       client.getUserByCode(c, (err, result) => {
         if (err) {
-          console.log('err===', err)
           return reject(err.data)
         }
         return resolve(result)
       })
     })
   const data = await getUserByCode(`${code}`)
-  console.log('========', data)
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(data, 'nickname', null),
-      avatar: lodash.get(data, 'headimgurl', null),
+      nick_name: data.nickname ?? null,
+      avatar: data.headimgurl ?? null,
       openid: data.openid,
       appid: app_id,
       user_id: user_id ? Number(user_id) : null,
     },
     (item) => item !== null
   )
-  console.log('post', post)
   /**
    * 查询是否已经有openid
    *
@@ -793,6 +776,7 @@ exports.h5_login_info_callback = async (ctx) => {
    */
 
   const openIdUser = await app.model.h5_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },

package/core/file/services/weixinMP.js

@@ -11,7 +11,8 @@
 const util = require('util')
 const axios = require('axios')
 const crypto = require('crypto')
-const { lodash, ServiceError } = require('q-koa')
+const lodash = require('lodash')
+const { ServiceError } = require('q-koa')
 const getAccessTokenUrl = 'https://api.weixin.qq.com/cgi-bin/stable_token'
 const getPhoneNumberUrl =
   'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s'

package/core/file/services/weixinOpen.js

@@ -15,7 +15,7 @@ const wxHttpsAgent = new https.Agent({
 const wxAxios = axios.create({
   httpsAgent: wxHttpsAgent,
 })
-const { lodash } = require('q-koa')
+const lodash = require('lodash')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
 

package/core/file/utils/index.js

@@ -1,8 +1,7 @@
-const { lodash } = require('q-koa')
+const lodash = require('lodash')
 const Sequelize = require('sequelize')
 const md5 = require('md5')
 const moment = require('moment')
-const _ = require('lodash')
 
 const findConfig = (type) => (item) =>
   item.key === type ||
@@ -196,6 +195,66 @@ exports.getAppConfig = async ({ app, config, key, app_id, id }) => {
   return target || null
 }
 
+const LOGIN_DATA_CACHE_PREFIX = 'login_data:'
+
+/**
+ * 获取并缓存 loginData 分支里稳定的"应用配置合并结果"。
+ * 缓存 key：`login_data:<config>`，挂在现有 app.cache（LRUCache）上，
+ * 复用其全局 TTL（默认 1 天，第一个用户后不会更改 → 长期命中）。
+ *
+ * 返回：{ loginData, excludeList }
+ *   - loginData：structuredClone(base) 与 application.loginData 按数组 concat
+ *     语义合并后的对象，缓存命中时直接是结构化结果，跳过 structuredClone+mergeWith
+ *   - excludeList：已做 Array.isArray 校验、用于 attributes.exclude 追加的数组，
+ *     消费点只需 [...loginData.attributes.exclude, ...excludeList]
+ */
+exports.getCachedLoginData = async ({ app, config }) => {
+  const cacheKey = LOGIN_DATA_CACHE_PREFIX + String(config || '')
+  const cached = app.cache.get(cacheKey)
+  if (cached) return cached
+
+  const base = app.appConfig.loginData
+  const application = await exports.getAppConfig({ app, config })
+  const overLoginData = lodash.get(application, 'loginData', {})
+
+  const loginData = lodash.mergeWith(
+    structuredClone(base),
+    overLoginData,
+    (objValue, srcValue) => {
+      if (lodash.isArray(objValue)) {
+        return objValue.concat(lodash.isArray(srcValue) ? srcValue : [])
+      }
+    }
+  )
+
+  const rawExclude = lodash.get(application, 'exclude_list', [])
+  const excludeList = Array.isArray(rawExclude) ? rawExclude : []
+
+  const payload = { loginData, excludeList }
+  app.cache.set(cacheKey, payload)
+  return payload
+}
+
+/**
+ * 清除 getCachedLoginData 的缓存（应用配置变更后手动失效时调用）。
+ * 不传 config 则清空所有 login_data:* 键。
+ */
+exports.clearCachedLoginData = ({ app, config }) => {
+  if (!app || !app.cache) return
+  if (config) {
+    app.cache.delete(LOGIN_DATA_CACHE_PREFIX + String(config))
+    return
+  }
+  // 兜底：LRU v11 提供 keys() 迭代器
+  if (typeof app.cache.keys === 'function') {
+    for (const k of app.cache.keys()) {
+      if (typeof k === 'string' && k.startsWith(LOGIN_DATA_CACHE_PREFIX)) {
+        app.cache.delete(k)
+      }
+    }
+  }
+}
+
 exports.signResult = (params, salt) => {
   var skip_arr = ['thirdparty_id', 'app_id', 'sign']
   var paramArray = new Array()
@@ -333,7 +392,7 @@ const filterFunction = (target, data) => {
   }
   return Object.keys(target).every((key) => {
     if (key.includes('.')) {
-      return _.get(data, key) === target[key]
+      return lodash.get(data, key) === target[key]
     }
     if (typeof target[key] === 'boolean') {
       return Boolean(data[key]) === target[key]
@@ -351,7 +410,7 @@ const filterFunction = (target, data) => {
     if (Array.isArray(target[key])) {
       return target[key].includes(data[key])
     }
-    if (_.isObject(target[key])) {
+    if (lodash.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

package/package.json

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