From 2b6cd5a6e64e00b365707468d600085259d2f069 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 16:13:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index 9041c44..228272e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,12 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test
- mqtt:
- broker: tcp://127.0.0.1:1883
- username: mqtt_u
- password: yjy
- topic: workOrder
- qos: 2
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
@@ -20,6 +14,13 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.app.idSuffix}
+#MQTT
+mqtt:
+ broker: tcp://127.0.0.1:1883
+ username: mqtt_yjy
+ password: yjy
+ topic: workOrder
+ qos: 2
logging:
level:
--
Gitblit v1.8.0