feat: 引擎维护回显操作

muyu-auth/pom.xml

@@ -13,7 +13,7 @@
     <description>
         muyu-auth认证授权中心
     </description>
-
+    <packaging>jar</packaging>
     <dependencies>
 
         <!-- SpringCloud Alibaba Nacos -->

muyu-auth/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9200
+  port: 9100
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java

@@ -20,4 +20,9 @@ public class ServiceNameConstants {
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "muyu-file";
+
+    /**
+     * 数据源管理
+     */
+    public static final String DATA_SOURCE_SERVICE = "muyu-data-source";
 }

muyu-common/muyu-common-system/pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>muyu-common-system</artifactId>
-
+    <packaging>jar</packaging>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>

muyu-gateway/pom.xml

@@ -13,6 +13,7 @@
     <description>
         muyu-gateway网关模块
     </description>
+    <packaging>jar</packaging>
 
     <dependencies>
 

muyu-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 18080
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -29,12 +30,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 115.159.81.159:8718
+        dashboard: 43.142.149.172:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 115.159.81.159:8848
+            server-addr: 43.142.149.172:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-data-source</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-data-source-client</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-data-source-remote</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-data-source-common</artifactId>
+            <version>3.6.3</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientConfig.java

@@ -0,0 +1,17 @@
+package com.muyu.data.source.client.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据源配置 DataSourceConfig
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 20:56
+ */
+@ComponentScan
+@Import(value = {DataSourceClientRunner.class})
+public class DataSourceClientConfig {
+
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientRunner.java

@@ -0,0 +1,35 @@
+package com.muyu.data.source.client.config;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.data.source.domain.DataSource;
+import com.muyu.data.source.domain.req.DataSourceQueryReq;
+import com.muyu.data.source.remote.RemoteDataManagerService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+
+import java.util.List;
+
+/**
+ * 初始化加载 DataSourceClientRunner
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 21:00
+ */
+@Log4j2
+public class DataSourceClientRunner implements ApplicationRunner {
+    @Autowired
+    private RemoteDataManagerService remoteDataManagerService;
+    /**
+     *
+     * @param args
+     * @throws Exception
+     */
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        Result<List<DataSource>> dataSourceList = remoteDataManagerService.postList(new DataSourceQueryReq());
+        log.info(dataSourceList);
+    }
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BaseConfig.java

@@ -0,0 +1,24 @@
+package com.muyu.data.source.client.pool;
+
+/**
+ * 基础定值
+ *
+ * @author WangLei
+ * @Date 2024/4/29 029 14:30
+ */
+
+public class BaseConfig {
+    /**
+     * mysql连接前缀
+     */
+
+    public static final String MYSQLJDBCPRO = "jdbc:mysql://";
+
+    public static void driver(String driverName){
+        try {
+            Class.forName(driverName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BasePool.java

@@ -0,0 +1,41 @@
+package com.muyu.data.source.client.pool;
+
+/**
+ * 提供了一个连接池的准则
+ *
+ * @author WangLei
+ * @Date 2024/4/29 029 14:41
+ */
+public interface BasePool<T> {
+    /**
+     * 初始化
+     */
+    public void init();
+
+    /**
+     * 获取连接
+     */
+
+    public T getConn();
+
+    /**
+     * 归还连接
+     * @param conn
+     */
+
+    public void reaplase(T conn);
+
+    /**
+     * 创建连接
+     * @return
+     */
+
+    public T creatConnection();
+
+
+    /**
+     * 关闭连接
+     */
+    public void closeConn();
+
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlConnException.java

@@ -0,0 +1,13 @@
+package com.muyu.data.source.client.pool;
+
+/**
+ * Mysql超时异常
+ *
+ * @author WangLei
+ * @Date 2024/4/29 029 15:17
+ */
+public class MysqlConnException extends RuntimeException{
+    public MysqlConnException(String message) {
+        super(message);
+    }
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlPool.java

@@ -0,0 +1,191 @@
+package com.muyu.data.source.client.pool;
+
+import com.muyu.data.source.client.pool.config.MysqlPoolConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Mysql的连接池信息
+ *
+ * @author WangLei
+ * @Date 2024/4/29 029 14:36
+ */
+@Component
+public class MysqlPool implements BasePool<Connection> {
+
+
+
+    /**
+     * 打印日志
+     */
+    private static final Logger log = LoggerFactory.getLogger(MysqlPool.class);
+
+    /**
+     * 等待队列  基础队列
+     */
+    private Queue<Connection> mysqlConnQueue = null;
+
+    /**
+     * 活动队列
+     */
+    private Queue<Connection> activeMysqlQueue = null;
+
+    /**
+     * 记录队列的连接总数
+     */
+    private AtomicInteger count = new AtomicInteger();
+
+    public MysqlPoolConfig mysqlPoolConfig;
+
+    /**
+     * 进行实例化连接池 并且加载驱动
+     */
+    public MysqlPool(MysqlPoolConfig mysqlPoolConfig) {
+        log.info("Mysql连接池实例化完成");
+        this.mysqlPoolConfig = mysqlPoolConfig;
+        BaseConfig.driver(this.mysqlPoolConfig.getDriverName());
+    }
+
+    /**
+     * 进行初始化连接池
+     */
+    @Override
+    public void init() {
+        int maxTotal = Integer.parseInt(this.mysqlPoolConfig.getMaximumQuantity());
+        int initTotal = Integer.parseInt(this.mysqlPoolConfig.getInitialQuantity());
+        this.mysqlConnQueue = new LinkedBlockingQueue<>();
+        this.activeMysqlQueue = new LinkedBlockingQueue<>();
+        for (int i = 0; i < initTotal; i++) {
+            this.mysqlConnQueue.offer(creatConnection());
+            count.incrementAndGet();
+        }
+        log.info("Mysql连接池初始化完成");
+    }
+
+    @Override
+    public Connection getConn() {
+        long startTime = System.currentTimeMillis();
+        //从空闲队列当中取出放入活动队列当中
+        Connection conn = this.mysqlConnQueue.poll();
+        if (conn == null) {
+            this.activeMysqlQueue.offer(conn);
+            return conn;
+        }
+
+        //如果当前连接数小于最大连接数进行创建新的连接
+        Integer maximumQuantity = Integer.valueOf(this.mysqlPoolConfig.getMaximumQuantity());
+        if (count.get() <maximumQuantity) {
+            Connection connection = creatConnection();
+            this.activeMysqlQueue.offer(connection);
+            count.incrementAndGet();
+            return connection;
+        }
+
+        if (System.currentTimeMillis() - startTime > this.mysqlPoolConfig.getMaximumTime()) {
+            throw new MysqlConnException("连接超时");
+        }
+
+
+        return null;
+    }
+
+    /**
+     * 归还连接
+     *
+     * @param conn
+     */
+    @Override
+    public void reaplase(Connection conn) {
+        //删除活动队列当中的连接
+        if (this.activeMysqlQueue.remove(conn)) {
+            //把这个连接放入空闲队列当中
+            this.mysqlConnQueue.offer(conn);
+        }
+    }
+
+
+    /**
+     * 获取mysql连接信息
+     */
+    @Override
+    public Connection creatConnection() {
+        String url = this.mysqlPoolConfig.getUrl();
+        String userName = this.mysqlPoolConfig.getDatabaseUserName();
+        String password = this.mysqlPoolConfig.getDatabaseUserPassword();
+        Connection connection = null;
+        try {
+            connection = DriverManager.getConnection(url, userName, password);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        log.info("初始化了一个数据库连接：{ip: " + this.mysqlPoolConfig.getHostAddress() + " port: " + this.mysqlPoolConfig.getHostPort() + " databaseName: " + this.mysqlPoolConfig.getDatabaseName() + "}");
+        return connection;
+    }
+
+    /**
+     * 关闭连接
+     */
+    @Override
+    public void closeConn() {
+        closeBaseConn();
+        closeActiveConn();
+    }
+
+    /**
+     * 关闭空闲连接
+     */
+    public void closeBaseConn() {
+        Connection poll = this.mysqlConnQueue.poll();
+        if (poll != null) {
+            try {
+                poll.close();
+            } catch (SQLException e) {
+                e.printStackTrace();
+                try{
+                    if (!poll.isClosed()) {
+                        this.mysqlConnQueue.offer(poll);
+                    }
+
+                }catch (Exception e1){
+                    e1.printStackTrace();
+                }
+            } finally {
+                closeBaseConn();
+            }
+
+        }
+    }
+
+    public void closeActiveConn() {
+        Connection poll = this.activeMysqlQueue.poll();
+        if (poll != null) {
+            try {
+                poll.close();
+            } catch (SQLException e) {
+                e.printStackTrace();
+                try{
+                    if (!poll.isClosed()) {
+                        this.activeMysqlQueue.offer(poll);
+                    }
+
+                }catch (Exception e1){
+                    e1.printStackTrace();
+                }
+            } finally {
+                closeBaseConn();
+            }
+
+        }
+
+    }
+
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/config/MysqlPoolConfig.java

@@ -0,0 +1,134 @@
+package com.muyu.data.source.client.pool.config;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.data.source.client.pool.BaseConfig;
+import com.muyu.data.source.domain.SysDataSource;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * mysql连接池配置
+ *
+ * @author WangLei
+ * @Date 2024/4/29 029 14:24
+ */
+@Data
+@Builder
+public class MysqlPoolConfig extends BaseConfig {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 数据管理id */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "数据管理id", value = "数据管理id")
+    private Long id;
+
+    /** 接入源名称 */
+    @Excel(name = "接入源名称")
+    @ApiModelProperty(name = "接入源名称", value = "接入源名称")
+    private String accessSourceName;
+
+    /** 数据来源系统名称 */
+    @Excel(name = "数据来源系统名称")
+    @ApiModelProperty(name = "数据来源系统名称", value = "数据来源系统名称")
+    private String dataSourceSystemName;
+
+    /** 主机地址 */
+    @Excel(name = "主机地址")
+    @ApiModelProperty(name = "主机地址", value = "主机地址")
+    private String hostAddress;
+
+    /** 主机端口 */
+    @Excel(name = "主机端口")
+    @ApiModelProperty(name = "主机端口", value = "主机端口")
+    private String hostPort;
+
+    /** 数据连接类型ID */
+    @Excel(name = "数据连接类型ID")
+    @ApiModelProperty(name = "数据连接类型ID", value = "数据连接类型ID")
+    private Long dataAccessTypeId;
+
+    /** 数据库名称 */
+    @Excel(name = "数据库名称")
+    @ApiModelProperty(name = "数据库名称", value = "数据库名称")
+    private String databaseName;
+
+    /** 数据连接参数 */
+    @Excel(name = "数据连接参数")
+    @ApiModelProperty(name = "数据连接参数", value = "数据连接参数")
+    private String dataConnectionParameter;
+
+    /** 初始连接数量 */
+    @Excel(name = "初始连接数量")
+    @ApiModelProperty(name = "初始连接数量", value = "初始连接数量")
+    private String initialQuantity;
+
+    /** 最大连接数量 */
+    @Excel(name = "最大连接数量")
+    @ApiModelProperty(name = "最大连接数量", value = "最大连接数量")
+    private String maximumQuantity;
+
+    /** 最大等待时间 */
+    @Excel(name = "最大等待时间")
+    @ApiModelProperty(name = "最大等待时间", value = "最大等待时间")
+    private Long maximumTime;
+
+    /** 最大等待次数 */
+    @Excel(name = "最大等待次数")
+    @ApiModelProperty(name = "最大等待次数", value = "最大等待次数")
+    private String maximumFrequency;
+
+    /** 数据库用户名 */
+    @Excel(name = "数据库用户名")
+    @ApiModelProperty(name = "数据库用户名", value = "数据库用户名")
+    private String databaseUserName;
+
+    /** 数据库用户密码 */
+    @Excel(name = "数据库用户密码")
+    @ApiModelProperty(name = "数据库用户密码", value = "数据库用户密码")
+    private String databaseUserPassword;
+
+    /** 驱动名称 */
+    @Excel(name = "驱动名称")
+    @ApiModelProperty(name = "驱动名称", value = "驱动名称")
+    private String driverName;
+
+    public static MysqlPoolConfig buildConfig(SysDataSource sysDataSource) {
+        return MysqlPoolConfig.builder()
+                .id(sysDataSource.getId())
+                .initialQuantity(sysDataSource.getInitialQuantity())
+                .maximumFrequency(sysDataSource.getMaximumFrequency())
+                .maximumQuantity(sysDataSource.getMaximumQuantity())
+                .driverName(sysDataSource.getDriverName())
+                .hostAddress(sysDataSource.getHostAddress())
+                .hostPort(sysDataSource.getHostPort())
+                .databaseName(sysDataSource.getDatabaseName())
+                .dataConnectionParameter(sysDataSource.getDataConnectionParameter())
+                .databaseUserName(sysDataSource.getDatabaseUserName())
+                .databaseUserPassword(sysDataSource.getDatabaseUserPassword())
+                .build();
+    }
+
+
+    /**
+     * 获取数据库连接
+     */
+    public String getUrl() {
+        StringBuilder urlSb = new StringBuilder(BaseConfig.MYSQLJDBCPRO);
+        urlSb.append(this.hostAddress);
+        urlSb.append(":");
+        urlSb.append(this.hostPort);
+        urlSb.append("/");
+        urlSb.append(this.databaseName);
+        urlSb.append("?");
+        urlSb.append(this.dataConnectionParameter);
+        return urlSb.toString();
+    };
+
+
+
+}

muyu-modules/muyu-data-source/muyu-data-source-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.muyu.data.source.client.config.DataSourceClientConfig

muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/AssetStructure.java

@@ -51,7 +51,7 @@ public class AssetStructure{
     private String hostAddress;
 
     /**主机端口*/
-    private Integer hostPort;
+    private String hostPort;
 
     /**数据库用户名*/
     private String databaseUserName;

muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/SysDataSource.java

@@ -0,0 +1,99 @@
+package com.muyu.data.source.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * SysDataSource
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 22:38
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysDataSource {
+    private static final long serialVersionUID = 1L;
+
+    /** 数据管理id */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "数据管理id", value = "数据管理id")
+    private Long id;
+
+    /** 接入源名称 */
+    @Excel(name = "接入源名称")
+    @ApiModelProperty(name = "接入源名称", value = "接入源名称")
+    private String accessSourceName;
+
+    /** 数据来源系统名称 */
+    @Excel(name = "数据来源系统名称")
+    @ApiModelProperty(name = "数据来源系统名称", value = "数据来源系统名称")
+    private String dataSourceSystemName;
+
+    /** 主机地址 */
+    @Excel(name = "主机地址")
+    @ApiModelProperty(name = "主机地址", value = "主机地址")
+    private String hostAddress;
+
+    /** 主机端口 */
+    @Excel(name = "主机端口")
+    @ApiModelProperty(name = "主机端口", value = "主机端口")
+    private String hostPort;
+
+    /** 数据连接类型ID */
+    @Excel(name = "数据连接类型ID")
+    @ApiModelProperty(name = "数据连接类型ID", value = "数据连接类型ID")
+    private Long dataAccessTypeId;
+
+    /** 数据库名称 */
+    @Excel(name = "数据库名称")
+    @ApiModelProperty(name = "数据库名称", value = "数据库名称")
+    private String databaseName;
+
+    /** 数据连接参数 */
+    @Excel(name = "数据连接参数")
+    @ApiModelProperty(name = "数据连接参数", value = "数据连接参数")
+    private String dataConnectionParameter;
+
+    /** 初始连接数量 */
+    @Excel(name = "初始连接数量")
+    @ApiModelProperty(name = "初始连接数量", value = "初始连接数量")
+    private String initialQuantity;
+
+    /** 最大连接数量 */
+    @Excel(name = "最大连接数量")
+    @ApiModelProperty(name = "最大连接数量", value = "最大连接数量")
+    private String maximumQuantity;
+
+    /** 最大等待时间 */
+    @Excel(name = "最大等待时间")
+    @ApiModelProperty(name = "最大等待时间", value = "最大等待时间")
+    private Long maximumTime;
+
+    /** 驱动名*/
+    @Excel(name = "驱动名")
+    @ApiModelProperty(name = "驱动名", value = "驱动名")
+    private String driverName;
+
+    /** 最大等待次数 */
+    @Excel(name = "最大等待次数")
+    @ApiModelProperty(name = "最大等待次数", value = "最大等待次数")
+    private String maximumFrequency;
+
+    /** 数据库用户名 */
+    @Excel(name = "数据库用户名")
+    @ApiModelProperty(name = "数据库用户名", value = "数据库用户名")
+    private String databaseUserName;
+
+    /** 数据库用户密码 */
+    @Excel(name = "数据库用户密码")
+    @ApiModelProperty(name = "数据库用户密码", value = "数据库用户密码")
+    private String databaseUserPassword;
+}

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

@@ -16,5 +16,25 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <dependencies>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-data-source-common</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-core</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
+    </dependencies>
 </project>

muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/RemoteDataManagerService.java

@@ -0,0 +1,31 @@
+package com.muyu.data.source.remote;
+
+import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.data.source.domain.DataSource;
+import com.muyu.data.source.domain.req.DataSourceQueryReq;
+import com.muyu.data.source.remote.factory.DataManagerFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * 数据源管理远程调用 RemoteDataManagerService
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 17:23
+ */
+@FeignClient(
+        contextId = "RemoteSys",
+        value = ServiceNameConstants.DATA_SOURCE_SERVICE,
+        fallbackFactory = DataManagerFactory.class,
+        path = "/source"
+)
+
+public interface RemoteDataManagerService {
+    @PostMapping("/DataSourceList")
+    public Result<List<DataSource>> postList(DataSourceQueryReq dataSourceQueryReq);
+}

muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/factory/DataManagerFactory.java

@@ -0,0 +1,28 @@
+package com.muyu.data.source.remote.factory;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.data.source.domain.DataSource;
+import com.muyu.data.source.domain.req.DataSourceQueryReq;
+import com.muyu.data.source.remote.RemoteDataManagerService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+import java.util.List;
+
+/**
+ * 数据源熔断 DataManagerFactory
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 17:32
+ */
+public class DataManagerFactory implements FallbackFactory<RemoteDataManagerService> {
+    @Override
+    public RemoteDataManagerService create(Throwable cause) {
+        return new RemoteDataManagerService() {
+            @Override
+            public Result<List<DataSource>> postList(DataSourceQueryReq dataSourceQueryReq) {
+                return Result.error(cause.getMessage());
+            }
+        };
+    }
+}

muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.muyu.data.source.remote.factory.DataManagerFactory

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/AssetAuthInfoController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 资产授权Controller层
  *
  * @ClassName AssetAuthInfoController
- * @Author AnNan.Wang
+ * @Author DekangLiu
  * @Date 2024/5/5 15:38
  */
 

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java

@@ -43,6 +43,14 @@ public class DataSourceController extends BaseController {
         List<DataSource> list = dataSourceService.list(DataSource.queryBuild(dataSourceQueryReq));
         return getDataTable(list);
     }
+    /**
+     * post请求查询数据源列表
+     */
+    @PostMapping("/DataSourceList")
+    public Result<List<DataSource>> postList(DataSourceQueryReq dataSourceQueryReq) {
+        List<DataSource> list = dataSourceService.list(DataSource.queryBuild(dataSourceQueryReq));
+        return Result.success(list);
+    }
 
     /**
      * 导出数据源列表
@@ -198,4 +206,9 @@ public class DataSourceController extends BaseController {
     public Result updateDatabaseTable(@RequestBody DataBaseTable dataBaseTable){
         return dataSourceService.updateDatabaseTable(dataBaseTable);
     }
+
+    @PostMapping("/findDataSourceByDataBaseId")
+    public Result findDataSourceByDataBaseId(@RequestParam Integer id){
+        return dataSourceService.findDataSourceByDataBaseId(id);
+    }
 }

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/AssetAuthInfoMapper.java

@@ -6,7 +6,7 @@ import com.muyu.data.source.domain.AssetAuthInfo;
 /**
  * AssetAuthInfo 数据权限Mapper层接口
  *
- * @author AnNan.Wang
+ * @author DekangLiu
  * @ClassName: AssetAuthInfoMapper
  * @createTime: 2024/5/5 18:30
  */

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java

@@ -50,6 +50,8 @@ public interface DataSourceMapper extends BaseMapper<DataSource> {
 
     Integer updateDatabaseTable(@Param("dataBaseTable") DataBaseTable dataBaseTable);
 
+    DataBaseTable findDataBaseTableId(@Param("id") Integer id);
+
 //    AssetStructure findDatabaseName(DataSource dataSource);
 
 //    void updateAssets(@Param("assetStructure") AssetStructure assetStructure, @Param("id") Long id);

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/AssetAuthInfoService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * AssetAuthInfo 资产授权 Service层接口
  *
- * @author AnNan.Wang
+ * @author DekangLiu
  * @ClassName: AssetAuthInfoService
  * @createTime: 2024/5/5 15:40
  */

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java

@@ -46,4 +46,6 @@ public interface DataSourceService extends IService<DataSource> {
     Result<List<DatabaseTableInformation>> dataBaseTableInformation();
 
     Result updateDatabaseTable(DataBaseTable dataBaseTable);
+
+    Result findDataSourceByDataBaseId(Integer id);
 }

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/AssetAuthInfoServiceImpl.java

@@ -18,7 +18,7 @@ import java.util.Objects;
  * AssetAuthInfo 资产授权Impl实现层
  *
  * @ClassName AssetAuthInfoServiceImpl
- * @Author AnNan.Wang
+ * @Author DekangLiu
  * @Date 2024/5/5 18:29
  */
 

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/DataSourceServiceImpl.java

@@ -168,6 +168,10 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
             assetStructure.setDatabaseTableName(rsmd.getTableName(1));
             assetStructure.setDataVolume(rsmd.getColumnDisplaySize(1));
             assetStructure.setDataQuantity(rsmd.getColumnDisplaySize(1));
+            assetStructure.setDatabaseUserName(dataSource.getDatabaseUserName());
+            assetStructure.setDatabaseUserPassword(dataSource.getDatabaseUserPassword());
+            assetStructure.setHostAddress(dataSource.getHostAddress());
+            assetStructure.setHostPort(dataSource.getHostPort());
             if (list.size()==0){
                 return Result.error("数据库没有内容");
             }
@@ -322,5 +326,41 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
         return Result.success("修改成功");
     }
 
+    @Override
+    public Result findDataSourceByDataBaseId(Integer id) {
+        DataBaseTable dataBaseTable=dataSourceMapper.findDataBaseTableId(id);
+        DatabaseTableInformation databaseTableInformation=dataSourceMapper.findDataBaseTableBy(Long.valueOf(dataBaseTable.getInformationId()));
+        AssetStructure assetStructure=dataSourceMapper.findAssetsById(databaseTableInformation.getStructureId());
+
+        //连接驱动
+        String user=assetStructure.getDatabaseUserName();
+        String password=assetStructure.getDatabaseUserPassword();
+        String jdbcDriver="com.mysql.cj.jdbc.Driver";
+        String url = "jdbc:mysql://" + assetStructure.getHostAddress() + ":" + assetStructure.getHostPort() + "/" + assetStructure.getDatabaseName();
+
+        //查询条件
+        String query="select * from "+databaseTableInformation.getName()+"limit 1 ";
+
+        try (Connection con = DriverManager.getConnection(url, user, password)){
+
+            PreparedStatement preparedStatement = con.prepareStatement(query);
+            ResultSet executeQuery = preparedStatement.executeQuery();
+            System.out.println("13");
+            return Result.success(executeQuery);
+//            ResultSetMetaData metaData1 = executeQuery.getMetaData();
+
+//            ResultSetMetaData metaData = preparedStatement.getMetaData();
+//            ParameterMetaData parameterMetaData = preparedStatement.getParameterMetaData();
+//            System.out.println(parameterMetaData);
+//            return Result.success(metaData1);
+//            System.out.println(metaData);
+//            return Result.success(metaData);
+        }catch (Exception e){
+            System.out.println("连接失败"+e.getMessage());
+            return Result.error("连接失败");
+        }
+
+    }
+
 
 }

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9527
+  port: 9101
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/muyu-system"/>
+    <property name="log.path" value="logs/muyu-data-unit"/>
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 

muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml

@@ -215,6 +215,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="dataBaseTableInformation" resultType="com.muyu.data.source.domain.DatabaseTableInformation">
         select *from database_table_information
     </select>
+    <select id="findDataBaseTableId" resultType="com.muyu.data.source.domain.DataBaseTable">
+        select * from database_table where id=#{id}
+    </select>
     <!--    <select id="findDatabaseName" resultType="com.muyu.data.source.domain.AssetStructure">-->
 <!--        select * from asset_structure-->
 <!--        <where>-->

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

@@ -15,8 +15,7 @@
         <module>muyu-data-source-common</module>
         <module>muyu-data-source-remote</module>
         <module>muyu-data-source-server</module>
-        <module>muyu-data-source-access-server</module>
+        <module>muyu-data-source-client</module>
-        <module>muyu-data-source-access-client</module>
     </modules>
 
     <properties>

muyu-modules/muyu-data-unit/pom.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-modules</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-data-unit</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-data-source-client</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-rule-engine-client</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datasource</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-log</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Swagger -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-swagger</artifactId>
+        </dependency>
+
+        <!-- Sql Server 驱动 -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>9.4.0.jre8</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.muyu.ruleEngine.DeKangLiuRuleEngineApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/DataSourceUnitApplication.java

@@ -0,0 +1,23 @@
+package com.muyu.data.unit;
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 数据启动类 DataSourceApplication
+ *
+ * @author DeKangLiu
+ * Date 2024/5/9 21:05
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class DataSourceUnitApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(DataSourceUnitApplication.class, args);
+    }
+}

muyu-modules/muyu-data-unit/src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}

muyu-modules/muyu-data-unit/src/main/resources/bootstrap.yml

@@ -0,0 +1,30 @@
+# Tomcat
+server:
+  port: 9112
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: muyu-data-unit
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
+      config:
+        # 配置中心地址
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+  level:
+    com.muyu.data.source.mapper: DEBUG

muyu-modules/muyu-data-unit/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/muyu-system"/>
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.muyu" level="info"/>
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn"/>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+    </root>
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+</configuration>

muyu-modules/muyu-file/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9300
+  port: 9102
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9202
+  port: 9103
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-job/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9203
+  port: 9104
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-ruleengine/muyu-ruleengine-client/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-data-source</artifactId>
+        <artifactId>muyu-ruleengine</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-data-source-access-client</artifactId>
+    <artifactId>muyu-ruleengine-client</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

muyu-modules/muyu-ruleengine/muyu-ruleengine-common/src/main/java/com/muyu/ruleengine/domain/Ruleengine.java

@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * 规则引擎对象 ruleengine
  *
- * @author WangLei
+ * @author 43.142.149.172Lei
  * @date 2024-04-24
  */
 @Data

muyu-modules/muyu-ruleengine/muyu-ruleengine-remote/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-data-source</artifactId>
+        <artifactId>muyu-ruleengine</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-data-source-access-server</artifactId>
+    <artifactId>muyu-ruleengine-remote</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

muyu-modules/muyu-ruleengine/muyu-ruleengine-server/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9216
+  port: 9105
 
 # Spring
 spring:
@@ -14,12 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-ruleengine/pom.xml

@@ -18,6 +18,8 @@
     <modules>
         <module>muyu-ruleengine-common</module>
         <module>muyu-ruleengine-server</module>
+        <module>muyu-ruleengine-remote</module>
+        <module>muyu-ruleengine-client</module>
     </modules>
 
 </project>

muyu-modules/muyu-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: 9111
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>muyu-file</module>
         <module>muyu-data-source</module>
         <module>muyu-ruleengine</module>
+        <module>muyu-data-unit</module>
     </modules>
 
     <artifactId>muyu-modules</artifactId>

muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9100
+  port: 9106
 
 # Spring
 spring:
@@ -14,11 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
       config:
         # 配置中心地址
-        server-addr: 115.159.81.159:8848
+        server-addr: 43.142.149.172:8848
-        namespace: f394dee0-fead-4010-8359-2955bacca31f
+        namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039
         # 配置文件格式
         file-extension: yml
         # 共享配置