From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml index 3fd34ef..6bfe3ba 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml @@ -72,7 +72,7 @@ pipIrr: global: - dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse + dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О mw: webPort: 8070 @@ -150,7 +150,7 @@ #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О) ym: comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send" - sp: + pj: comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send" #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃 rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive" @@ -165,8 +165,8 @@ - /wx/comRes/receive #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜 auto-statistics: - startHour: 17 #寮�濮嬪皬鏃� 0 - startMinute: 19 #寮�濮嬪垎閽� 5 + startHour: 0 #寮�濮嬪皬鏃� 0 + startMinute: 5 #寮�濮嬪垎閽� 5 #閽夐拤娑堟伅鎺ㄩ�� dingtalk: @@ -175,4 +175,12 @@ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 at-all: true - mobile: 18602657034 \ No newline at end of file + mobile: 18602657034 + +#闃�鎺у櫒鍙傛暟 +rtu: + batteryVolt: 17 + signalIntensity: + weak: 10 + ordinary: 20 +# strong: 20 \ No newline at end of file -- Gitblit v1.8.0