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 | 10 +---------
1 files changed, 1 insertions(+), 9 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 4644e2d..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,15 +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