From 136e89d589fbc90830c42cdb3c7bd7c233e1d5db Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 29 十一月 2024 16:51:24 +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 | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 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 aae91ff..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,6 +1,6 @@ spring: profiles: - include: global, database, database-ym, database-pj, database-sp + include: global, database, database-ym, database-sp, database-test #actutor鐨剋eb绔彛 management: @@ -14,5 +14,17 @@ context-parameters: #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99 idSuffix: ${pipIrr.app.idSuffix} - #ConfigListener涓簲鐢� - #configFileNames: config-global.xml,config-demo.xml +#MQTT +mqtt: + broker: tcp://127.0.0.1:1883 + username: mqtt_yjy + password: yjy + topic: workOrder + qos: 2 + +logging: + level: + com: + dy: + pipIrrGlobal: + daoOp: trace -- Gitblit v1.8.0