diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml
index a8ddedc..e07bce6 100644
--- a/muyu-auth/pom.xml
+++ b/muyu-auth/pom.xml
@@ -52,6 +52,11 @@
muyu-common-security
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-common/muyu-common-cache/pom.xml b/muyu-common/muyu-common-cache/pom.xml
index ab9f926..e74e9b9 100644
--- a/muyu-common/muyu-common-cache/pom.xml
+++ b/muyu-common/muyu-common-cache/pom.xml
@@ -28,5 +28,10 @@
muyu-data-source-common
3.6.3
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-common/muyu-common-core/pom.xml b/muyu-common/muyu-common-core/pom.xml
index d7ff491..283a6c9 100644
--- a/muyu-common/muyu-common-core/pom.xml
+++ b/muyu-common/muyu-common-core/pom.xml
@@ -35,6 +35,8 @@
spring-context-support
+
+
org.springframework
@@ -136,6 +138,11 @@
lombok
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-common/muyu-common-data-standard/pom.xml b/muyu-common/muyu-common-data-standard/pom.xml
index 6dfb5c5..04ed880 100644
--- a/muyu-common/muyu-common-data-standard/pom.xml
+++ b/muyu-common/muyu-common-data-standard/pom.xml
@@ -24,5 +24,10 @@
com.muyu
muyu-common-core
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-common/muyu-common-datascope/pom.xml b/muyu-common/muyu-common-datascope/pom.xml
index 079f752..0a8503a 100644
--- a/muyu-common/muyu-common-datascope/pom.xml
+++ b/muyu-common/muyu-common-datascope/pom.xml
@@ -23,5 +23,10 @@
muyu-common-security
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-common/muyu-common-datasource/pom.xml b/muyu-common/muyu-common-datasource/pom.xml
index 994cf84..b5b6c97 100644
--- a/muyu-common/muyu-common-datasource/pom.xml
+++ b/muyu-common/muyu-common-datasource/pom.xml
@@ -31,5 +31,10 @@
${dynamic-ds.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-gateway/pom.xml b/muyu-gateway/pom.xml
index 2d3ed58..1f6de4e 100644
--- a/muyu-gateway/pom.xml
+++ b/muyu-gateway/pom.xml
@@ -88,6 +88,11 @@
${swagger.fox.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-clinet/pom.xml b/muyu-modules/muyu-data-source/muyu-data-source-clinet/pom.xml
index 06dfe02..d91ab24 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-clinet/pom.xml
+++ b/muyu-modules/muyu-data-source/muyu-data-source-clinet/pom.xml
@@ -51,5 +51,10 @@
muyu-common-method
3.6.3
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-clinet/src/main/java/com/muyu/source/clinet/connection/service/ConnectionPoolManagementService.java b/muyu-modules/muyu-data-source/muyu-data-source-clinet/src/main/java/com/muyu/source/clinet/connection/service/ConnectionPoolManagementService.java
index fa65e85..a5e90fd 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-clinet/src/main/java/com/muyu/source/clinet/connection/service/ConnectionPoolManagementService.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-clinet/src/main/java/com/muyu/source/clinet/connection/service/ConnectionPoolManagementService.java
@@ -1,9 +1,12 @@
package com.muyu.source.clinet.connection.service;
+import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.muyu.data.source.domain.DataSource;
+import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component;
+import java.sql.SQLException;
import java.util.List;
import static com.muyu.source.clinet.connection.pool.ConnectionPoolContext.*;
@@ -16,6 +19,7 @@ import static com.muyu.source.clinet.connection.pool.ConnectionPoolContext.*;
* @Date 2024/5/16 19:39
*/
+@Log4j2
@Component
public class ConnectionPoolManagementService {
@@ -31,18 +35,22 @@ public class ConnectionPoolManagementService {
*/
public void createPool(DataSource dataSource){
+ /**eq* 获取
+ * @param dataSource
+ */
}
-
- /**
- * 获取
- * @param dataSource
- */
public DruidPooledConnection get(DataSource dataSource){
- return getConnection(dataSource.getAccessSourceName());
+ return get(dataSource.getKey());
}
public DruidPooledConnection get(String key){
-
+ DruidDataSource druidDataSource = getConnection(key);
+ try {
+ return druidDataSource.getConnection();
+ } catch (SQLException e) {
+ log.warn("获取连接异常:[{}] - [{}]",key,e.getMessage(),e);
+ throw new RuntimeException(e);
+ }
}
/**
@@ -50,7 +58,12 @@ public class ConnectionPoolManagementService {
*/
public void returnConnection(DruidPooledConnection connection){
-
+ try {
+ connection.close();
+ } catch (SQLException e) {
+ log.warn("获取连接异常:[{}] - [{}]",e.getMessage(),e);
+ throw new RuntimeException(e);
+ }
}
/**
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DataSource.java b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DataSource.java
index 27d36d8..e1485b6 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DataSource.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/DataSource.java
@@ -106,6 +106,10 @@ public class DataSource extends BaseEntity {
@ApiModelProperty(name = "数据库用户密码", value = "数据库用户密码")
private String databaseUserPassword;
+ public String getKey(){
+ return id + accessSourceName + dataSourceSystemName;
+ }
+
/**
* 查询构造器
*/
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/pom.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/pom.xml
index a9bd46b..e6f6c7d 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/pom.xml
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/pom.xml
@@ -88,7 +88,11 @@
1.2.20
compile
-
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+
diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
index 99d9cea..f9b040e 100644
--- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
+++ b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java
@@ -237,7 +237,6 @@ public class DataSourceServiceImpl extends ServiceImpl statusOnOff(@RequestBody Ruleengine ruleengine){
return engineMaintenanceService.statusOnOff(ruleengine);
}
+
+
}
diff --git a/muyu-modules/muyu-rule/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/EngineMaintenanceServiceImpl.java b/muyu-modules/muyu-rule/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/EngineMaintenanceServiceImpl.java
index 83217da..ffc6082 100644
--- a/muyu-modules/muyu-rule/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/EngineMaintenanceServiceImpl.java
+++ b/muyu-modules/muyu-rule/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/EngineMaintenanceServiceImpl.java
@@ -103,15 +103,13 @@ public class EngineMaintenanceServiceImpl extends ServiceImpl