q-koa 10.8.5 → 10.8.7

package/core/app.js

@@ -344,7 +344,7 @@ class APP {
       if (typeof item === 'string') {
         return {
           app: item,
-          db: item,
+          db: this.config.db.name || item,
         }
       } else {
         return item

package/core/config.js

@@ -137,6 +137,7 @@ module.exports = {
     if (app.controller.cache) {
       router.get('/cache/get', app.controller.cache.get)
       router.get('/cache/clear', app.controller.cache.clear)
+      router.get('/cache/getAll', app.controller.cache.getAll)
     }
     if (app.model.weixin) {
       router.get('/weixin/h5_login', app.controller.weixin.h5_login)

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

@@ -0,0 +1,57 @@
+const { getAppByCtx, getUserByCtx, getConfig, lodash } = require('q-koa')
+
+exports.login = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const user_id = getUserByCtx(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({
+    where: {
+      uuid,
+    },
+  })
+
+  let result = null
+  if (!hasUser) {
+    result = await app.model.user.create({
+      uuid,
+    })
+  } else {
+    result = hasUser
+  }
+
+  const tokenResult = {
+    id: result.id,
+    name: result.name,
+    mobile: result.mobile,
+    h5_user: result.h5_user
+      ? {
+          openid: result.h5_user && result.h5_user.openid,
+        }
+      : null,
+    mp_user: result.mp_user
+      ? {
+          openid: result.mp_user && result.mp_user.openid,
+        }
+      : null,
+    toutiao_user: result.toutiao_user
+      ? {
+          openid: result.toutiao_user && result.toutiao_user.openid,
+        }
+      : null,
+  }
+  const token = await app.sign({
+    user: tokenResult,
+  })
+
+  return ctx.SUCCESS({
+    token,
+    user: app.appConfig.loginData
+      ? lodash.omit(result.toJSON(), app.appConfig.loginData.omit)
+      : result,
+  })
+}

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

@@ -1,5 +1,12 @@
 const { getAppByCtx, getUserByCtx, getConfig } = require('q-koa')
 
+exports.getAll = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const result = Object.keys(app.model).filter((model) => app.cache.get(model))
+  console.info(`cacheModel设置可CRUD同步更新`)
+  ctx.SUCCESS(result)
+}
+
 exports.get = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const key =

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

@@ -203,7 +203,7 @@ exports.getTable = async (ctx) => {
     show_virtual = false,
     is_cache = true,
   } = ctx.request.body
-
+  if (_model === 'page') return ctx.SUCCESS({})
   if (is_cache && app.cache && app.cache.get(`${_model}-table`)) {
     return ctx.SUCCESS(app.cache.get(`${_model}-table`))
   }

package/package.json

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