From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/resources/application-pro.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 10cd79f..8a8f6b0 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,18 +1,36 @@
server:
port: 18090
-
-
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://139.224.69.76:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
username: dsmp
password: Datacvg123!
- hikari:
- minimum-idle: 3
- max-lifetime: 30000
- connection-test-query: select 1
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ maxActive: 20
+ maxWait: 30000
+ validationQuery: select 1
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ timeBetweenEvictionRunsMillis: 60000
+ minEvictableIdleTimeMillis: 300000
+ removeAbandoned: true
+ removeAbandonedTimeout: 1800
+ logAbandoned: false
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ timeout: 500
+ password: datacvg123
+ lettuce:
+ pool:
+ max-idle: 50
+ min-idle: 10
+ max-active: 100
+ max-wait: 1000
activiti:
database-schema-update: flase
@@ -41,14 +59,27 @@
redis:
url: http://127.0.0.1:9107
+user:
+ url: http://127.0.0.1:9107
+mq:
+ url: http://127.0.0.1:9107
+
+
+todo:
+ url: http://127.0.0.1:9107
+
+notice:
+ url: http://127.0.0.1:9107
+
+antianaphy:
+ url: http://127.0.0.1:9107
rule:
url: http://127.0.0.1:9107
-
xxljob:
- local: http://127.0.0.1:9010
- url: http://127.0.0.1:6890
+ local: http://127.0.0.1:18090
+ url: http://127.0.0.1:8090
xxl:
job:
accessToken:
@@ -73,4 +104,11 @@
username: dsmp
password: Datacvg123!
bigdata:
- db:hbase?
\ No newline at end of file
+ db:hbase?
+
+pool:
+ coresize: 5
+ coefficient: 20
+ timeout: 3000000
+ aes: false
+ aesurl: http://127.0.0.1:9107
\ No newline at end of file
--
Gitblit v1.8.0