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-rrs.yml | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-rrs.yml b/src/main/resources/application-rrs.yml
index c0c4835..9cfbf34 100644
--- a/src/main/resources/application-rrs.yml
+++ b/src/main/resources/application-rrs.yml
@@ -1,10 +1,12 @@
server:
port: 18090
+img:
+ url: /usr/mdm/process
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1: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://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: datacvg123!
type: com.alibaba.druid.pool.DruidDataSource
@@ -20,6 +22,17 @@
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
@@ -49,15 +62,27 @@
redis:
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
+
user:
+ url: http://127.0.0.1:9107
+
+mq:
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:
@@ -78,7 +103,7 @@
type: MYSQL
port: 3306
schema: data_admin
- url: jdbc:mysql://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: datacvg123!
bigdata:
@@ -86,4 +111,7 @@
pool:
coresize: 5
- coefficient: 20
\ No newline at end of file
+ coefficient: 20
+ timeout: 3000000
+ aes: false
+ aesurl: http://127.0.0.1:9107
\ No newline at end of file
--
Gitblit v1.8.0