From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ccef0eb..e6496fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,9 +4,6 @@
session-timeout: 30
tomcat.max-threads: 0
tomcat.uri-encoding: UTF-8
- jsp-servlet:
- init-parameters:
- development: true
spring:
thymeleaf:
@@ -53,9 +50,9 @@
password: guest
channelCacheSize: 10
redis:
- host: 47.100.8.247
+ host: r-bp1672d21a422a14pd.redis.rds.aliyuncs.com
port: 6379
- password: moral_2018
+ password: KtElFcI1sYm9NP3
database: 1
timeout: 5000
pool:
@@ -65,6 +62,7 @@
min-idle: 0
+
# data:
# mongodb:
# uri: mongodb://47.96.171.62:27017/monitor
--
Gitblit v1.8.0