add multiple database; middleware optimization

Author: xpioneer

.gitignore

@@ -16,3 +16,7 @@ conf/db.conf.ts
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+
+*.suo
+.gitkeep

conf/server.conf.ts

@@ -1,11 +1,7 @@
 
 const _PROD_: boolean = process.env.NODE_ENV === 'production'
 
-let PORT: number = 8020
-
-if(_PROD_) {
-  PORT = 8021
-}
+let PORT = _PROD_ ? 8021 : 8020
 
 export {
   PORT

nodemon.json

@@ -2,6 +2,6 @@
   "watch": ["src", "conf"],
   "ext": "ts,js",
   "ignore": ["src/**/*.spec.ts"],
-  "exec": "ts-node conf/server.ts",
+  "exec": "ts-node src/server.ts",
   "delay": 300
 }

package.json

@@ -21,6 +21,7 @@
   "dependencies": {
     "@types/ioredis": "^4.0.3",
     "axios": "^0.18.0",
+    "dataloader": "^2.0.0",
     "graphql": "^14.0.2",
     "ioredis": "^4.2.0",
     "koa": "^2.5.3",

src/@types/$http.ts

@@ -0,0 +1,8 @@
+
+export {}
+
+declare global {
+  export interface IAnyObject {
+    [key: string]: any
+  }
+}

src/@types/global.d.ts

@@ -6,8 +6,8 @@ import Store from "../utils/session/store";
 import { JWT_SECRET, EXP_TIME } from '../constants'
 import { sign } from '../core/jwt/sign'
 import { cryptoPwd } from "../utils/tools"
+import { getBlogManager } from '../database/dbUtils';
 
-const store = new Store
 
 export default class AccountController {
 
@@ -17,7 +17,7 @@ export default class AccountController {
     let username = inputs.username;
     let password = inputs.password;
     if ((username && username.length > 0) && (password && password.length > 5)) {
-      const result = await getManager().findOne(User, {
+      const result = await getBlogManager().findOne(User, {
         select: ['id', 'username', 'nickName', 'sex', 'userType'],
         where: {
           username: username,
@@ -26,7 +26,7 @@ export default class AccountController {
       });
       if(result) {
         const token = sign({ ...result, exp: EXP_TIME }, JWT_SECRET)
-        await store.set('true', {
+        await Store.set('true', {
           sid: token,
           maxAge: EXP_TIME // millisecond
         })
@@ -43,7 +43,7 @@ export default class AccountController {
   static async logout(ctx: Context) {
     const tokens = ctx.header['authorization']
     const token = tokens.split(' ')[1]
-    await store.destroy(token)
+    await Store.destroy(token)
     ctx.Json({ data: 1, msg: '退出成功！' });
   }
 

src/controllers/AccountController.ts

@@ -1,20 +1,21 @@
-import {getManager, getRepository, Equal, Like, Between, FindManyOptions} from "typeorm";
+import { Equal, Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { Article } from '../entities/mysql/article'
 import { Guid } from "../utils/tools";
 import * as Moment from 'moment'
+import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 
 export default class ArticleController {
 
   static async getAll(args: any) {
     console.log(args)
-    return await getManager().find(Article);
+    return await getBlogManager().find(Article);
   }
 
 
   static async getById(id: string = '') {
-    const article = await getRepository(Article).findOne({id})
+    const article = await getBlogRepository(Article).findOne({id})
     // console.log('article: ', article)
     return article
   }
@@ -47,7 +48,7 @@ export default class ArticleController {
     }
     console.log(options, '----options')
 
-    const pages = await getRepository(Article).findAndCount(options)
+    const pages = await getBlogRepository(Article).findAndCount(options)
       // .createQueryBuilder()
       // .where({
       //   // title: Like(args.title)
@@ -74,7 +75,7 @@ export default class ArticleController {
     model.createdAt = Date.now()
     model.updatedBy = ctx.state['CUR_USER'].id
     model.updatedAt = Date.now()
-    const result = await getRepository(Article).save(model)
+    const result = await getBlogRepository(Article).save(model)
     return result
   }
 
@@ -89,7 +90,7 @@ export default class ArticleController {
     article.tag = args.tag
     article.updatedAt = Date.now()
     article.updatedBy = ctx.state['CUR_USER'].id
-    const result = await getRepository(Article).save(article)
+    const result = await getBlogRepository(Article).save(article)
     return result
   }
 

src/controllers/ArticleController.ts

@@ -1,20 +1,21 @@
-import {getManager, getRepository, Like, Between, FindManyOptions} from "typeorm";
+import { Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { ArticleType } from '../entities/mysql/articleType'
 import { Guid } from "../utils/tools";
 import * as Moment from 'moment'
+import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 
 export default class ArticleController {
 
   static async getAll(args: any) {
-    return await getManager().find(ArticleType);
+    return await getBlogManager().find(ArticleType);
   }
 
 
   static async getById(id: string = '') {
     // getManager().findOne()
-    const articleType = await getRepository(ArticleType).findOne({id})
+    const articleType = await getBlogRepository(ArticleType).findOne({id})
     return articleType
   }
 
@@ -38,7 +39,7 @@ export default class ArticleController {
       options.order = Object.assign(options.order, args.order)
     }
     console.log(options, '----options')
-    const pages = await getRepository('articleType').findAndCount(options)
+    const pages = await getBlogRepository('articleType').findAndCount(options)
       // .createQueryBuilder()
       // .orderBy({createdAt: 'DESC'})
       // .offset(args.page < 2 ? 0 : (args.page - 1) * args.pageSize)
@@ -57,7 +58,7 @@ export default class ArticleController {
     model.createdBy = ctx.state['CUR_USER'].id
     model.updatedAt = Date.now()
     model.updatedBy = ctx.state['CUR_USER'].id
-    const result = await getRepository(ArticleType).save(model)
+    const result = await getBlogRepository(ArticleType).save(model)
     return result
   }
 
@@ -68,7 +69,7 @@ export default class ArticleController {
     model.remark = args.remark
     model.updatedAt = Date.now()
     model.updatedBy = ctx.state['CUR_USER'].id
-    const result = await getRepository(ArticleType).update(args.id, model)
+    const result = await getBlogRepository(ArticleType).update(args.id, model)
     console.log('result:', result)
     return result
   }

src/controllers/ArticleTypeController.ts

@@ -1,18 +1,19 @@
-import {getManager, getRepository, Like, Between, FindManyOptions} from "typeorm";
+import { Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { Comment } from '../entities/mysql/comment'
 import { Guid } from "../utils/tools";
 import * as Moment from 'moment'
+import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 export default class CommentController {
 
   static async getAll(args: any) {
-    return await getManager().find(Comment);
+    return await getBlogManager().find(Comment);
   }
 
 
   static async getById(id: string = '') {
-    const article = await getRepository(Comment).findOne({id})
+    const article = await getBlogRepository(Comment).findOne({id})
     return article
   }
 
@@ -35,7 +36,7 @@ export default class CommentController {
     if(args.order) {
       options.order = Object.assign(options.order, args.order)
     }
-    const pages = await getRepository('comment').findAndCount(options)
+    const pages = await getBlogRepository('comment').findAndCount(options)
     return pages
   }