From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/security/config/JwtSettings.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/security/config/JwtSettings.java b/src/main/java/com/moral/security/config/JwtSettings.java
index bc306e8..fc96aac 100644
--- a/src/main/java/com/moral/security/config/JwtSettings.java
+++ b/src/main/java/com/moral/security/config/JwtSettings.java
@@ -4,7 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConfigurationProperties(prefix = "moral_security_jwt")
+@ConfigurationProperties(prefix = "moral.security.jwt")
 public class JwtSettings {
     /**
      * {@link JwtToken} will expire after this time.

--
Gitblit v1.8.0