From 2a501ed8e94bdc95e43d70c36e0f9cea0525d514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=95=8A=E5=B9=B3?= <951984189@qq.com>
Date: Wed, 27 Jan 2021 16:14:09 +0800
Subject: [PATCH] 11

---
 package.json               | 28 ++++++++++++++--------------
 src/configuration.ts       | 14 +++++++++++++-
 src/controller/home.ts     | 20 ++++++++++++++------
 src/service/user.ts        |  4 +++-
 typings/config/index.d.ts  |  1 +
 typings/config/plugin.d.ts |  1 +
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 051f9f5..eaca176 100755
--- a/package.json
+++ b/package.json
@@ -1,28 +1,28 @@
 {
-  "name": "my_midway_project",
+  "name": "cool-admin",
   "version": "1.0.0",
   "description": "",
   "private": true,
   "dependencies": {
-    "@midwayjs/decorator": "^2.3.0",
+    "@midwayjs/decorator": "^2.7.0",
     "@midwayjs/orm": "^1.3.0",
-    "@midwayjs/web": "^2.3.0",
+    "@midwayjs/web": "^2.7.0",
     "axios": "^0.21.1",
-    "egg": "^2.0.0",
-    "egg-scripts": "^2.10.0",
+    "egg": "^2.29.1",
+    "egg-scripts": "^2.13.0",
     "mysql": "^2.18.1"
   },
   "devDependencies": {
-    "@midwayjs/cli": "^1.0.0",
-    "@midwayjs/egg-ts-helper": "^1.0.1",
-    "@midwayjs/mock": "^2.3.0",
-    "@types/jest": "^26.0.10",
+    "@midwayjs/cli": "^1.2.39",
+    "@midwayjs/egg-ts-helper": "^1.0.5",
+    "@midwayjs/mock": "^2.7.0",
+    "@types/jest": "^26.0.20",
     "@types/node": "14",
-    "cross-env": "^6.0.0",
-    "jest": "^26.4.0",
-    "mwts": "^1.0.5",
-    "ts-jest": "^26.2.0",
-    "typescript": "^3.9.0"
+    "cross-env": "^7.0.3",
+    "jest": "^26.6.3",
+    "mwts": "^1.1.2",
+    "ts-jest": "^26.4.4",
+    "typescript": "^4.1.3"
   },
   "engines": {
     "node": ">=12.0.0"
diff --git a/src/configuration.ts b/src/configuration.ts
index c43bc57..49f873e 100644
--- a/src/configuration.ts
+++ b/src/configuration.ts
@@ -1,12 +1,16 @@
 import { App, Configuration } from '@midwayjs/decorator';
 import { ILifeCycle, IMidwayContainer } from '@midwayjs/core';
 import * as orm from '@midwayjs/orm';
+import * as cool from '@midwayjs/cool-core';
 import { listModule } from '@midwayjs/decorator';
 import { Application } from 'egg';
-
+import * as moment from 'moment';
 
 @Configuration({
   imports: [
+    // cool官方核心组件 官网：https://cool-js.com
+    cool,
+    // typeorm数据库组件 文档地址 https://typeorm.io/， 打不开可以用这个链接 https://typeorm.biunav.com/zh/
     orm
   ],
 })
@@ -16,6 +20,14 @@ export class ContainerLifeCycle implements ILifeCycle {
   app: Application;
 
   async onReady(container?: IMidwayContainer): Promise<void> {
+    // 格式化时间
+    Date.prototype.toJSON = function () {
+      return moment(this).format('YYYY-MM-DD HH:mm:ss');
+    };
+    // 新增String支持replaceAll方法
+    String.prototype['replaceAll'] = function (s1, s2) {
+      return this.replace(new RegExp(s1, 'gm'), s2);
+    };
 
     console.log('加载配置')
     // this.app.use(async (ctx, next) => {
diff --git a/src/controller/home.ts b/src/controller/home.ts
index b0d35f0..5511847 100755
--- a/src/controller/home.ts
+++ b/src/controller/home.ts
@@ -1,10 +1,18 @@
-import { Controller, Get, Provide } from '@midwayjs/decorator';
+import { BaseController } from '@midwayjs/cool-core';
+import { Controller, Get, Query, Provide } from '@midwayjs/decorator';
+import { User } from '../model/user';
+import { Repository } from 'typeorm';
+import { InjectEntityModel } from '@midwayjs/orm';
 
 @Provide()
-@Controller('/')
-export class HomeController {
-  @Get('/')
-  async home() {
-    return 'Hello Midwayjs!';
+@Controller('/test')
+export class HomeController extends BaseController {
+
+  @InjectEntityModel(User)
+  userModel: Repository<User>
+
+  getModel() {
+    return this.userModel;
   }
+
 }
diff --git a/src/service/user.ts b/src/service/user.ts
index 059480a..9b84cef 100644
--- a/src/service/user.ts
+++ b/src/service/user.ts
@@ -1,8 +1,10 @@
 import { Provide } from '@midwayjs/decorator';
 import { IUserOptions } from '../interface';
+import { BaseService } from '@midwayjs/cool-core'
 
 @Provide()
-export class UserService {
+export class UserService extends BaseService {
+
   async getUser(options: IUserOptions) {
     return {
       uid: options.uid,
diff --git a/typings/config/index.d.ts b/typings/config/index.d.ts
index ca60818..71991d0 100644
--- a/typings/config/index.d.ts
+++ b/typings/config/index.d.ts
@@ -8,6 +8,7 @@ import 'egg-session';
 import 'egg-i18n';
 import 'egg-multipart';
 import 'egg-security';
+import 'egg-logrotator';
 import 'egg-schedule';
 import 'egg-jsonp';
 import 'egg-view';
diff --git a/typings/config/plugin.d.ts b/typings/config/plugin.d.ts
index e857358..8adedf3 100644
--- a/typings/config/plugin.d.ts
+++ b/typings/config/plugin.d.ts
@@ -7,6 +7,7 @@ import 'egg-session';
 import 'egg-i18n';
 import 'egg-multipart';
 import 'egg-security';
+import 'egg-logrotator';
 import 'egg-schedule';
 import 'egg-jsonp';
 import 'egg-view';