Skip to content

Commit 2fb0044

Browse files
WxrLZQWxrLZQ
committed
自定义token的有效时间
1 parent e7a10ff commit 2fb0044

File tree

4 files changed

+28
-31
lines changed

4 files changed

+28
-31
lines changed

‎springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected void configure(HttpSecurity http) throws Exception {
104104
Account account = (Account) authentication.getPrincipal();
105105
jwtmap.put("username", account.getUsername());
106106
//生成token
107-
String token = JWTUtils.getToken(jwtmap);
107+
String token = JWTUtils.getToken(jwtmap,10,24);
108108
Map<String, Object> withToken = ResultMapUtils.ResultMapWithToken(true, 0, account, token);
109109
httpServletRequest.getSession().setAttribute("map", withToken);
110110
UserUtils.responseMessage(httpServletResponse, withToken, objectMapper);

‎springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ public Map<String, Object> githubcallback(HttpServletRequest request) throws Jso
118118
// return ResultMapUtils.ResultMapWithToken(false, 0, "返回token用于绑定账号", token);
119119
// }
120120
log.info("我进入了github第三方登录调用接口");
121-
Map<String, Object> map = UserUtils.callback(request, githubService, stringRedisTemplate,
122-
accountService, "githubId");
121+
Map<String, Object> map = UserUtils.callback(request, githubService, accountService, "githubId");
123122
return map;
124123
}
125124

@@ -158,8 +157,7 @@ public Map<String, Object> giteeCallBack(HttpServletRequest request) throws IOEx
158157
// //返回token 用来绑定第三方账号
159158
// return ResultMapUtils.ResultMapWithToken(false, 0, "返回token用于绑定账号", token);
160159
// }
161-
Map<String, Object> map = UserUtils.callback(request, giteeService, stringRedisTemplate,
162-
accountService, "giteeId");
160+
Map<String, Object> map = UserUtils.callback(request, giteeService, accountService, "giteeId");
163161
return map;
164162
}
165163

