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 | 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