From eb51b2364e9a3fbe806fde61fa255660a098fc8b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 24 Jun 2021 14:06:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/application-dev.yml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 3ec8fff..e8c8b6b 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -13,8 +13,10 @@
spring:
profiles:
active: dev
+ include:
+ moduleFormColumn
application:
- name: screen-manage
+ name: screen-api
redis:
host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
@@ -90,14 +92,11 @@
enable:
auto:
commit: false
- group:
- id: test
- servers: 192.168.0.191:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
- topic: test_topic
zookeeper:
- connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
+ connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
producer:
batch:
size: 4096
@@ -105,7 +104,7 @@
memory: 40960
linger: 1
retries: 0
- servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
mvc:
interceptor:
exclude:
--
Gitblit v1.8.0