mirror of
https://gitee.com/san-bing/JChargePointProtocol
synced 2026-05-06 02:49:57 +08:00
Merge remote-tracking branch 'refs/remotes/public/master' into feature/YunKuaiChongV160
# Conflicts: # jcpp-app-bootstrap/src/test/resources/app-service-test.properties
This commit is contained in:
@@ -71,7 +71,7 @@ service:
|
||||
topic: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_TOPIC:protocol_uplink}"
|
||||
jcpp-partition: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_JCPP_PARTITION:true}" # 是否利用JCPP的分片框架
|
||||
# 以下配置只有在service.type为protocol时且jcpp-partition为false时才生效
|
||||
bootstrap-servers: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_SERVERS:10.102.12.102:9092}"
|
||||
bootstrap-servers: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_SERVERS:kafka:9092}"
|
||||
acks: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_ACKS:1}"
|
||||
# # 可选 protobuf(推荐)、json
|
||||
encoder: "${PROTOCOLS_YUNKUAICHONGV150_FORWARD_KAFKA_ENCODER:protobuf}"
|
||||
@@ -121,7 +121,7 @@ service:
|
||||
|
||||
# 应用程序服务注册中心配置
|
||||
zk:
|
||||
enabled: "${ZOOKEEPER_ENABLED:true}"
|
||||
enabled: "${ZOOKEEPER_ENABLED:false}"
|
||||
url: "${ZOOKEEPER_URL:zookeeper:2181}"
|
||||
retry-interval-ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
|
||||
connection-timeout-ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
|
||||
|
||||
Reference in New Issue
Block a user