@@ -177,7 +175,7 @@ public Map<String, Object> sendPasswordEmail(Account account) {
177175
HashMap<String, String> map = new HashMap<>();
178176
//判断用户名是否不为空
179177
map.put("email", account.getEmail());
180-
String token = JWTUtils.getToken(map);
178+
String token = JWTUtils.getToken(map, 12, 10);
181179
Mail mail = new Mail();
182180
mail.setTo(account.getEmail());
183181
mail.setSubject("请点击以下链接进行密码修改");
@@ -207,12 +205,19 @@ public Map<String, Object> modifyPossword(HttpServletRequest request, Account ac
207205
DecodedJWT verify = JWTUtils.verify(token);
208206
//获取用户名
209207
String email = verify.getClaim("email").asString();
210-
account.setEmail(email);
211-
//更新密码
212-
accountService.update(account);
213-
return ResultMapUtils.ResultMap(true, 0, null);
208+
//验证token是否正确
209+
if (StringUtils.isNotBlank(email)) {
210+
account.setEmail(email);
211+
//更新密码
212+
Boolean update = accountService.update(account);
213+
return ResultMapUtils.ResultMap(true, 0, null);
214+
} else {
215+
216+
}
217+
//token无效
218+
return ResultMapUtils.ResultMap(false, 0, null);
214219
} catch (Exception e) {
215-
// e.printStackTrace();
220+
e.printStackTrace();
216221
//token无效
217222
return ResultMapUtils.ResultMap(false, 0, null);
218223
}
@@ -320,13 +325,8 @@ public Map<String, Object> doLogin(HttpServletRequest request) {
320325
DecodedJWT verify = JWTUtils.verify(token);
321326
//获取用户传输的第三方信息
322327
String username = verify.getClaim("username").asString();
323-
String git = verify.getClaim("git").asString();
324-
String gitId = null;
325-
if (StringUtils.isNotBlank(git)) {
326-
gitId = stringRedisTemplate.opsForValue().get(git);
327-
}
328328
//判断令牌是否过期
329-
if (StringUtils.isNotBlank(gitId)) {
329+
if (StringUtils.isNotBlank(username)) {
330330
Account account = accountService.queryByUsername(username);
331331
//(查询用户角色)s
332332
Role role = roleService.queryById(account.getRoleId());
@@ -339,9 +339,9 @@ public Map<String, Object> doLogin(HttpServletRequest request) {
339339
SecurityContextHolder.getContext().setAuthentication(auth);
340340
//生成登录token
341341
Map<String, String> tokenMap = new HashMap<>();
342-
tokenMap.put("username",account.getUsername());
343-
String resultToken = JWTUtils.getToken(tokenMap);
344-
Map<String, Object> map = ResultMapUtils.ResultMapWithToken(true, 0, account,resultToken);
342+
tokenMap.put("username", account.getUsername());
343+
String resultToken = JWTUtils.getToken(tokenMap, 10, 24);
344+
Map<String, Object> map = ResultMapUtils.ResultMapWithToken(true, 0, account, resultToken);
345345
//存入用户信息
346346
request.getSession().setAttribute("map", map);
347347
return map;
@@ -359,8 +359,8 @@ public Map<String, Object> doLogin(HttpServletRequest request) {
359359

360360

361361
@GetMapping("/Test")
362-
public Map<String,Object> Test(String username){
362+
public Map<String, Object> Test(String username) {
363363
Account account = accountService.queryByUsername(username);
364-
return ResultMapUtils.ResultMap(true,0,account);
364+
return ResultMapUtils.ResultMap(true, 0, account);
365365
}
366366
}

‎springboot-dubbo-web/src/main/java/com/lzq/web/utils/JWTUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public class JWTUtils {
1313

1414

1515
//生产验证码
16-
public static String getToken(Map<String, String> map) {
16+
public static String getToken(Map<String, String> map,Integer timeType,Integer time) {
1717
Calendar instance = Calendar.getInstance();
1818
//过期时间24小时后过期
19-
instance.add(10, 24);
19+
instance.add(timeType, time);
2020
JWTCreator.Builder builder = JWT.create();
2121
map.forEach((k, v) -> {
2222
builder.withClaim(k, v);

‎springboot-dubbo-web/src/main/java/com/lzq/web/utils/UserUtils.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static Map<String, Object> BindAccount(Account account, String headtoken,
3939
HashMap<String, String> jwtmap = new HashMap();
4040
jwtmap.put("username", account.getUsername());
4141
//登录成功生产token
42-
String token = JWTUtils.getToken(jwtmap);
42+
String token = JWTUtils.getToken(jwtmap,10,24);
4343
//判断是否有token 有token则需要进行第三方绑定 没有则正常登录返回结果
4444
if (StringUtils.isNotBlank(headtoken)) {
4545
//验证token
@@ -90,13 +90,12 @@ public static void responseMessage(HttpServletResponse response, Map<String, Obj
9090
* 查询第三方登录信息
9191
* @param request
9292
* @param baseOuathService
93-
* @param redisTemplate
9493
* @param accountService
9594
* @param gitType 第三方登录类型
9695
* @return
9796
*/
9897
public static Map<String, Object> callback(HttpServletRequest request, BaseOuathService baseOuathService,
99-
StringRedisTemplate redisTemplate,AccountService accountService,String gitType){
98+
AccountService accountService,String gitType){
10099
String header = request.getHeader("token");
101100
Map<String, String> jwtmap = new HashMap();
102101
Account rest=null;
@@ -153,14 +152,12 @@ public static Map<String, Object> callback(HttpServletRequest request, BaseOuath
153152
}else {
154153
jwtmap.put("git", rest.getGiteeId());
155154
}
156-
//把githubId存入数据库中用来严重token是否过期
157-
redisTemplate.opsForValue().set(info.getId(), info.getId(), 900L, TimeUnit.SECONDS);
158-
token = JWTUtils.getToken(jwtmap);
155+
token = JWTUtils.getToken(jwtmap,12,10);
159156
log.info("该用户已绑定");
160157
return ResultMapUtils.ResultMapWithToken(true, 0, "返回token用于登录", token);
161158
} else {
162159
jwtmap.put(gitType, info.getId());
163-
token = JWTUtils.getToken(jwtmap);
160+
token = JWTUtils.getToken(jwtmap,12,10);
164161
log.info("该用户未绑定");
165162
//返回token 用来绑定第三方账号
166163
return ResultMapUtils.ResultMapWithToken(false, 0, "返回token用于绑定账号", token);

0 commit comments

Comments
 (0)