From a0cf7e7c3a331d24443425c58daba6cce0973b8e Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Fri, 10 May 2024 18:50:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=95=E6=93=8E=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/pom.xml | 2 +- muyu-auth/src/main/resources/bootstrap.yml | 9 +- .../core/constant/ServiceNameConstants.java | 5 + muyu-common/muyu-common-system/pom.xml | 2 +- muyu-gateway/pom.xml | 1 + muyu-gateway/src/main/resources/bootstrap.yml | 13 +- .../muyu-data-source-client/pom.xml | 38 ++++ .../client/config/DataSourceClientConfig.java | 17 ++ .../client/config/DataSourceClientRunner.java | 35 ++++ .../data/source/client/pool/BaseConfig.java | 24 +++ .../data/source/client/pool/BasePool.java | 41 ++++ .../client/pool/MysqlConnException.java | 13 ++ .../data/source/client/pool/MysqlPool.java | 191 ++++++++++++++++++ .../client/pool/config/MysqlPoolConfig.java | 134 ++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../data/source/domain/AssetStructure.java | 2 +- .../data/source/domain/SysDataSource.java | 99 +++++++++ .../muyu-data-source-remote/pom.xml | 20 ++ .../remote/RemoteDataManagerService.java | 31 +++ .../remote/factory/DataManagerFactory.java | 28 +++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../controller/AssetAuthInfoController.java | 2 +- .../controller/DataSourceController.java | 13 ++ .../source/mapper/AssetAuthInfoMapper.java | 2 +- .../data/source/mapper/DataSourceMapper.java | 2 + .../source/service/AssetAuthInfoService.java | 2 +- .../source/service/DataSourceService.java | 2 + .../impl/AssetAuthInfoServiceImpl.java | 2 +- .../service/impl/DataSourceServiceImpl.java | 40 ++++ .../src/main/resources/bootstrap.yml | 9 +- .../src/main/resources/logback.xml | 2 +- .../mapper/dataSource/DataSourceMapper.xml | 3 + muyu-modules/muyu-data-source/pom.xml | 3 +- muyu-modules/muyu-data-unit/pom.xml | 131 ++++++++++++ .../data/unit/DataSourceUnitApplication.java | 23 +++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 +++ .../src/main/resources/logback.xml | 74 +++++++ .../src/main/resources/bootstrap.yml | 9 +- .../muyu-gen/src/main/resources/bootstrap.yml | 9 +- .../muyu-job/src/main/resources/bootstrap.yml | 9 +- .../muyu-ruleengine-client}/pom.xml | 4 +- .../muyu/ruleengine/domain/Ruleengine.java | 2 +- .../muyu-ruleengine-remote}/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 10 +- muyu-modules/muyu-ruleengine/pom.xml | 2 + .../src/main/resources/bootstrap.yml | 9 +- muyu-modules/pom.xml | 1 + .../src/main/resources/bootstrap.yml | 9 +- 49 files changed, 1063 insertions(+), 54 deletions(-) create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/pom.xml create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientConfig.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientRunner.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BaseConfig.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BasePool.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlConnException.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlPool.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/config/MysqlPoolConfig.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/SysDataSource.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/RemoteDataManagerService.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/factory/DataManagerFactory.java create mode 100644 muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-data-unit/pom.xml create mode 100644 muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/DataSourceUnitApplication.java create mode 100644 muyu-modules/muyu-data-unit/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-data-unit/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-data-unit/src/main/resources/logback.xml rename muyu-modules/{muyu-data-source/muyu-data-source-access-client => muyu-ruleengine/muyu-ruleengine-client}/pom.xml (85%) rename muyu-modules/{muyu-data-source/muyu-data-source-access-server => muyu-ruleengine/muyu-ruleengine-remote}/pom.xml (85%) diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml index a8ddedc..96706e0 100644 --- a/muyu-auth/pom.xml +++ b/muyu-auth/pom.xml @@ -13,7 +13,7 @@ muyu-auth认证授权中心 - + jar diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 30039a7..4ec0729 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 25c918e..f1c267e 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/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"; } diff --git a/muyu-common/muyu-common-system/pom.xml b/muyu-common/muyu-common-system/pom.xml index 62fdc74..d730835 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/muyu-common/muyu-common-system/pom.xml @@ -10,7 +10,7 @@ muyu-common-system - + jar 17 17 diff --git a/muyu-gateway/pom.xml b/muyu-gateway/pom.xml index 2d3ed58..d6cd8c7 100644 --- a/muyu-gateway/pom.xml +++ b/muyu-gateway/pom.xml @@ -13,6 +13,7 @@ muyu-gateway网关模块 + jar diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index 8f5a3a9..7968e7e 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + 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 diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/pom.xml b/muyu-modules/muyu-data-source/muyu-data-source-client/pom.xml new file mode 100644 index 0000000..259a107 --- /dev/null +++ b/muyu-modules/muyu-data-source/muyu-data-source-client/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.muyu + muyu-data-source + 3.6.3 + + + muyu-data-source-client + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-data-source-remote + 3.6.3 + + + com.alibaba + druid + 1.2.6 + compile + + + com.muyu + muyu-data-source-common + 3.6.3 + compile + + + diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientConfig.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientConfig.java new file mode 100644 index 0000000..af5cb59 --- /dev/null +++ b/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 { + +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientRunner.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/config/DataSourceClientRunner.java new file mode 100644 index 0000000..4c9b16e --- /dev/null +++ b/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> dataSourceList = remoteDataManagerService.postList(new DataSourceQueryReq()); + log.info(dataSourceList); + } +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BaseConfig.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BaseConfig.java new file mode 100644 index 0000000..687ea8e --- /dev/null +++ b/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); + } + } +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BasePool.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/BasePool.java new file mode 100644 index 0000000..68ad44f --- /dev/null +++ b/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 { + /** + * 初始化 + */ + public void init(); + + /** + * 获取连接 + */ + + public T getConn(); + + /** + * 归还连接 + * @param conn + */ + + public void reaplase(T conn); + + /** + * 创建连接 + * @return + */ + + public T creatConnection(); + + + /** + * 关闭连接 + */ + public void closeConn(); + +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlConnException.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlConnException.java new file mode 100644 index 0000000..42ef5ec --- /dev/null +++ b/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); + } +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlPool.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/MysqlPool.java new file mode 100644 index 0000000..e5169cf --- /dev/null +++ b/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 { + + + + /** + * 打印日志 + */ + private static final Logger log = LoggerFactory.getLogger(MysqlPool.class); + + /** + * 等待队列 基础队列 + */ + private Queue mysqlConnQueue = null; + + /** + * 活动队列 + */ + private Queue 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() 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(); + } + + } + + } + +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/config/MysqlPoolConfig.java b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/java/com/muyu/data/source/client/pool/config/MysqlPoolConfig.java new file mode 100644 index 0000000..321cdcb --- /dev/null +++ b/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(); + }; + + + +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-data-source/muyu-data-source-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c3962cb --- /dev/null +++ b/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 diff --git a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/AssetStructure.java b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/AssetStructure.java index 69dddee..e9b13f0 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/AssetStructure.java +++ b/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; diff --git a/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/SysDataSource.java b/muyu-modules/muyu-data-source/muyu-data-source-common/src/main/java/com/muyu/data/source/domain/SysDataSource.java new file mode 100644 index 0000000..4b8b09d --- /dev/null +++ b/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; +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-remote/pom.xml b/muyu-modules/muyu-data-source/muyu-data-source-remote/pom.xml index d463301..8e43fe6 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-remote/pom.xml +++ b/muyu-modules/muyu-data-source/muyu-data-source-remote/pom.xml @@ -16,5 +16,25 @@ 17 UTF-8 + + + com.muyu + muyu-data-source-common + 3.6.3 + + + com.muyu + muyu-common-core + 3.6.3 + + + org.springframework.cloud + spring-cloud-openfeign-core + + + com.muyu + muyu-common-security + + diff --git a/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/RemoteDataManagerService.java b/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/RemoteDataManagerService.java new file mode 100644 index 0000000..76dafc5 --- /dev/null +++ b/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> postList(DataSourceQueryReq dataSourceQueryReq); +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/factory/DataManagerFactory.java b/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/java/com/muyu/data/source/remote/factory/DataManagerFactory.java new file mode 100644 index 0000000..5a4d6e5 --- /dev/null +++ b/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 { + @Override + public RemoteDataManagerService create(Throwable cause) { + return new RemoteDataManagerService() { + @Override + public Result> postList(DataSourceQueryReq dataSourceQueryReq) { + return Result.error(cause.getMessage()); + } + }; + } +} diff --git a/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-data-source/muyu-data-source-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c403808 --- /dev/null +++ b/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 diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/AssetAuthInfoController.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/AssetAuthInfoController.java index 6f6ceee..b86c4e6 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/AssetAuthInfoController.java +++ b/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 */ diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java index d0add3a..78aa731 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/controller/DataSourceController.java +++ b/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 list = dataSourceService.list(DataSource.queryBuild(dataSourceQueryReq)); return getDataTable(list); } + /** + * post请求查询数据源列表 + */ + @PostMapping("/DataSourceList") + public Result> postList(DataSourceQueryReq dataSourceQueryReq) { + List 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); + } } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/AssetAuthInfoMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/AssetAuthInfoMapper.java index f08b57e..3a751dd 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/AssetAuthInfoMapper.java +++ b/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 */ diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java index fcd5760..d29c008 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/mapper/DataSourceMapper.java +++ b/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 { 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); diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/AssetAuthInfoService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/AssetAuthInfoService.java index 4a0d6af..e327ce2 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/AssetAuthInfoService.java +++ b/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 */ diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java index cf43079..ee15e18 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/DataSourceService.java +++ b/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 { Result> dataBaseTableInformation(); Result updateDatabaseTable(DataBaseTable dataBaseTable); + + Result findDataSourceByDataBaseId(Integer id); } diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/AssetAuthInfoServiceImpl.java b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/AssetAuthInfoServiceImpl.java index 1a2dbdf..bc89e39 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/java/com/muyu/data/source/service/impl/AssetAuthInfoServiceImpl.java +++ b/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 */ 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 2488a74..b549382 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 @@ -168,6 +168,10 @@ public class DataSourceServiceImpl extends ServiceImpl - + diff --git a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml b/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml index a0b363d..f59a163 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-server/src/main/resources/mapper/dataSource/DataSourceMapper.xml +++ b/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" + diff --git a/muyu-modules/muyu-data-source/pom.xml b/muyu-modules/muyu-data-source/pom.xml index 4278d74..bb05260 100644 --- a/muyu-modules/muyu-data-source/pom.xml +++ b/muyu-modules/muyu-data-source/pom.xml @@ -15,8 +15,7 @@ muyu-data-source-common muyu-data-source-remote muyu-data-source-server - muyu-data-source-access-server - muyu-data-source-access-client + muyu-data-source-client diff --git a/muyu-modules/muyu-data-unit/pom.xml b/muyu-modules/muyu-data-unit/pom.xml new file mode 100644 index 0000000..63207e0 --- /dev/null +++ b/muyu-modules/muyu-data-unit/pom.xml @@ -0,0 +1,131 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-data-unit + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-data-source-client + 3.6.3 + + + com.muyu + muyu-rule-engine-client + 3.6.3 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.0.jre8 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + com.muyu.ruleEngine.DeKangLiuRuleEngineApplication + + + + + + diff --git a/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/DataSourceUnitApplication.java b/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/DataSourceUnitApplication.java new file mode 100644 index 0000000..e777c2b --- /dev/null +++ b/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); + } +} diff --git a/muyu-modules/muyu-data-unit/src/main/resources/banner.txt b/muyu-modules/muyu-data-unit/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/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} diff --git a/muyu-modules/muyu-data-unit/src/main/resources/bootstrap.yml b/muyu-modules/muyu-data-unit/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..e8d172b --- /dev/null +++ b/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 diff --git a/muyu-modules/muyu-data-unit/src/main/resources/logback.xml b/muyu-modules/muyu-data-unit/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-data-unit/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index dd3a5a1..181ee4b 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index e2e52f5..7b1149e 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index decf5ff..4e6472a 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-data-source/muyu-data-source-access-client/pom.xml b/muyu-modules/muyu-ruleengine/muyu-ruleengine-client/pom.xml similarity index 85% rename from muyu-modules/muyu-data-source/muyu-data-source-access-client/pom.xml rename to muyu-modules/muyu-ruleengine/muyu-ruleengine-client/pom.xml index 89453bb..f7b4928 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-access-client/pom.xml +++ b/muyu-modules/muyu-ruleengine/muyu-ruleengine-client/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-data-source + muyu-ruleengine 3.6.3 - muyu-data-source-access-client + muyu-ruleengine-client 17 diff --git a/muyu-modules/muyu-ruleengine/muyu-ruleengine-common/src/main/java/com/muyu/ruleengine/domain/Ruleengine.java b/muyu-modules/muyu-ruleengine/muyu-ruleengine-common/src/main/java/com/muyu/ruleengine/domain/Ruleengine.java index 39d5adf..7f80dfa 100644 --- a/muyu-modules/muyu-ruleengine/muyu-ruleengine-common/src/main/java/com/muyu/ruleengine/domain/Ruleengine.java +++ b/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 diff --git a/muyu-modules/muyu-data-source/muyu-data-source-access-server/pom.xml b/muyu-modules/muyu-ruleengine/muyu-ruleengine-remote/pom.xml similarity index 85% rename from muyu-modules/muyu-data-source/muyu-data-source-access-server/pom.xml rename to muyu-modules/muyu-ruleengine/muyu-ruleengine-remote/pom.xml index d86d87f..7df207d 100644 --- a/muyu-modules/muyu-data-source/muyu-data-source-access-server/pom.xml +++ b/muyu-modules/muyu-ruleengine/muyu-ruleengine-remote/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-data-source + muyu-ruleengine 3.6.3 - muyu-data-source-access-server + muyu-ruleengine-remote 17 diff --git a/muyu-modules/muyu-ruleengine/muyu-ruleengine-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-ruleengine/muyu-ruleengine-server/src/main/resources/bootstrap.yml index b8abab9..821b9ea 100644 --- a/muyu-modules/muyu-ruleengine/muyu-ruleengine-server/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-ruleengine/pom.xml b/muyu-modules/muyu-ruleengine/pom.xml index 0cf57cc..68b6a99 100644 --- a/muyu-modules/muyu-ruleengine/pom.xml +++ b/muyu-modules/muyu-ruleengine/pom.xml @@ -18,6 +18,8 @@ muyu-ruleengine-common muyu-ruleengine-server + muyu-ruleengine-remote + muyu-ruleengine-client diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index c4ca33b..f8c3a91 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 89ae1e1..dc89227 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -15,6 +15,7 @@ muyu-file muyu-data-source muyu-ruleengine + muyu-data-unit muyu-modules diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index 425b080..01a6124 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/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 - namespace: f394dee0-fead-4010-8359-2955bacca31f + server-addr: 43.142.149.172:8848 + namespace: fa965f4b-c851-46c9-8ddb-dbc5cb4aa039 # 配置文件格式 file-extension: yml # 共享配置