From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/security/model/token/JwtTokenFactory.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
index af57793..226397e 100644
--- a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
@@ -30,7 +30,7 @@
@Autowired
public JwtTokenFactory(JwtSettings settings) {
- this.settings = settings;
+ this.settings = settings;;
}
/**
@@ -58,9 +58,9 @@
.setIssuer(settings.getTokenIssuer())
.setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
.setExpiration(Date.from(currentTime
- .plusMinutes(15)
+ .plusMinutes(settings.getTokenExpirationTime())
.atZone(ZoneId.systemDefault()).toInstant()))
- .signWith(SignatureAlgorithm.HS512, "xm9EV6Hy5RAFL8EEACIDAwQus")
+ .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
.compact();
return new AccessJwtToken(token, claims);
--
Gitblit v1.8.0