From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 26 十一月 2024 17:25:39 +0800 Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java index b319031..61ecdc1 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSource.java @@ -4,6 +4,11 @@ public class MultiDataSource extends AbstractRoutingDataSource { + /** + * 瀹炵幇澶氭暟鎹簮鎺ュ彛鐨刣etermineCurrentLookupKey鏂规硶 + * 浠ヤ緵鍏朵粬閮ㄥ垎璋冪敤锛屼互纭畾褰撳墠鎵�杩炴帴鐨勬暟鎹簱鍙婃暟鎹簮銆� + * @return + */ @Override protected Object determineCurrentLookupKey() { return DataSourceContext.get(); -- Gitblit v1.8.0