From fde6eaa751abfe3bb3f83cb7d69485dfbc652d6c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 14:48:17 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/security/config/JwtSettings.java | 10 ++++------
src/main/java/com/moral/security/model/token/JwtTokenFactory.java | 17 ++++++++---------
src/main/resources/application.yml | 12 +++++-------
3 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/moral/security/config/JwtSettings.java b/src/main/java/com/moral/security/config/JwtSettings.java
index 7af538e..bc306e8 100644
--- a/src/main/java/com/moral/security/config/JwtSettings.java
+++ b/src/main/java/com/moral/security/config/JwtSettings.java
@@ -2,14 +2,12 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-@Component
@Configuration
-@ConfigurationProperties(prefix = "moral.security.jwt")
+@ConfigurationProperties(prefix = "moral_security_jwt")
public class JwtSettings {
/**
- * {@link com.moral.security.model.token.JwtToken} will expire after this time.
+ * {@link JwtToken} will expire after this time.
*/
private Integer tokenExpirationTime;
@@ -19,12 +17,12 @@
private String tokenIssuer;
/**
- * Key is used to sign {@link com.moral.security.model.token.JwtToken}.
+ * Key is used to sign {@link JwtToken}.
*/
private String tokenSigningKey;
/**
- * {@link com.moral.security.model.token.JwtToken} can be refreshed during this timeframe.
+ * {@link 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 c04a29a..4644e2d 100644
--- a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
@@ -30,16 +30,15 @@
@Autowired
public JwtTokenFactory(JwtSettings settings) {
- //this.settings = settings;
+ this.settings = settings;
- JwtSettings setting1 = new JwtSettings();
- setting1.setRefreshTokenExpTime(60);
- setting1.setTokenExpirationTime(15);
- setting1.setTokenIssuer("http://monitor.7drlb.com");
- setting1.setTokenSigningKey("xm9EV6Hy5RAFL8EEACIDAwQus");
-
- System.out.println("+++++++++++++++++++++++++++++++++=1231231312a");
- this.settings = setting1;
+// JwtSettings setting1 = new JwtSettings();
+// setting1.setRefreshTokenExpTime(60);
+// setting1.setTokenExpirationTime(15);
+// setting1.setTokenIssuer("http://monitor.7drlb.com");
+// setting1.setTokenSigningKey("xm9EV6Hy5RAFL8EEACIDAwQus");
+// System.out.println("+++++++++++++++++++++++++++++++++=1231231312a");
+// this.settings = setting1;
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe775d..3689780 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,13 +4,11 @@
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