From 2253e1afbfd2a54e1f21b39128c2eff07230b8f1 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 11 May 2023 11:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E6=94=B9=E9=80=A0=E3=80=91=E3=80=90auth=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3auth=E6=A8=A1=E5=9D=97jwt=E7=A7=98=E9=92=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/api/expander/JwtConfigExpander.java | 67 ------------------- .../kernel/auth/jwt/AuthJwtTokenService.java | 6 +- 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/JwtConfigExpander.java diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/JwtConfigExpander.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/JwtConfigExpander.java deleted file mode 100644 index 31bbd6897..000000000 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/JwtConfigExpander.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.auth.api.expander; - -import cn.hutool.core.util.RandomUtil; -import cn.stylefeng.roses.kernel.config.api.context.ConfigContext; - -import static cn.stylefeng.roses.kernel.jwt.api.constants.JwtConstants.DEFAULT_JWT_TIMEOUT_SECONDS; - -/** - * jwt工具类的配置获取 - * - * @author fengshuonan - * @since 2020/12/1 15:05 - */ -public class JwtConfigExpander { - - /** - * 获取jwt的密钥 - * - * @author fengshuonan - * @since 2020/12/1 15:07 - */ - public static String getJwtSecret() { - String sysJwtSecret = ConfigContext.me().getConfigValueNullable("SYS_JWT_SECRET", String.class); - - // 没配置就返回一个随机密码 - if (sysJwtSecret == null) { - return RandomUtil.randomString(20); - } else { - return sysJwtSecret; - } - } - - /** - * jwt失效时间，默认1天 - * - * @author fengshuonan - * @since 2020/12/1 15:08 - */ - public static Long getJwtTimeoutSeconds() { - return ConfigContext.me().getSysConfigValueWithDefault("SYS_JWT_TIMEOUT_SECONDS", Long.class, DEFAULT_JWT_TIMEOUT_SECONDS); - } - -} diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/jwt/AuthJwtTokenService.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/jwt/AuthJwtTokenService.java index 362581c57..1098cd167 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/jwt/AuthJwtTokenService.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/jwt/AuthJwtTokenService.java @@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.stylefeng.roses.kernel.auth.api.AuthJwtTokenApi; -import cn.stylefeng.roses.kernel.auth.api.expander.JwtConfigExpander; +import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander; import cn.stylefeng.roses.kernel.auth.api.pojo.payload.DefaultJwtPayload; import cn.stylefeng.roses.kernel.jwt.api.JwtApi; import io.jsonwebtoken.Jwts; @@ -32,7 +32,7 @@ public class AuthJwtTokenService implements AuthJwtTokenApi { public String generateTokenDefaultPayload(DefaultJwtPayload defaultJwtPayload) { // 计算过期时间 - DateTime expirationDate = DateUtil.offsetSecond(new Date(), Convert.toInt(JwtConfigExpander.getJwtTimeoutSeconds())); + DateTime expirationDate = DateUtil.offsetSecond(new Date(), Convert.toInt(AuthConfigExpander.getAuthJwtTimeoutSeconds())); // 设置过期时间 defaultJwtPayload.setExpirationDate(expirationDate.getTime()); @@ -43,7 +43,7 @@ public class AuthJwtTokenService implements AuthJwtTokenApi { .setSubject(defaultJwtPayload.getUserId().toString()) .setIssuedAt(new Date()) .setExpiration(expirationDate) - .signWith(SignatureAlgorithm.HS512, JwtConfigExpander.getJwtSecret()) + .signWith(SignatureAlgorithm.HS512, AuthConfigExpander.getAuthJwtSecret()) .compact(); }