From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/security/model/token/JwtTokenFactory.java |   11 +----------
 1 files changed, 1 insertions(+), 10 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 c04a29a..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,16 +30,7 @@
 
     @Autowired
     public JwtTokenFactory(JwtSettings 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;
+        this.settings = settings;;
     }
 
     /**

--
Gitblit v1.8.0