From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b5a49fb..e6496fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,23 +4,22 @@
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.26.152:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ #url: jdbc:mysql://192.168.99.100:3306/monitor_db?characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: root
password: xOlx8z9L7Pt6y9YI
+ #password: root123
#driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
# ���������������������������������������������������������������������
# ���������������������������������
- initialSize: 1
- minIdle: 3
+ initialSize: 10
+ minIdle: 10
maxActive: 20
# ���������������������������������������
maxWait: 60000
@@ -32,6 +31,7 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
+ keepAlive: true
# ������PSCache������������������������������PSCache���������
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
@@ -49,19 +49,18 @@
username: guest
password: guest
channelCacheSize: 10
-
-
redis:
- host: 47.100.8.247
+ host: r-bp1672d21a422a14pd.redis.rds.aliyuncs.com
port: 6379
- password:
+ password: KtElFcI1sYm9NP3
database: 1
- timeout: 0
+ timeout: 5000
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
+
# data:
@@ -75,7 +74,7 @@
spring.profiles: default
moral.security.jwt:
- tokenExpirationTime: 5 # Number of minutes
+ tokenExpirationTime: 129600 # Number of minutes
refreshTokenExpTime: 60 # Minutes
tokenIssuer: http://monitor.7drlb.com
tokenSigningKey: xm9EV6Hy5RAFL8EEACIDAwQus
--
Gitblit v1.8.0