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 |   84 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ca4953f..f1f5015 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -2,8 +2,7 @@
   port: 9010
 bak:
   url: 220.158.10.151
-img:
-  url: d:/datagovernance/file/activiti/
+
 baks:
   url: jdbc:mysql://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
   username: root
@@ -12,15 +11,36 @@
 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!
-    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: 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: true
+    database-schema-update: flase
 
   thymeleaf:
     cache: false
@@ -44,6 +64,44 @@
     db-config:
       column-underline: true
 
+redis:
+  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:
+  url: http://180.169.94.250:9107
+
+user:
+  url: http://180.169.94.250:9107
+
+xxljob:
+  local: http://180.169.94.250:9010
+  url: http://180.169.94.250:6890
+  bak:
+xxl:
+  job:
+    accessToken:
+    executor:
+      ip:
+      port: 9909
+      logpath: /data/applogs/xxl-job/jobhandler
+      logretentiondays: 1
+      appname: assemble
+    admin:
+      addresses: http://192.168.2.68:8090/xxl-job-admin
+
+
 master:
   unbigdata:
     db:
@@ -55,4 +113,12 @@
       username: masterdata
       password: md123!
   bigdata:
-    db:hbase?
\ No newline at end of file
+    db:hbase?
+
+
+pool:
+  coresize: 5
+  coefficient: 20
+  timeout: 3000000
+  aes: false
+  aesurl: http://180.169.94.250:9107
\ No newline at end of file

--
Gitblit v1.8.0