q-koa 8.4.0 → 8.4.3

package/core/app.js

@@ -5,6 +5,7 @@ const path = require('path')
 const fs = require('fs')
 const fsPromise = require('fs/promises')
 const Sequelize = require('sequelize')
+const redis = require('redis')
 const moment = require('moment')
 const { EventEmitter } = require('events')
 const nodeVm = require('vm')
@@ -289,16 +290,16 @@ class APP {
       process.on('exit', (code) => {
         console.log(`[exit custom], About to exit with code: ${code}`)
       })
+      if (
+        this.app[appName].service.cache &&
+        this.app[appName].service.cache.init
+      ) {
+        this.app[appName].service.cache.init({
+          app: this.app[appName],
+          appName: appName,
+        })
+      }
       if (process.env.NODE_ENV === 'production') {
-        if (
-          this.app[appName].service.cache &&
-          this.app[appName].service.cache.init
-        ) {
-          this.app[appName].service.cache.init({
-            app: this.app[appName],
-            appName: appName,
-          })
-        }
         process.on('SIGINT', () => {
           console.log('Closing server...')
           this.server.close(() => {
@@ -351,12 +352,27 @@ class APP {
         const configFile = path.resolve(__dirname, configPath)
         const configExist = fs.existsSync(configFile)
 
-        this.app[appName] = {
-          sequelize: db,
-          appConfig: _.defaultsDeep(
-            configExist ? require(path.resolve(__dirname, configPath)) : {},
-            this.config.app
-          ),
+        if (this.config.redis && this.config.redis.url) {
+          const client = redis.createClient(this.config.redis)
+          client.on('error', (err) => console.log('Redis Client Error', err))
+
+          await client.connect()
+          this.app[appName] = {
+            sequelize: db,
+            redisClient: client,
+            appConfig: _.defaultsDeep(
+              configExist ? require(path.resolve(__dirname, configPath)) : {},
+              this.config.app
+            ),
+          }
+        } else {
+          this.app[appName] = {
+            sequelize: db,
+            appConfig: _.defaultsDeep(
+              configExist ? require(path.resolve(__dirname, configPath)) : {},
+              this.config.app
+            ),
+          }
         }
 
         // const proxyConfig = _.get(this.app[appName], 'appConfig.proxy');
@@ -1859,11 +1875,11 @@ APP.getConfig = (app) => ({
         }))
       )
 
-      const result = getObject(configList)(type)
+      const result = getObject(configList, app)(type)
       if (!result) throw new Error('没有这个type')
       return result
     }
-    const result = getObject(configList)(type)
+    const result = getObject(configList, app)(type)
     if (!result) throw new Error('没有这个type')
     return result
   },

package/core/config.js

@@ -68,6 +68,9 @@ module.exports = {
       // some logic that returns a boolean
     },
   },
+  redis: {
+    url: '',
+  },
   db: {
     username: 'root',
     password: '123456789abc',

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

@@ -9,12 +9,16 @@ const superAdmin = {
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { name, password } = ctx.request.body
-
+  const { host, header } = ctx.request
+  const is_dev =
+    host.startsWith('localhost') ||
+    (header.referer && header.referer.includes('is_dev=true'))
   const permissionList = await app.model.permission.findAll({
     attributes: {
       exclude: ['createdid', 'updated_at', 'created_at', 'name'],
     },
   })
+  if (name === superAdmin.name && !is_dev) throw new Error('账号密码错误')
   if (name === superAdmin.name && password === superAdmin.password) {
     const token = await app.sign({
       user: superAdmin,
@@ -85,12 +89,20 @@ exports.login = async (ctx) => {
 
 exports.checkLogin = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
+  const { host } = ctx.request
+  const is_dev = host.startsWith('localhost')
   const permissionList = await app.model.permission.findAll({
     attributes: {
       exclude: ['createdid', 'updated_at', 'created_at', 'name'],
     },
   })
   if (ctx.request[`${appName}-user`]) {
+    if (ctx.request[`${appName}-user`].name === superAdmin.name && !is_dev) {
+      return ctx.SUCCESS({
+        token: null,
+        user: null,
+      })
+    }
     if (ctx.request[`${appName}-user`].name === superAdmin.name) {
       const token = await app.sign({
         user: superAdmin,

package/core/file/utils/index.js

@@ -16,6 +16,15 @@ exports.getList = (config) => (type) => {
 }
 
 exports.getObject = (config) => (type) => {
+  if (app) {
+    const applicationList = await app.cache.get('application')
+    if (
+      applicationList &&
+      applicationList.find((item) => item.config === type)
+    ) {
+      return applicationList.find((item) => item.config === type)
+    }
+  }
   const obj = config.find((i) => i.code === type)
   if (!obj) throw new Error(`找不到${type}相关设置`)
   const list = config.filter((i) => i.parent_id === obj.id)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "8.4.0",
+  "version": "8.4.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -54,7 +54,8 @@
     "wechat-oauth": "^1.5.0",
     "weixin-pay-fork": "^1.0.0",
     "node-uuid": "^1.4.8",
-    "sha1": "^1.1.1"
+    "sha1": "^1.1.1",
+    "redis": "^4.0.3"
   },
   "devDependencies": {
     "eslint": "^4.19.1",