From 7f5d914898c9d05942705ce7d80c0d14a8174df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:14 +0800
Subject: [PATCH] 1、common模块优化代码； 2、通信中间件优化代码，队列遍历由递归调用改为while循环，原因是队列数据量大时递归调易产生栈溢出，HashTable多线程应用时仍有线程安全问题，改为HashMap+同步锁； 3、RTU模拟器和模拟器控制服务增加report命令
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
index 860bfcc..1f7c680 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
@@ -33,24 +33,24 @@
DataSourceSingle dataSource = method.getAnnotation(DataSourceSingle.class);
if (Objects.nonNull(dataSource) && !StringUtils.isNullOrEmpty(dataSource.value())) {
- log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value());
+ //log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value());
//寮哄埗杞垚鏂规硶涓婇厤缃殑鏁版嵁婧愶紝鏇挎崲鎺塂ataSourceContext涓繚瀛樼殑鏁版嵁婧�
DataSourceContext.set(dataSource.value());
}else{
String datasourceName = SpringContextUtil.getApplicationContext().getEnvironment().getProperty("spring.datasource.names") ;
if(!StringUtils.isNullOrEmpty(datasourceName)){
- log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName);
+ //log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName);
DataSourceContext.set(datasourceName);
}else{
log.error("鏁版嵁婧愭湭鎸囧畾");
}
}
try {
- log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
+ //log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
return point.proceed();
} finally {
// 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
- log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
+ //log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
DataSourceContext.remove();
}
}
--
Gitblit v1.8.0