From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/application.yml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b5a49fb..ccef0eb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,14 +13,16 @@
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 +34,7 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
+ keepAlive: true
# ������PSCache������������������������������PSCache���������
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
@@ -49,14 +52,12 @@
username: guest
password: guest
channelCacheSize: 10
-
-
redis:
host: 47.100.8.247
port: 6379
- password:
+ password: moral_2018
database: 1
- timeout: 0
+ timeout: 5000
pool:
max-active: 8
max-wait: -1
@@ -75,7 +76,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