From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b76fb92..f15aa45 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,8 +3,15 @@
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
datasource:
url: jdbc:mysql://47.96.19.115:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: root
@@ -64,4 +71,5 @@
mybatis:
mapper-locations: classpath*:/mapper/*Mapper.xml
- config-location: classpath:/mapper/mybatis-config.xml
\ No newline at end of file
+ config-location: classpath:/mapper/mybatis-config.xml
+
--
Gitblit v1.8.0