From 7374d150b7f08d4b126d3d0fde57ab55febb53dd Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期三, 05 三月 2025 09:48:24 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr --- ruoyi-admin/src/main/resources/application-druid.yml | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9980440..f466a7f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -72,8 +72,6 @@ # 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++ file: path: D:\椤圭洰鏂囦欢瀛樺偍\image - # 杞琾df鏂囦欢璺緞 - licenseUrl: D:\20892\Desktop\lims\code\center-lims-after\inspect-server\src\main\resources\lib\license.xml # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕 allowed: png,jpg,jpeg,gif @@ -97,3 +95,16 @@ custorder: http://192.168.20.47/PurchService.ashx? custorder-port: http://192.168.20.47:8008/PurchService.ashx? erp-services: http://192.168.20.47:8081 + +# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@ +mqtt: + url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p + username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚� + password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜 + timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級 + keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級 + qos: 1 # 蹇冭烦鍖呯骇鍒� + completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級 + clientId: javaPublish # clientId + subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚 + client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿� -- Gitblit v1.9.3