From ac8b7c62fc3e3d2bc882972e3238548b897a0127 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 17:55:00 +0800
Subject: [PATCH] 111

---
 src/configuration.ts   |  2 +-
 src/controller/home.ts | 10 ++++++++--
 src/model/sys/role.ts  | 24 ------------------------
 src/model/user.ts      |  7 +++----
 src/service/user.ts    |  3 +--
 5 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 src/model/sys/role.ts

diff --git a/src/configuration.ts b/src/configuration.ts
index 49f873e..037a4ac 100644
--- a/src/configuration.ts
+++ b/src/configuration.ts
@@ -1,10 +1,10 @@
 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';
+import * as cool from '@midwayjs/cool-core';
 
 @Configuration({
   imports: [
diff --git a/src/controller/home.ts b/src/controller/home.ts
index 5511847..f087e63 100755
--- a/src/controller/home.ts
+++ b/src/controller/home.ts
@@ -1,12 +1,12 @@
-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';
+import { BaseController } from '@midwayjs/cool-core';
 
 @Provide()
 @Controller('/test')
-export class HomeController extends BaseController {
+export class HomeController extends BaseController{
 
   @InjectEntityModel(User)
   userModel: Repository<User>
@@ -15,4 +15,10 @@ export class HomeController extends BaseController {
     return this.userModel;
   }
 
+   // 根据ID 获得单条信息
+   @Get("/info")
+   async info(@Query() id) {
+       return id;
+   }
+
 }
diff --git a/src/model/sys/role.ts b/src/model/sys/role.ts
deleted file mode 100644
index eb3202e..0000000
--- a/src/model/sys/role.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { EntityModel } from '@midwayjs/orm';
-import { Column, Index } from 'typeorm';
-import { BaseModel } from '@midwayjs/cool-core';
-
-/**
- * 系统角色
- */
-@EntityModel('sys_role')
-export class SysRole extends BaseModel{
-    // 名称
-    @Column()
-    userId: string;
-    // 名称
-    @Index({ unique: true })
-    @Column()
-    name: string;
-    // 角色标签
-    @Index({ unique: true })
-    @Column({ nullable: true, length: 50 })
-    label: string;
-    // 备注
-    @Column({ nullable: true })
-    remark: string;
-}
diff --git a/src/model/user.ts b/src/model/user.ts
index e9950e1..2d45d80 100644
--- a/src/model/user.ts
+++ b/src/model/user.ts
@@ -1,10 +1,9 @@
+import { BaseModel } from '@midwayjs/cool-core';
 import { EntityModel } from '@midwayjs/orm';
-import { PrimaryGeneratedColumn, Column } from 'typeorm';
+import { Column } from 'typeorm';
  
 @EntityModel('user')
-export class User {
-  @PrimaryGeneratedColumn({ name: "id" })
-  id: number;
+export class User extends BaseModel{
  
   @Column({ name: "name" })
   name: string;
diff --git a/src/service/user.ts b/src/service/user.ts
index 9b84cef..2e6a8e1 100644
--- a/src/service/user.ts
+++ b/src/service/user.ts
@@ -1,9 +1,8 @@
 import { Provide } from '@midwayjs/decorator';
 import { IUserOptions } from '../interface';
-import { BaseService } from '@midwayjs/cool-core'
 
 @Provide()
-export class UserService extends BaseService {
+export class UserService {
 
   async getUser(options: IUserOptions) {
     return {