update module

Author: xpioneer

package.json

@@ -20,28 +20,29 @@
   },
   "dependencies": {
     "@types/ioredis": "^4.0.3",
-    "axios": "^0.18.0",
+    "axios": "^0.21.1",
     "dataloader": "^2.0.0",
-    "graphql": "^14.0.2",
+    "date-fns": "^2.23.0",
+    "graphql": "^15.5.1",
     "ioredis": "^4.2.0",
     "koa": "^2.5.3",
     "koa-jwt": "^3.5.1",
     "koa-router": "^7.4.0",
-    "moment": "^2.22.2",
     "mongodb": "^3.1.8",
     "mysql2": "^1.6.1",
     "reflect-metadata": "^0.1.12",
     "remove": "^0.1.5",
     "typeorm": "^0.2.9"
   },
   "devDependencies": {
-    "@types/graphql": "^14.0.3",
+    "@types/graphql": "^14.5.0",
     "@types/koa": "^2.0.46",
     "@types/koa-logger": "^3.1.1",
     "@types/koa-router": "^7.0.32",
+    "@types/node": "^16.6.0",
     "koa-logger": "^3.2.0",
     "nodemon": "^1.18.4",
-    "ts-node": "^7.0.1",
-    "typescript": "^3.1.3"
+    "ts-node": "^10.2.0",
+    "typescript": "^4.3.5"
   }
 }

src/@types/global.d.ts

@@ -2,5 +2,6 @@
 export {}
 
 declare global {
+  
   type AnyObject<T = any> = Record<string, T>
 }

src/controllers/ArticleController.ts

@@ -2,7 +2,7 @@ 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 { toDate } from 'date-fns'
 import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 
@@ -40,7 +40,7 @@ export default class ArticleController {
       options.where['tag'] = Like(`%${args.tag}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {

src/controllers/ArticleTypeController.ts

@@ -2,7 +2,7 @@ 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 { toDate } from 'date-fns'
 import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 
@@ -32,7 +32,7 @@ export default class ArticleController {
       options.where['name'] = Like(`%${args.name}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {

src/controllers/CommentController.ts

@@ -2,7 +2,7 @@ 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 { toDate } from 'date-fns'
 import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 export default class CommentController {
@@ -30,7 +30,7 @@ export default class CommentController {
       options.where['description'] = Like(`%${args.description}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {

src/controllers/DemoController.ts

@@ -1,5 +1,4 @@
 import {getMongoManager, getMongoRepository, Like, Between, FindManyOptions, Equal} from "typeorm";
-import * as Moment from 'moment'
 import { Context } from '@core/koa'
 import { Baidu, Tmall } from "../constants";
 

src/controllers/LeaveMessageController.ts

@@ -2,7 +2,7 @@ import { Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { LeaveMessage } from '../entities/mysql/leaveMessage'
 import { Guid } from "../utils/tools";
-import * as Moment from 'moment'
+import { toDate } from 'date-fns'
 import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
 
@@ -32,7 +32,7 @@ export default class LeaveMessageController {
       options.where['description'] = Like(`%${args.description}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {

src/controllers/LogsController.ts

@@ -1,10 +1,11 @@
-import {getMongoManager, getMongoRepository, Like, Between, FindManyOptions, Equal} from "typeorm";
-import * as Moment from 'moment'
+import {getMongoManager, getMongoRepository, Like, Between, FindManyOptions, Equal} from 'typeorm';
 import { Context } from '@core/koa'
 import { API } from '../entities/mongo/api'
 import { Errors } from '../entities/mongo/errors'
-import { Guid } from "../utils/tools";
+import { Guid } from '../utils/tools';
 import { CONNECT_MONGO } from '../database/dbUtils'
+import { formatDate } from '../utils/tools';
+import { DateFormat } from '../types/base';
 
 
 export default class LogsController {
@@ -78,7 +79,7 @@ export default class LogsController {
       model.resHeaders = ctx.response.header
       model.resData = ctx.body
       model.protocol = ctx.protocol;
-      model.createdAt = Moment(Date.now()).format('YYYY/MM/DD HH:mm:ss.SSS')
+      model.createdAt = formatDate(new Date, DateFormat.DateTimeS)
       model.createdBy = ctx.state['CUR_USER'] ? ctx.state['CUR_USER'].id : model.ip
 
       model.method = method
@@ -113,7 +114,7 @@ export default class LogsController {
     model.resHeaders = ctx.response.header
     model.resData = ctx.body
     model.protocol = ctx.protocol;
-    model.createdAt = Moment(Date.now()).format('YYYY/MM/DD HH:mm:ss.SSS')
+    model.createdAt = formatDate(new Date, DateFormat.DateTimeS)
     model.createdBy = ctx.state['CUR_USER'] ? ctx.state['CUR_USER'].id : model.ip
 
     model.status = options.status

src/controllers/SharesController.ts

@@ -2,7 +2,7 @@ import { Equal, Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { GJRecord } from '../entities/mysql/shares/GJRecord'
 import { Guid } from "../utils/tools";
-import * as Moment from 'moment'
+import { toDate } from 'date-fns'
 import { getSharesManager, getSharesRepository } from '../database/dbUtils';
 
 
@@ -40,7 +40,7 @@ class SharesController {
       options.where['tag'] = Like(`%${args.tag}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {

src/controllers/TagController.ts

@@ -2,7 +2,7 @@ import { Like, FindManyOptions, Between} from "typeorm";
 import { Context } from '@core/koa'
 import { Tag } from '../entities/mysql/tag'
 import { Guid } from "../utils/tools";
-import * as Moment from 'moment'
+import { toDate } from 'date-fns'
 import { JWT_KEY } from '../constants'
 import { getBlogManager, getBlogRepository } from '../database/dbUtils';
 
@@ -32,7 +32,7 @@ export default class TagController {
       options.where['name'] = Like(`%${args.name}%`)
     }
     if(args.createdAt) {
-      const date = args.createdAt.map((c: string) => (Moment(c)).valueOf())
+      const date = args.createdAt.map((c: any) => +toDate(c))
       options.where['createdAt'] = Between(date[0], date[1])
     }
     if(args.order) {