From 487bed3eba27a1f6621c43b7fab5c82468fa2bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:26:44 +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 |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..de2c315 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
 
 #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