From 482d6f8eb5f0d8152afa4f2d7d3feb6635d5c05d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 14:26:30 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/security/config/JwtSettings.java | 6 +++---
src/main/java/com/moral/security/model/token/JwtTokenFactory.java | 4 ++--
pom.xml | 6 ++++++
src/main/resources/application.yml | 12 +++++++-----
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index d733b23..45eb35b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,12 @@
<artifactId>spring-security-oauth2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
diff --git a/src/main/java/com/moral/security/config/JwtSettings.java b/src/main/java/com/moral/security/config/JwtSettings.java
index fc96aac..4ebf38e 100644
--- a/src/main/java/com/moral/security/config/JwtSettings.java
+++ b/src/main/java/com/moral/security/config/JwtSettings.java
@@ -7,7 +7,7 @@
@ConfigurationProperties(prefix = "moral.security.jwt")
public class JwtSettings {
/**
- * {@link JwtToken} will expire after this time.
+ * {@link com.moral.security.model.token.JwtToken} will expire after this time.
*/
private Integer tokenExpirationTime;
@@ -17,12 +17,12 @@
private String tokenIssuer;
/**
- * Key is used to sign {@link JwtToken}.
+ * Key is used to sign {@link com.moral.security.model.token.JwtToken}.
*/
private String tokenSigningKey;
/**
- * {@link JwtToken} can be refreshed during this timeframe.
+ * {@link com.moral.security.model.token.JwtToken} can be refreshed during this timeframe.
*/
private Integer refreshTokenExpTime;
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..bfec8d4 100644
--- a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
@@ -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);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f15aa45..dfe775d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,11 +4,13 @@
tomcat.max-threads: 0
tomcat.uri-encoding: UTF-8
spring.profiles: default
-moral.security.jwt:
- tokenExpirationTime: 15 # Number of minutes
- refreshTokenExpTime: 60 # Minutes
- tokenIssuer: http://monitor.7drlb.com
- tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+moral:
+ security:
+ jwt:
+ tokenExpirationTime: 15 # Number of minutes
+ refreshTokenExpTime: 60 # Minutes
+ tokenIssuer: http://monitor.7drlb.com
+ tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
spring:
thymeleaf:
cache: false
--
Gitblit v1.8.0