From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6967306..b5a49fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,18 @@
+
server:
- port: 8001
+ port: 8080
session-timeout: 30
tomcat.max-threads: 0
tomcat.uri-encoding: UTF-8
+ jsp-servlet:
+ init-parameters:
+ development: true
spring:
thymeleaf:
cache: false
datasource:
- url: jdbc:mysql://47.96.19.115:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ url: jdbc:mysql://47.96.26.152:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: root
password: xOlx8z9L7Pt6y9YI
#driver-class-name: com.mysql.cj.jdbc.Driver
@@ -48,10 +52,10 @@
redis:
- host: 47.96.19.115
+ host: 47.100.8.247
port: 6379
- password: redis_pass
- database: 0
+ password:
+ database: 1
timeout: 0
pool:
max-active: 8
@@ -60,9 +64,9 @@
min-idle: 0
- data:
- mongodb:
- uri: mongodb://47.96.171.62:27017/monitor
+# data:
+# mongodb:
+# uri: mongodb://47.96.171.62:27017/monitor
mybatis:
mapper-locations: classpath*:/mapper/*Mapper.xml
@@ -71,7 +75,8 @@
spring.profiles: default
moral.security.jwt:
- tokenExpirationTime: 15 # Number of minutes
+ tokenExpirationTime: 5 # Number of minutes
refreshTokenExpTime: 60 # Minutes
tokenIssuer: http://monitor.7drlb.com
- tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
\ No newline at end of file
+ tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
+
--
Gitblit v1.8.0