【7.6.0】【框架改造】【auth】修正auth模块jwt秘钥配置

pull/55/head
fengshuonan 2023-05-11 11:04:58 +08:00
parent a711e7541b
commit 2253e1afbf
2 changed files with 3 additions and 70 deletions

View File

@ -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.
*
* GunsAPACHE 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;
}
}
/**
* jwt1
*
* @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);
}
}

View File

@ -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();
}