feat(server): use redis

Author: chuangker

app.js

@@ -21,18 +21,18 @@ const app = module.exports = new Koa()
 const uploadConf = config.get('upload')
 const jwtSecret = config.get('jwt.secret')
 
-util.dropFileSchedule()
+util.init()
 onerror(app)
 validate(app)
 
 app
-  .use(middleware.util)
   .use(middleware.ipFilter)
   .use(favicon(path.join(__dirname, '/public/images/icon.png')))
   .use(serve('/dist', './dist'))
   .use(serve('/public', './public'))
   .use(serve('/upload', path.resolve(__dirname, 'config', uploadConf.dir)))
   .use(logger)
+  .use(middleware.util)
   .use(cors({ credentials: true, maxAge: 2592000 }))
   .use(koaJwt({ secret: jwtSecret }).unless((ctx) => {
     if (/^\/api/.test(ctx.path)) {

build/ci.sh

@@ -1,5 +1,4 @@
 set -e
-echo '{"blackList": { "projects": ["222222222233333333331212"], "ips": ["127.0.0.1"] }}' > ./config/test.json
 npm run lint
 npm test
 

controllers/mock.js

@@ -11,8 +11,9 @@ const pathToRegexp = require('path-to-regexp')
 
 const util = require('../util')
 const ft = require('../models/fields_table')
-const { MockProxy, ProjectProxy, MockCountProxy, UserGroupProxy } = require('../proxy')
+const { MockProxy, ProjectProxy, UserGroupProxy } = require('../proxy')
 
+const redis = util.getRedis()
 const defPageSize = config.get('pageSize')
 
 async function checkByMockId (mockId, uid) {
@@ -89,6 +90,7 @@ module.exports = class MockController {
       mode
     })
 
+    await redis.del('project:' + projectId)
     ctx.body = ctx.util.resuccess()
   }
 
@@ -192,7 +194,7 @@ module.exports = class MockController {
     }
 
     await MockProxy.updateById(api)
-
+    await redis.del('project:' + project.id)
     ctx.body = ctx.util.resuccess()
   }
 
@@ -206,9 +208,17 @@ module.exports = class MockController {
     const method = ctx.method.toLowerCase()
     const jsonpCallback = query.jsonp_param_name && (query[query.jsonp_param_name] || 'callback')
     let { projectId, projectURL, mockURL } = ctx.pathNode
+    const redisKey = 'project:' + projectId
     let apiData, apis, api
 
-    apis = await MockProxy.find({ project: projectId, method })
+    apis = await redis.get(redisKey)
+
+    if (apis) {
+      apis = JSON.parse(apis)
+    } else {
+      apis = await MockProxy.find({ project: projectId })
+      if (apis[0]) await redis.set(redisKey, JSON.stringify(apis), 'EX', 60 * 30)
+    }
 
     if (apis[0] && apis[0].project.url === '/') {
       mockURL = projectURL
@@ -217,7 +227,7 @@ module.exports = class MockController {
 
     api = apis.filter((item) => {
       const url = item.url.replace(/{/g, ':').replace(/}/g, '') // /api/{user}/{id} => /api/:user/:id
-      return pathToRegexp(url).test(mockURL)
+      return item.method === method && pathToRegexp(url).test(mockURL)
     })[0]
 
     if (!api) ctx.throw(404)
@@ -285,7 +295,7 @@ module.exports = class MockController {
       }
     }
 
-    await MockCountProxy.newAndSave(api.id)
+    await redis.lpush('mock.count', api._id)
     if (jsonpCallback) {
       ctx.type = 'text/javascript'
       ctx.body = `${jsonpCallback}(${JSON.stringify(apiData, null, 2)})`
@@ -414,7 +424,7 @@ module.exports = class MockController {
     })
 
     await MockProxy.delByIds(ids)
-
+    await redis.del('project:' + projectId)
     ctx.body = ctx.util.resuccess()
   }
 }

controllers/project.js

@@ -3,10 +3,12 @@
 const _ = require('lodash')
 const config = require('config')
 
+const util = require('../util')
 const ft = require('../models/fields_table')
 const SwaggerUtil = require('../util/swagger')
 const { MockProxy, ProjectProxy, UserProjectProxy, UserGroupProxy } = require('../proxy')
 
+const redis = util.getRedis()
 const defPageSize = config.get('pageSize')
 
 async function checkByProjectId (projectId, uid, creater) {
@@ -356,6 +358,7 @@ module.exports = class ProjectController {
     }
 
     await ProjectProxy.updateById(project)
+    await redis.del('project:' + id)
     ctx.body = ctx.util.resuccess()
   }
 
@@ -386,6 +389,7 @@ module.exports = class ProjectController {
     }
 
     await SwaggerUtil.create(project)
+    await redis.del('project:' + id)
     ctx.body = ctx.util.resuccess()
   }
 
@@ -411,6 +415,7 @@ module.exports = class ProjectController {
     }
 
     await ProjectProxy.delById(id)
+    await redis.del('project:' + id)
     ctx.body = ctx.util.resuccess()
   }
 }

controllers/util.js

@@ -85,9 +85,9 @@ module.exports = class UtilController {
 
     ctx.body = ctx.util.resuccess({
       path: new URL(path.join('upload', date, fileName), origin).href,
-      expire: expireDay > 0 /* istanbul ignore next */
+      expire: expireDay > 0
         ? moment().add(expireDay, 'days').format('YYYY-MM-DD 00:00:00')
-        : -1
+        : /* istanbul ignore next */ -1
     })
   }
 }

middlewares/index.js

@@ -7,43 +7,43 @@ const pathToRegexp = require('path-to-regexp')
 const blackProjects = config.get('blackList.projects')
 const blackIPs = config.get('blackList.ips')
 
-module.exports = class Middleware {
-  static util (ctx, next) {
-    const codeMap = {
-      '-1': 'fail',
-      '200': 'success',
-      '401': 'token expired',
-      '500': 'server error',
-      '10001': 'params error'
-    }
-
-    ctx.set('X-Request-Id', ctx.req.id)
+const codeMap = {
+  '-1': 'fail',
+  '200': 'success',
+  '401': 'token expired',
+  '500': 'server error',
+  '10001': 'params error'
+}
 
-    ctx.util = {
-      resuccess (data) {
-        return {
-          code: 200,
-          success: true,
-          message: codeMap['200'],
-          data: data || null
-        }
-      },
-      refail (message, code, data) {
-        return {
-          code: code || -1,
-          success: false,
-          message: message || codeMap[code],
-          data: data || null
-        }
-      }
+const utilFn = {
+  resuccess (data) {
+    return {
+      code: 200,
+      success: true,
+      message: codeMap['200'],
+      data: data || null
     }
+  },
+  refail (message, code, data) {
+    return {
+      code: code || -1,
+      success: false,
+      message: message || codeMap[code],
+      data: data || null
+    }
+  }
+}
 
+module.exports = class Middleware {
+  static util (ctx, next) {
+    ctx.set('X-Request-Id', ctx.req.id)
+    ctx.util = utilFn
     return next()
   }
 
   static ipFilter (ctx, next) {
     if (ipFilter(ctx.ip, blackIPs, {strict: false})) {
-      ctx.body = ctx.util.refail('请求频率太快，已被限制访问')
+      ctx.body = utilFn.refail('请求频率太快，已被限制访问')
       return
     }
     return next()