fix(测试接口)

muyu-auth/pom.xml

@@ -52,6 +52,11 @@
             <artifactId>muyu-common-security</artifactId>
         </dependency>
 
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

muyu-common/muyu-common-cache/pom.xml

@@ -28,5 +28,10 @@
             <artifactId>muyu-data-source-common</artifactId>
             <version>3.6.3</version>
         </dependency>
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 </project>

muyu-common/muyu-common-core/pom.xml

@@ -35,6 +35,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
+
+
         <!-- Spring Web -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -136,6 +138,11 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

muyu-common/muyu-common-data-standard/pom.xml

@@ -24,5 +24,10 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 </project>

muyu-common/muyu-common-datascope/pom.xml

@@ -23,5 +23,10 @@
             <artifactId>muyu-common-security</artifactId>
         </dependency>
 
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 </project>

muyu-common/muyu-common-datasource/pom.xml

@@ -31,5 +31,10 @@
             <version>${dynamic-ds.version}</version>
         </dependency>
 
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 </project>

muyu-gateway/pom.xml

@@ -88,6 +88,11 @@
             <version>${swagger.fox.version}</version>
         </dependency>
 
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

muyu-modules/muyu-data-source/muyu-data-source-clinet/pom.xml

@@ -51,5 +51,10 @@
             <artifactId>muyu-common-method</artifactId>
             <version>3.6.3</version>
         </dependency>
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
     </dependencies>
 </project>

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
  */
+    }
     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);
+        }
     }
 
     /**

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;
+    }
+
     /**
     * 查询构造器
     */

muyu-modules/muyu-data-source/muyu-data-source-server/pom.xml

@@ -88,7 +88,11 @@
             <version>1.2.20</version>
             <scope>compile</scope>
         </dependency>
-
+        <!-- Zipkin 客户端 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
 
     </dependencies>
 

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<DataSourceMapper, DataSou
     @Override
     public Result synchronization(DataSource dataSource) {
         AssetStructure assetStructure = new AssetStructure();
-
         String user=dataSource.getDatabaseUserName();
         String password=dataSource.getDatabaseUserPassword();
         String jdbcDriver="com.mysql.cj.jdbc.Driver";

muyu-modules/muyu-rule/muyu-rule-server/src/main/java/com/muyu/rule/controller/EngineMaintenanceController.java

@@ -148,4 +148,6 @@ public class EngineMaintenanceController extends BaseController
     public Result<String> statusOnOff(@RequestBody Ruleengine ruleengine){
         return engineMaintenanceService.statusOnOff(ruleengine);
     }
+
+
 }

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<EngineMaintenanceM
             boolean success = task.call();
 
             if (success) {
-                return Result.success("编译成功");
+                return null;
-            } else {
-                return Result.error("编译失败");
             }
 
         } catch (Exception e) {
             Result.error(e.getMessage());
         }
-        return Result.error("编译失败");
+        return null;
     }
 
     @Override