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 | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6967306..e6496fa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,6 @@
+
server:
- port: 8001
+ port: 8080
session-timeout: 30
tomcat.max-threads: 0
tomcat.uri-encoding: UTF-8
@@ -8,15 +9,17 @@
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
+ #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
@@ -28,6 +31,7 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
+ keepAlive: true
# ������PSCache������������������������������PSCache���������
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
@@ -45,14 +49,12 @@
username: guest
password: guest
channelCacheSize: 10
-
-
redis:
- host: 47.96.19.115
+ host: r-bp1672d21a422a14pd.redis.rds.aliyuncs.com
port: 6379
- password: redis_pass
- database: 0
- timeout: 0
+ password: KtElFcI1sYm9NP3
+ database: 1
+ timeout: 5000
pool:
max-active: 8
max-wait: -1
@@ -60,9 +62,10 @@
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 +74,8 @@
spring.profiles: default
moral.security.jwt:
- tokenExpirationTime: 15 # Number of minutes
+ tokenExpirationTime: 129600 # 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