Merge pull request #19 from atian25/egg-fix

feat: egg style && upgrade to 2

Author: wuomzfx

server/.autod.conf.js

@@ -3,6 +3,7 @@
 module.exports = {
   write: true,
   prefix: '^',
+  plugin: 'autod-egg',
   test: [
     'test',
     'benchmark',
@@ -14,8 +15,8 @@ module.exports = {
     'egg-bin',
     'autod',
     'eslint',
-    'eslint-config-egg',
     'supertest',
+    'autod-egg',
     'webstorm-disable-index',
   ],
   exclude: [

server/app/controller/api.js

@@ -43,7 +43,7 @@ module.exports = app => {
         }
       }
       const resources = yield this.service.api.getRichList(condition, page, limit, order)
-      const count = yield app.model.api.find(condition).count().exec()
+      const count = yield app.model.Api.find(condition).count().exec()
       this.ctx.body = { resources, pages: { limit, page, count } }
       this.ctx.status = 200
     }
@@ -114,7 +114,7 @@ module.exports = app => {
       assert(mongoose.Types.ObjectId.isValid(groupId), 403, 'invalid groupId')
       assert(mongoose.Types.ObjectId.isValid(apiId), 403, 'invalid apiId')
 
-      const resources = (yield app.model.api.findOne({ _id: apiId, isDeleted: false })).toObject()
+      const resources = (yield app.model.Api.findOne({ _id: apiId, isDeleted: false })).toObject()
       resources.history = yield this.service.apiHistory.get(resources)
 
       this.ctx.body = { resources }
@@ -194,7 +194,7 @@ module.exports = app => {
           msg: '无权删除'
         })
       }
-      yield app.model.group.update({ _id: groupId }, { modifiedTime: Date.now() }, { new: true }).exec()
+      yield app.model.Group.update({ _id: groupId }, { modifiedTime: Date.now() }, { new: true }).exec()
       this.ctx.logger.info('deleteApi')
       this.ctx.status = 204
     }

server/app/controller/authority.js

@@ -19,7 +19,7 @@ module.exports = app => {
     }
     * getApi () {
       const { apiId } = this.ctx.params
-      const authority = (yield this.service.apiAuthority.get(apiId)) || app.model.apiAuthority()
+      const authority = (yield this.service.apiAuthority.get(apiId)) || app.model.ApiAuthority()
       authority.apiId = apiId
       this.success(authority)
     }

server/app/controller/client.js

@@ -10,9 +10,9 @@ module.exports = app => {
       if (id.length < 5) {
         // hack方法，兼容老的存下url信息的api
         const url = `/client/${id}`
-        return yield app.model.api.findOne({ url, 'options.method': method }).exec()
+        return yield app.model.Api.findOne({ url, 'options.method': method }).exec()
       }
-      return yield app.model.api.findOne({ _id: id, 'options.method': method }).exec()
+      return yield app.model.Api.findOne({ _id: id, 'options.method': method }).exec()
     }
     * real () {
       const { _apiRealUrl, _apiMethod } = this.ctx.request.body

server/app/controller/group.js

@@ -27,13 +27,13 @@ module.exports = app => {
         isDeleted: false,
         name: reg
       }
-      const resources = yield app.model.group
-                                       .find(cond)
-                                       .sort({ modifiedTime: -1, createTime: -1 })
-                                       .skip((page - 1) * limit)
-                                       .limit(limit)
-                                       .exec()
-      const count = yield app.model.group.find(cond).count().exec()
+      const resources = yield app.model.Group
+        .find(cond)
+        .sort({ modifiedTime: -1, createTime: -1 })
+        .skip((page - 1) * limit)
+        .limit(limit)
+        .exec()
+      const count = yield app.model.Group.find(cond).count().exec()
       this.ctx.body = { resources, pages: { limit, page, count } }
       this.ctx.status = 200
     }

server/app/model/api.js

@@ -1,4 +1,5 @@
-module.exports = mongoose => {
+module.exports = app => {
+  const mongoose = app.mongoose
   const { ObjectId } = mongoose.Schema.Types
   const ApiSchema = mongoose.Schema({
     group: {

server/app/model/api_authority.js

@@ -1,4 +1,5 @@
-module.exports = mongoose => {
+module.exports = app => {
+  const mongoose = app.mongoose
   const { ObjectId } = mongoose.Schema.Types
   const ApiAuthoritySchema = mongoose.Schema({
     apiId: {
@@ -9,7 +10,7 @@ module.exports = mongoose => {
     operation: { // 编辑权限
       mode: {
         type: Number,
-        default: 0  // 0 - 所有人, 1 - 组内人员 2 - 指定人员
+        default: 0 // 0 - 所有人, 1 - 组内人员 2 - 指定人员
       },
       operator: {
         type: [ ObjectId ],

server/app/model/api_history.js

@@ -1,4 +1,5 @@
-module.exports = mongoose => {
+module.exports = app => {
+  const mongoose = app.mongoose
   const { ObjectId } = mongoose.Schema.Types
   const ApiHistorySchema = mongoose.Schema({
     apiId: {

server/app/model/api_stat.js

@@ -1,5 +1,6 @@
 const moment = require('moment')
-module.exports = mongoose => {
+module.exports = app => {
+  const mongoose = app.mongoose
   const { ObjectId } = mongoose.Schema.Types
   const ApiStatSchema = mongoose.Schema({
     apiId: {

server/app/model/group.js

@@ -1,4 +1,5 @@
-module.exports = mongoose => {
+module.exports = app => {
+  const mongoose = app.mongoose
   const { ObjectId } = mongoose.Schema.Types
   const GroupSchema = new mongoose.Schema({
     teamId: {