From 0f0890e210e92517d29645d83c596db2c2d9ddb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=95=8A=E5=B9=B3?= <951984189@qq.com>
Date: Tue, 26 Jan 2021 18:43:31 +0800
Subject: [PATCH] 111

---
 Dockerfile                 | 15 +++++++++++++++
 package.json               |  5 +++--
 src/config/config.local.ts |  6 +++---
 src/controller/api.ts      | 21 ++++++++++++++++++---
 src/middleware/report.ts   |  1 -
 src/model/sys/role.ts      | 24 ++++++++++++++++++++++++
 6 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 src/model/sys/role.ts

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9b5cfee
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM node:12
+
+WORKDIR /home
+
+COPY . .
+
+# 如果各公司有自己的私有源，可以替换registry地址
+RUN yarn
+
+RUN yarn build
+
+# 如果端口更换，这边可以更新一下
+EXPOSE 7001
+
+CMD ["npm", "run", "start"]
\ No newline at end of file
diff --git a/package.json b/package.json
index 0042a3a..051f9f5 100755
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "@midwayjs/decorator": "^2.3.0",
     "@midwayjs/orm": "^1.3.0",
     "@midwayjs/web": "^2.3.0",
+    "axios": "^0.21.1",
     "egg": "^2.0.0",
     "egg-scripts": "^2.10.0",
     "mysql": "^2.18.1"
@@ -27,10 +28,10 @@
     "node": ">=12.0.0"
   },
   "scripts": {
-    "start": "egg-scripts start --daemon --title=midway-server-my_midway_project --framework=@midwayjs/web",
+    "start": "egg-scripts start --title=midway-server-my_midway_project --framework=@midwayjs/web",
     "stop": "egg-scripts stop --title=midway-server-my_midway_project",
     "start_build": "npm run build && cross-env NODE_ENV=development midway-bin dev",
-    "dev": "cross-env ets && cross-env NODE_ENV=local midway-bin dev --ts",
+    "dev": "cross-env ets && cross-env NODE_ENV=local TS_NODE_TYPE_CHECK=false TS_NODE_TRANSPILE_ONLY=true midway-bin dev --ts --port=8001",
     "test": "midway-bin test",
     "cov": "midway-bin cov",
     "lint": "mwts check",
diff --git a/src/config/config.local.ts b/src/config/config.local.ts
index 4c9bb94..41d16f8 100644
--- a/src/config/config.local.ts
+++ b/src/config/config.local.ts
@@ -7,10 +7,10 @@ export default (appInfo: EggAppInfo) => {
 
     config.orm = {
         type: 'mysql',
-        host: '127.0.0.1',
+        host: '139.196.196.203',
         port: 3306,
-        username: 'root',
-        password: '123123',
+        username: 'midway',
+        password: 'Yxd8mJYE4p8BytHF',
         database: 'midway',
         synchronize: true,
         logging: false,
diff --git a/src/controller/api.ts b/src/controller/api.ts
index 728c22d..774f3d2 100644
--- a/src/controller/api.ts
+++ b/src/controller/api.ts
@@ -4,6 +4,7 @@ import { UserService } from '../service/user';
 import { Repository } from 'typeorm';
 import { User } from '../model/user';
 import { InjectEntityModel } from '@midwayjs/orm';
+import axios from 'axios';
 
 @Provide()
 @Controller('/api')
@@ -19,10 +20,24 @@ export class APIController {
 
   @Get('/get_user')
   async getUser(@Query() uid) {
-    const user = await this.userService.getUser({ uid });
+    // const user = await this.userService.getUser({ uid });
 
-    console.log(await this.userModel.findOne({id: 1}))
+    // console.log(await this.userModel.findOne({id: 1}))
 
-    return { success: true, message: 'OK', data: user };
+   // const result = await axios.get('https://docs-admin-cloud.cool-js.com/api/get_user?uid=1')
+    let index = 0;
+    while(true){
+      try {
+        index++;
+        const startTime = Date.now();
+        const result = await axios.get('https://m.cool-js.com/api/get_user?uid=1')
+        console.log(index,'请求时间', Date.now() - startTime, result.data);
+      } catch (error) {
+        console.log(6666666666666666666666666666666666666666)
+        continue;
+      }
+    }
+
+   // return { success: true, message: 'OK', data: {uid, a: result.data} };
   }
 }
diff --git a/src/middleware/report.ts b/src/middleware/report.ts
index fe79760..cd72705 100644
--- a/src/middleware/report.ts
+++ b/src/middleware/report.ts
@@ -8,7 +8,6 @@ export class ReportMiddleware implements IWebMiddleware {
   resolve() {
     return async (ctx: Context, next: IMidwayWebNext) => {
       const startTime = Date.now();
-      console.log(666)
       await next();
       console.log('请求时间', Date.now() - startTime);
     };
diff --git a/src/model/sys/role.ts b/src/model/sys/role.ts
new file mode 100644
index 0000000..eb3202e
--- /dev/null
+++ b/src/model/sys/role.ts
@@ -0,0 +1,24 @@
+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;
+}