From e7177e27a6055e81822a4c0bd0ced7c84ed8fcff Mon Sep 17 00:00:00 2001
From: ap <951984189@qq.com>
Date: Thu, 10 Jun 2021 17:16:09 +0800
Subject: [PATCH] =?UTF-8?q?jwt=20=E9=85=8D=E7=BD=AE=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0base?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/modules/base/config.ts               | 12 ++++++++++++
 src/app/modules/base/middleware/authority.ts |  5 ++++-
 src/app/modules/base/service/sys/login.ts    |  2 +-
 src/config/config.default.ts                 | 13 +------------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/app/modules/base/config.ts b/src/app/modules/base/config.ts
index 1177e4f..0107576 100644
--- a/src/app/modules/base/config.ts
+++ b/src/app/modules/base/config.ts
@@ -12,5 +12,17 @@ export default (app: Application) => {
     description: '基础的权限管理功能，包括登录，权限校验',
     // 中间件
     globalMiddlewares: ['baseAuthorityMiddleware', 'baseLogMiddleware'],
+    // jwt 生成解密token的
+    jwt: {
+      // 注意： 最好重新修改，防止破解
+      secret: 'FOAPOFALOEQIPNNLQ',
+      // token
+      token: {
+        // 2小时过期，需要用刷新token
+        expire: 2 * 3600,
+        // 15天内，如果没操作过就需要重新登录
+        refreshExpire: 24 * 3600 * 15,
+      },
+    },
   } as ModuleConfig;
 };
diff --git a/src/app/modules/base/middleware/authority.ts b/src/app/modules/base/middleware/authority.ts
index 2e7b95e..8da456e 100644
--- a/src/app/modules/base/middleware/authority.ts
+++ b/src/app/modules/base/middleware/authority.ts
@@ -17,6 +17,9 @@ export class BaseAuthorityMiddleware implements IWebMiddleware {
   @Config('cool')
   coolConfig: CoolConfig;
 
+  @Config('module.base')
+  jwtConfig: CoolConfig;
+
   coolCache;
 
   @App()
@@ -33,7 +36,7 @@ export class BaseAuthorityMiddleware implements IWebMiddleware {
       // 路由地址为 admin前缀的 需要权限校验
       if (_.startsWith(url, adminUrl)) {
         try {
-          ctx.admin = jwt.verify(token, this.coolConfig.jwt.secret);
+          ctx.admin = jwt.verify(token, this.jwtConfig.jwt.secret);
         } catch (err) {}
         // 不需要登录 无需权限校验
         if (new RegExp(`^${adminUrl}?.*/open/`).test(url)) {
diff --git a/src/app/modules/base/service/sys/login.ts b/src/app/modules/base/service/sys/login.ts
index 32a988e..4c59248 100644
--- a/src/app/modules/base/service/sys/login.ts
+++ b/src/app/modules/base/service/sys/login.ts
@@ -44,7 +44,7 @@ export class BaseSysLoginService extends BaseService {
   @Inject()
   ctx: Context;
 
-  @Config('cool')
+  @Config('module.base')
   coolConfig: CoolConfig;
 
   /**
diff --git a/src/config/config.default.ts b/src/config/config.default.ts
index 19e1cbf..10536e3 100644
--- a/src/config/config.default.ts
+++ b/src/config/config.default.ts
@@ -57,18 +57,7 @@ export default (appInfo: EggAppInfo) => {
     },
     // 单点登录
     sso: false,
-    // jwt 生成解密token的
-    jwt: {
-      // 注意： 最好重新修改，防止破解
-      secret: 'FOAPOFALOEQIPNNLQ',
-      // token
-      token: {
-        // 2小时过期，需要用刷新token
-        expire: 2 * 3600,
-        // 15天内，如果没操作过就需要重新登录
-        refreshExpire: 24 * 3600 * 15,
-      },
-    },
+
     // 分页配置
     page: {
       // 分页查询每页条数