From dae44e71f055776501ebbb1d3524833a50ad439a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:34: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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 806e330..745e1ae 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,6 +1,8 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
+ main:
+ allow-circular-references: true
#actutor鐨剋eb绔彛
management:
@@ -17,7 +19,7 @@
#MQTT
mqtt:
broker: tcp://127.0.0.1:1883
- username: mqtt_u
+ username: mqtt_yjy
password: yjy
topic: workOrder
qos: 2
--
Gitblit v1.8.0