Skip to content

🇨🇳 1.3.0.RELEASE shiro+jwt #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
springboot-plus merged 1 commit into from
Oct 4, 2019
Merged

🇨🇳 1.3.0.RELEASE shiro+jwt #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/io/geekidea/springbootplus/shiro/jwt/JwtFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,12 @@ protected AuthenticationToken createToken(ServletRequest servletRequest, Servlet
}

String username = JwtUtil.getUsername(token);
String salt = loginRedisService.getSalt(username);
String salt;
if (jwtProperties.isSaltCheck()){
salt = loginRedisService.getSalt(username);
}else{
salt = jwtProperties.getSecret();
}
return JwtToken.build(token, username, salt, jwtProperties.getExpireSecond());
}

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/io/geekidea/springbootplus/shiro/jwt/JwtProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,9 @@ public class JwtProperties {
*/
private boolean singleLogin;

/**
* 是否进行盐值校验
*/
private boolean saltCheck;

}
9 changes: 7 additions & 2 deletions src/main/java/io/geekidea/springbootplus/shiro/service/impl/LoginServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,13 @@ public ApiResult login(LoginParam loginParam, HttpServletResponse response) {
log.error("登陆失败,loginParam:{}", loginParam);
return ApiResult.fail(ApiCode.LOGIN_EXCEPTION);
}
// 包装盐值
String newSalt = SaltUtil.getSalt(jwtProperties.getSecret(), loginSysUserVo.getSalt());
String newSalt;
if (jwtProperties.isSaltCheck()){
// 包装盐值
newSalt = SaltUtil.getSalt(jwtProperties.getSecret(), loginSysUserVo.getSalt());
}else{
newSalt = jwtProperties.getSecret();
}
// 删除登陆用户盐值，盐值保存到后台Redis缓存中
loginSysUserVo.setSalt(null);

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/config/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ spring-boot-plus:
redis-check: true
# true: 同一个账号只能是最后一次登陆token有效，false：同一个账号可多次登陆
single-login: false
# 盐值校验，如果不加自定义盐值，则使用secret校验
salt-check: true
############################ JWT end ###############################

############################### spring-boot-plus end ###############################
Expand Down