From 8ad9c573b2bda3ad3c7f7112953fd289f82a4591 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 28 May 2021 11:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81,=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin.server.ts                         | 7 ++++++-
 src/admin/controllers/account.controller.ts | 4 +---
 src/admin/controllers/role.controller.ts    | 2 +-
 src/api.server.ts                           | 7 ++++++-
 src/api/controllers/exam.controller.ts      | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/admin.server.ts b/src/admin.server.ts
index b35ca74..a3416de 100644
--- a/src/admin.server.ts
+++ b/src/admin.server.ts
@@ -46,7 +46,12 @@ export class AdminServer {
     let self = this
     for (let [controller, config] of RouterMap.decoratedRouters) {
       for (let data of config.data) {
-        logger.info('find admin router', data.method || 'all', data.path, controller.name)
+        logger.info(
+          'add router',
+          data.method || 'all',
+          data.path,
+          `${data.target.constructor.name}.${controller.name}()`,
+        )
         // @ts-ignore
         self.server[data.method || 'all'](
           data.path,
diff --git a/src/admin/controllers/account.controller.ts b/src/admin/controllers/account.controller.ts
index 4440285..c54ab53 100644
--- a/src/admin/controllers/account.controller.ts
+++ b/src/admin/controllers/account.controller.ts
@@ -7,7 +7,7 @@ import { generate_captcha } from '../../utils/captcha.util'
 import { isTrue } from '../../utils/string.util'
 import { Shop } from '../../models/shop/Shop'
 
-class AccountController extends BaseController {
+export default class AccountController extends BaseController {
   @router('post /api/admin/login')
   async login(req, res) {
     const { username, password } = req.params
@@ -238,5 +238,3 @@ class AccountController extends BaseController {
     res.send(cap.data)
   }
 }
-
-export default AccountController
diff --git a/src/admin/controllers/role.controller.ts b/src/admin/controllers/role.controller.ts
index 4a37a72..e955244 100644
--- a/src/admin/controllers/role.controller.ts
+++ b/src/admin/controllers/role.controller.ts
@@ -4,7 +4,7 @@ import { AdminRole } from '../../models/admin/AdminRole'
 import { ZError } from '../../common/ZError'
 import { FastifyInstance } from 'fastify'
 
-class RoleController extends BaseController {
+export default class RoleController extends BaseController {
   @permission('role:update')
   @router('post /api/roles')
   async saveRole(req) {
diff --git a/src/api.server.ts b/src/api.server.ts
index 0ff63c2..3b1f317 100644
--- a/src/api.server.ts
+++ b/src/api.server.ts
@@ -47,7 +47,12 @@ export class ApiServer {
     let self = this
     for (let [controller, config] of RouterMap.decoratedRouters) {
       for (let data of config.data) {
-        logger.info('find api router', data.method || 'all', data.path, controller.name)
+        logger.info(
+          'add router',
+          data.method || 'all',
+          data.path,
+          `${data.target.constructor.name}.${controller.name}()`,
+        )
         // @ts-ignore
         self.server[data.method || 'all'](
           data.path,
diff --git a/src/api/controllers/exam.controller.ts b/src/api/controllers/exam.controller.ts
index c00f4b0..2bb8c49 100644
--- a/src/api/controllers/exam.controller.ts
+++ b/src/api/controllers/exam.controller.ts
@@ -11,7 +11,7 @@ import { UserReward } from '../../models/UserReward'
 class ExamController extends BaseController {
   @role('anon')
   @router('post /api/:accountid/exam/list')
-  async list(req, res) {
+  async list(req) {
     let { shop, accountid, eid, delay } = req.params
     if (!shop || !validShopId(shop)) {
       throw new ZError(10, '没有店铺id或者店铺id格式不正确, 测试使用: 607ff59d4a4e16687a3b7079')
@@ -69,7 +69,7 @@ class ExamController extends BaseController {
 
   @role('anon')
   @router('post /api/:accountid/exam/answer')
-  async report(req, res) {
+  async report(req) {
     /**
      * type 0:正常 1: 超时
      */