From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:58:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
index 5cb2f94..1b70c66 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
@@ -1,25 +1,6 @@
spring:
application:
name: property
- kafka:
- bootstrap-servers: 182.151.37.143:9092 #kafka地址
- consumer:
- group-id: order-consumer
- key-deserializer: org.apache.kafka.common.serialization.StringDeserializer #kafkaTemplate.send()方法参数类型
- value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
- auto-offset-reset: earliest
- security:
- protocol: PLAINTEXT
- producer:
- batch-size: 16384
- buffer-memory: 33554432
- retries: 0
- key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
- value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
- properties:
- linger.ms: 1
- security:
- protocol: PLAINTEXT
cloud:
config:
discovery:
@@ -39,7 +20,6 @@
client:
service-url:
defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
-
#实体加密、解密、字段脱敏拦截设置
domain:
@@ -62,9 +42,7 @@
tags:
application: property
-# kafka自定义消息发送配置
-kafka:
- topic:
- kafka-demo-topic: Task_Info
- kafka-demo-key: order-key
- autoCreate: false
\ No newline at end of file
+#从一键报警设备websocket订阅时间消息配置
+websocket:
+ uri: ws://182.151.37.143:8086/status
+ ip: 182.151.37.143
\ No newline at end of file
--
Gitblit v1.7.1