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 | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7ca9fd9..a4d0945 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,10 +1,11 @@
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
+ 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
@@ -21,6 +22,17 @@
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
@@ -36,7 +48,6 @@
db-config:
column-underline: true
logging:
- file: ./mdm.log
level:
com:
highdatas:
@@ -58,6 +69,14 @@
redis:
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:
@@ -67,20 +86,20 @@
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:
@@ -108,4 +127,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