From 501ebd43da6372ee753d422290327e339b04abb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 39a5b8b..6967306 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,6 +5,8 @@
tomcat.uri-encoding: UTF-8
spring:
+ thymeleaf:
+ cache: false
datasource:
url: jdbc:mysql://47.96.19.115:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: root
@@ -36,6 +38,7 @@
# ������������DruidDataSource���������������
useGlobalDataSourceStat: true
+
rabbitmq:
host: 116.62.12.115
port: 5672
@@ -45,7 +48,7 @@
redis:
- host: 101.37.22.173
+ host: 47.96.19.115
port: 6379
password: redis_pass
database: 0
@@ -63,4 +66,12 @@
mybatis:
mapper-locations: classpath*:/mapper/*Mapper.xml
- type-aliases-package: com.moral.entity
\ No newline at end of file
+ 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