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/MultiDataSourceTransactionFactory.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
index d1363eb..e1caea4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/MultiDataSourceTransactionFactory.java
@@ -6,9 +6,14 @@
import javax.sql.DataSource;
+/**
+ * 鍦ㄦ暟鎹簱杩炴帴浼氳瘽鍚姩鍚庯紝鐢辨湰浜嬪姟宸ュ巶浜х敓鍏蜂綋浜嬪姟瀵硅薄锛�
+ * 鐢变簨鍔″璞″畬鎴愭暟鎹簱琛ㄧ殑浜嬪姟鎿嶄綔銆�
+ */
public class MultiDataSourceTransactionFactory extends SpringManagedTransactionFactory {
@Override
public Transaction newTransaction(DataSource multiDataSource, TransactionIsolationLevel level, boolean autoCommit) {
- return new MultiDataSourceTransaction(multiDataSource);
+ Transaction transaction = new MultiDataSourceTransaction(multiDataSource, autoCommit);
+ return transaction ;
}
}
\ No newline at end of file
--
Gitblit v1.8.0