From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3689780..6967306 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,12 +3,7 @@
session-timeout: 30
tomcat.max-threads: 0
tomcat.uri-encoding: UTF-8
-spring.profiles: default
-moral_security_jwt:
- tokenExpirationTime: 15 # Number of minutes
- refreshTokenExpTime: 60 # Minutes
- tokenIssuer: http://monitor.7drlb.com
- tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+
spring:
thymeleaf:
cache: false
@@ -73,3 +68,10 @@
mapper-locations: classpath*:/mapper/*Mapper.xml
config-location: classpath:/mapper/mybatis-config.xml
+spring.profiles: default
+
+moral.security.jwt:
+ tokenExpirationTime: 15 # Number of minutes
+ refreshTokenExpTime: 60 # Minutes
+ tokenIssuer: http://monitor.7drlb.com
+ tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
\ No newline at end of file
--
Gitblit v1.8.0