From 56e6e0bf18c39a933aec78762b636fdf2efa8d68 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 08 十二月 2025 17:59:24 +0800
Subject: [PATCH] 外购成品检验报告生成功能
---
ruoyi-admin-ztns/src/main/resources/application-druid.yml | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin-ztns/src/main/resources/application-druid.yml b/ruoyi-admin-ztns/src/main/resources/application-druid.yml
index fef6444..c79dc4e 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-druid.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-druid.yml
@@ -78,7 +78,7 @@
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
+ min-idle: 2
# 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
max-idle: 8
# 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
@@ -150,7 +150,7 @@
# 浼佷笟寰俊閫氱煡
wechat:
# 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
+ examiningUrl: # https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
ifs:
contract: ZTNS
@@ -160,26 +160,51 @@
custorder-port: http://192.168.20.47:8008/PurchService.ashx?
erp-services: http://192.168.20.47:8081
+mes:
+ ztns:
+ ip: http://10.16.173.36
+ user: lims
+ password: qCzOMJlqE8TYOHDWGva/Tw==
+
# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
mqtt:
- - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: 2455220 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: 108300 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ - url: tcp://192.168.21.97:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
qos: 1 # 蹇冭烦鍖呯骇鍒�
completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: ztns01 # clientId
- subscribe: /ztt/v3/2455220/publish # 璁㈤槄涓婚
- client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
- - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
- username: 2455221 # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
- password: 108295 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ clientId: ztns_gc_scl_108303_dev # clientId,杩囩▼璇曢獙瀹や几闀跨巼璁惧
+ subscribe: /aiot/5447dad0-c6b9-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://192.168.21.97:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
qos: 1 # 蹇冭烦鍖呯骇鍒�
completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
- clientId: ztns02 # clientId
- subscribe: /ztt/v3/2455221/publish # 璁㈤槄涓婚
- client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
-
+ clientId: ztns_gc_dz_108301_dev # clientId
+ subscribe: /aiot/51eaff10-c6b9-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://192.168.21.97:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: ztns_cp_scl_108295_dev # clientId,鎴愬搧璇曢獙瀹や几闀跨巼璁惧
+ subscribe: /aiot/a4b27900-c6b7-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
+ - url: tcp://192.168.21.97:1883 # 鏈嶅姟鍣╥p
+ username: admin # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: public # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: ztns_cp_dz_108300_dev # clientId锛屾垚鍝佽瘯楠屽鐢甸樆
+ subscribe: /aiot/4e40cdb0-c6b7-11f0-8b13-c14e8310d70b # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
--
Gitblit v1.9.3