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/config/JwtSettings.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/security/config/JwtSettings.java b/src/main/java/com/moral/security/config/JwtSettings.java
index 4ebf38e..fc96aac 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 com.moral.security.model.token.JwtToken} will expire after this time.
+ * {@link JwtToken} will expire after this time.
*/
private Integer tokenExpirationTime;
@@ -17,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;
--
Gitblit v1.8.0