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-prod.yml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 0b3829a..f1f5015 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -11,7 +11,7 @@
spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://180.169.94.250:8306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://180.169.94.250:8306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: masterdata
password: md123!
type: com.alibaba.druid.pool.DruidDataSource
@@ -27,6 +27,17 @@
removeAbandoned: true
removeAbandonedTimeout: 1800
logAbandoned: false
+ redis:
+ host: 192.168.2.68
+ 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
@@ -57,6 +68,15 @@
url: http://180.169.94.250:9107
mq:
+ url: http://180.169.94.250:9107
+
+todo:
+ url: http://180.169.94.250:9107
+
+notice:
+ url: http://180.169.94.250:9107
+
+antianaphy:
url: http://180.169.94.250:9107
rule:
@@ -99,4 +119,6 @@
pool:
coresize: 5
coefficient: 20
- timeout: 3000000
\ No newline at end of file
+ timeout: 3000000
+ aes: false
+ aesurl: http://180.169.94.250:9107
\ No newline at end of file
--
Gitblit v1.8.0