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-dev.yml | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 5985faa..a4d0945 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,14 +1,38 @@
server:
- port: 9010
+ port: 9999
#url: jdbc:mysql://180.169.94.250:8306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
-
+img:
+ url: D:/mdm/process
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/mdm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
username: root
password: 123456
type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ maxActive: 3
+ 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:
+ lettuce:
+ pool:
+ max-idle: 50
+ min-idle: 10
+ max-active: 100
+ max-wait: 1000
activiti:
database-schema-update: true
@@ -43,37 +67,66 @@
#activiti:
# check-process-definitions: false
redis:
- host: http://180.169.94.250
- port: 9107
+ 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
+user:
+ url: http://180.169.94.250:9107
+mq:
+ url: http://180.169.94.250:9107
rule:
url: http://180.169.94.250:9107
xxljob:
- local: http://8dxx7b.natappfree.cc
- url: http://180.169.94.250:6890
+ local: http://192.168.31.233:9010
+ url: http://192.168.31.233:6890
bak:
xxl:
job:
accessToken:
executor:
ip:
- port: 9999
+ port: 9909
logpath: /data/applogs/xxl-job/jobhandler
logretentiondays: 1
appname: assemble
admin:
- addresses: http://180.169.94.250:6890/xxl-job-admin
+ addresses: http://192.168.31.233:6890/xxl-job-admin
master:
unbigdata:
db:
host: localhost
- url: jdbc:mysql://localhost:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://localhost:3306/mdm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
type: MYSQL
port: 3306
schema: mdm
username: root
password: 123456
bigdata:
- db:hbase?
\ No newline at end of file
+ db:hbase?
+
+hbase:
+ zookeeper:
+ quorum: kimi
+ property:
+ clientPort: 2181
+
+zookeeper:
+ znode:
+ parent: /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