diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 348e2c5..1892409 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index 8f583d7..2121b62 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,26 +14,27 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl sentinel: # 取消控制台懒加载 eager: true transport: # 控制台地址 - dashboard: 139.224.67.14:8718 + dashboard: 175.24.138.82:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-etl/muyu-etl-common/pom.xml b/muyu-modules/muyu-etl/muyu-etl-common/pom.xml new file mode 100644 index 0000000..30a367d --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-etl + 3.6.3 + + + muyu-etl-common + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-core + + + com.muyu + muyu-common-security + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java new file mode 100644 index 0000000..08cd7de --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java @@ -0,0 +1,125 @@ +package com.muyu.etl.domain; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.etl.domain.req.BasicConfigQueryReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; +import java.util.function.Supplier; + + +/** + *对象 basic_config_info + * + * @author xiaohuang + * @date 2024-04-21 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class BasicConfigInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 接入源名称 */ + @Excel(name = "接入源名称") + private String dataResourceName; + + /** 数据来源系统名称 */ + @Excel(name = "数据来源系统名称") + private String dataSourcesSystemName; + + /** 主机ip地址 */ + @Excel(name = "主机ip地址") + private String host; + + /** 端口 */ + @Excel(name = "端口") + private String port; + + /** 数据接入类型 */ + @Excel(name = "数据接入类型") + private String databaseType; + + /** 数据库名称 */ + @Excel(name = "数据库名称") + private String databaseName; + + /** 初始化连接数量 */ + @Excel(name = "初始化连接数量") + private Long initLinkNum; + + /** 最大连接数量 */ + @Excel(name = "最大连接数量") + private Long maxLinkNum; + + /** 最大等待时间 */ + @Excel(name = "最大等待时间") + private Long maxWaitTime; + + /** 最大等待次数 */ + @Excel(name = "最大等待次数") + private Long maxWaitTimes; + + @Excel(name = "连接参数") + private String connectionParams; + + @Excel(name = "用户名") + private String username; + + @Excel(name = "密码") + private String password; + + private String createBy; + private String updateBy; + private Date createTime; + private Date updateTime; + + /** + * 创建存储对象 + */ + public static BasicConfigInfo saveBuilder(BasicConfigQueryReq configQueryReq, Supplier username) { + return BasicConfigInfo.builder() + .id(configQueryReq.getId()) + .databaseName(configQueryReq.getDatabaseName()) + .databaseType(configQueryReq.getDatabaseType()) + .dataResourceName(configQueryReq.getDataResourceName()) + .dataSourcesSystemName(configQueryReq.getDataSourcesSystemName()) + .host(configQueryReq.getHost()) + .port(configQueryReq.getPort()) + .initLinkNum(configQueryReq.getInitLinkNum()) + .maxLinkNum(configQueryReq.getMaxLinkNum()) + .maxWaitTime(configQueryReq.getMaxWaitTime()) + .createBy(username.get()) + .createTime(new Date()) + .build(); + } + + /** + * 修改对象 + */ + public static BasicConfigInfo editBuilder(BasicConfigQueryReq configQueryReq, Supplier username) { + return BasicConfigInfo.builder() + .id(configQueryReq.getId()) + .databaseName(configQueryReq.getDatabaseName()) + .databaseType(configQueryReq.getDatabaseType()) + .dataResourceName(configQueryReq.getDataResourceName()) + .dataSourcesSystemName(configQueryReq.getDataSourcesSystemName()) + .host(configQueryReq.getHost()) + .port(configQueryReq.getPort()) + .initLinkNum(configQueryReq.getInitLinkNum()) + .maxLinkNum(configQueryReq.getMaxLinkNum()) + .maxWaitTime(configQueryReq.getMaxWaitTime()) + .updateBy(username.get()) + .updateTime(new Date()) + .build(); + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java new file mode 100644 index 0000000..4d1bbfe --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/req/BasicConfigQueryReq.java @@ -0,0 +1,75 @@ +package com.muyu.etl.domain.req; + +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * BasicConfigQueryReq + * + * @author xiaohuang + * on 2024/4/21 + */ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class BasicConfigQueryReq { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 接入源名称 */ + @Excel(name = "接入源名称") + private String dataResourceName; + + /** 数据来源系统名称 */ + @Excel(name = "数据来源系统名称") + private String dataSourcesSystemName; + + /** 主机ip地址 */ + @Excel(name = "主机ip地址") + private String host; + + /** 端口 */ + @Excel(name = "端口") + private String port; + + /** 数据接入类型 */ + @Excel(name = "数据接入类型") + private String databaseType; + + /** 数据库名称 */ + @Excel(name = "数据库名称") + private String databaseName; + + /** 初始化连接数量 */ + @Excel(name = "初始化连接数量") + private Long initLinkNum; + + /** 最大连接数量 */ + @Excel(name = "最大连接数量") + private Long maxLinkNum; + + /** 最大等待时间 */ + @Excel(name = "最大等待时间") + private Long maxWaitTime; + + /** 最大等待次数 */ + @Excel(name = "最大等待次数") + private Long maxWaitTimes; + + private String connectionParams; + private String createBy; + private String updateBy; + private Date createTime; + private Date updateTime; + +} + diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java new file mode 100644 index 0000000..f8c70e0 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/resp/BasicConfigResp.java @@ -0,0 +1,64 @@ +package com.muyu.etl.domain.resp; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + + +/** + * 响应对象 + * @ClassName BasicConfigResp + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/4/21 10:45 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class BasicConfigResp { + private static final long serialVersionUID = 1L; + /** 主键 */ + private Long id; + + /** 接入源名称 */ + private String dataResourceName; + + /** 数据来源系统名称 */ + private String dataSourcesSystemName; + + /** 主机ip地址 */ + private String host; + + /** 端口 */ + private String port; + + /** 数据接入类型 */ + private String databaseType; + + /** 数据库名称 */ + private String databaseName; + + /** 初始化连接数量 */ + private Long initLinkNum; + + /** 最大连接数量 */ + private Long maxLinkNum; + + /** 最大等待时间 */ + private Long maxWaitTime; + + /** 最大等待次数 */ + private Long maxWaitTimes; + + /** 拼接链接 */ + private String connectionParams; + private String remark; + private String createBy; + private String updateBy; + private Date createTime; + private Date updateTime; +} diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/pom.xml b/muyu-modules/muyu-etl/muyu-etl-remote/pom.xml new file mode 100644 index 0000000..a63b51a --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-remote/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-etl + 3.6.3 + + + muyu-etl-remote + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..95690d4 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/muyu/Main.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/muyu/Main.java new file mode 100644 index 0000000..759d6b2 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/muyu/Main.java @@ -0,0 +1,7 @@ +package muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml new file mode 100644 index 0000000..bdb0988 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml @@ -0,0 +1,122 @@ + + + 4.0.0 + + com.muyu + muyu-etl + 3.6.3 + + + muyu-etl-service + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-etl-common + + + + + 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.muyu + muyu-common-core + + + com.muyu + muyu-common-core + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java new file mode 100644 index 0000000..d2c8c59 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/MuYuEtlApplication.java @@ -0,0 +1,17 @@ +package com.muyu; + +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; + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuEtlApplication { + public static void main(String[] args) { + SpringApplication.run(MuYuEtlApplication.class); + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java new file mode 100644 index 0000000..c858f5a --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -0,0 +1,109 @@ +package com.muyu.etl.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.service.BasicConfigInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 基础信息Controller + * + * @author muyu + * @date 2024-04-21 + */ +@RestController +@RequestMapping("/info") +public class BasicConfigInfoController extends BaseController +{ + @Autowired + private BasicConfigInfoService basicConfigInfoService; + + /** + * 查询基础信息列表 + */ + @RequiresPermissions("etl:info:list") + @GetMapping("/list") + public Result> list(BasicConfigInfo basicConfigInfo) + { + startPage(); + List list = basicConfigInfoService.selectBasicConfigInfoList(basicConfigInfo); + return getDataTable(list); + } + + /** + * 导出基础信息列表 + */ + @RequiresPermissions("etl:info:export") + @Log(title = "基础信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicConfigInfo basicConfigInfo) + { + List list = basicConfigInfoService.selectBasicConfigInfoList(basicConfigInfo); + ExcelUtil util = new ExcelUtil(BasicConfigInfo.class); + util.exportExcel(response, list, "基础信息数据"); + } + + /** + * 获取基础信息详细信息 + */ + @RequiresPermissions("etl:info:query") + @GetMapping(value = "/{id}") + public Result getInfo(@PathVariable("id") Long id) + { + return success(basicConfigInfoService.selectBasicConfigInfoById(id)); + } + + /** + * 新增基础信息 + */ + @RequiresPermissions("etl:info:add") + @Log(title = "基础信息", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody BasicConfigInfo configQueryReq) + { + return toAjax(basicConfigInfoService.insertBasicConfigInfo(configQueryReq)); + } + + /** + * 修改基础信息 + */ + @RequiresPermissions("etl:info:edit") + @Log(title = "基础信息", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody BasicConfigInfo basicConfigInfo) + { + return toAjax(basicConfigInfoService.updateBasicConfigInfo(basicConfigInfo)); + } + + /** + * 删除基础信息 + */ + @RequiresPermissions("etl:info:remove") + @Log(title = "基础信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Result remove(@PathVariable Long[] ids) + { + return toAjax(basicConfigInfoService.deleteBasicConfigInfoByIds(ids)); + } + + /** + * 测试连接 + */ + @RequiresPermissions("etl:info:test") + @Log(title = "测试连接") + @PostMapping("/connectionTest") + public Result connectionTest(@RequestBody BasicConfigInfo basicConfigInfo) throws ServletException { + return toAjax(basicConfigInfoService.connectionTest(basicConfigInfo)); + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java new file mode 100644 index 0000000..b50c229 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/mapper/BasicConfigInfoMapper.java @@ -0,0 +1,56 @@ +package com.muyu.etl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.etl.domain.BasicConfigInfo; + +import java.util.List; + +/** + * 接口 BasicConfigInfoMapper + * + * @author xiaohuang + * on 2024/4/21 + */ +public interface BasicConfigInfoMapper extends BaseMapper { + + /** + * 查询 + */ + public BasicConfigInfo selectBasicConfigInfoById(Long id); + + /** + * 查询列表 + * @param basicConfigInfo + * @return + */ + public List selectBasicConfigInfoList(BasicConfigInfo basicConfigInfo); + + + /** + * 新增 + * @param basicConfigInfo + * @return + */ + public int insertBasicConfigInfo(BasicConfigInfo basicConfigInfo); + + /** + * 修改 + * @param basicConfigInfo + * @return + */ + public int updateBasicConfigInfo(BasicConfigInfo basicConfigInfo); + + /** + * 删除 + * @param id + * @return + */ + public int deleteBasicConfigInfoById(Long id); + + /** + * 批量删除 + * @param ids + * @return + */ + public int deleteBasicConfigInfoByIds(Long[] ids); +} diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java new file mode 100644 index 0000000..496ab4a --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java @@ -0,0 +1,67 @@ +package com.muyu.etl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.etl.domain.BasicConfigInfo; + +import javax.servlet.ServletException; +import java.rmi.server.ServerCloneException; +import java.util.List; + +/** + * 接口 BasicConfigInfoService + * + * @author xiaohuang + * on 2024/4/21 + */ +public interface BasicConfigInfoService extends IService { + /** + * 查询 + * + * @param id 主键 + * @return + */ + public BasicConfigInfo selectBasicConfigInfoById(Long id); + + /** + * 查询列表 + * + * @param basicConfigInfo + * @return 集合 + */ + public List + selectBasicConfigInfoList(BasicConfigInfo basicConfigInfo); + + /** + * 新增 + * + * @param configQueryReq + * @return 结果 + */ + public int insertBasicConfigInfo(BasicConfigInfo configQueryReq); + + /** + * 修改 + * + * @param basicConfigInfo + * @return 结果 + */ + public int updateBasicConfigInfo(BasicConfigInfo basicConfigInfo); + + /** + * 批量删除 + * + * @param ids 需要删除的主键集合 + * @return 结果 + */ + public int deleteBasicConfigInfoByIds(Long[] ids); + + /** + * 删除信息 + * + * @param id 主键 + * @return 结果 + */ + public int deleteBasicConfigInfoById(Long id); + + boolean connectionTest(BasicConfigInfo basicConfigInfo) throws ServletException; +} diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java new file mode 100644 index 0000000..7bcd410 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -0,0 +1,86 @@ +package com.muyu.etl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.mapper.BasicConfigInfoMapper; +import com.muyu.etl.service.BasicConfigInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.ServletException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +/** + * 业务层 BasicConfigInfoServiceImpl + * + * @author xiaohuang + * on 2024/4/21 + */ +@Service +public class BasicConfigInfoServiceImpl extends ServiceImpl implements BasicConfigInfoService { + + + @Autowired + private BasicConfigInfoMapper basicConfigInfoMapper; + + @Override + public BasicConfigInfo selectBasicConfigInfoById(Long id) { + return basicConfigInfoMapper.selectBasicConfigInfoById(id); + } + + @Override + public List selectBasicConfigInfoList(BasicConfigInfo basicConfigInfo) { + + return basicConfigInfoMapper.selectBasicConfigInfoList(basicConfigInfo); + } + + @Override + public int insertBasicConfigInfo(BasicConfigInfo configQueryReq) { + return basicConfigInfoMapper.insertBasicConfigInfo(configQueryReq); + } + + @Override + public int updateBasicConfigInfo(BasicConfigInfo configQueryReq) { + return basicConfigInfoMapper.updateBasicConfigInfo(configQueryReq); + } + + @Override + public int deleteBasicConfigInfoByIds(Long[] ids) { + return basicConfigInfoMapper.deleteBasicConfigInfoByIds(ids); + } + + + @Override + public int deleteBasicConfigInfoById(Long id) + { + return basicConfigInfoMapper.deleteBasicConfigInfoById(id); + } + + @Override + public boolean connectionTest(BasicConfigInfo basicConfigInfo) throws ServletException { + //定义下面需要的对象 + String host = basicConfigInfo.getHost(); + String port = basicConfigInfo.getPort(); + String databaseName = basicConfigInfo.getDatabaseName(); + String databaseType = basicConfigInfo.getDatabaseType(); + + String url = "jdbc:"+databaseType+"://"+host+":"+port+"/"+databaseName+""; + String user = "root"; + String password = "123456"; + Connection conn= null; + try { + conn = DriverManager.getConnection(url, user, password); + System.out.println("Connected to the MySQL server successfully."); + } catch (SQLException e) { + throw new ServletException("连接失败"); + } + return true; + } +} + + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d52326e --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9205 + +# Spring +spring: + application: + # 应用名称 + name: muyu-etl + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 175.24.138.82:8848 + config: + # 配置中心地址 + server-addr: 175.24.138.82:8848 + namespace: etl + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml new file mode 100644 index 0000000..fa272dd --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + select id, data_resource_name,username,password, + data_sources_system_name, + host, port, database_type, + database_name, + init_link_num, + max_link_num, max_wait_time, + max_wait_times,connection_params, + remark from basic_config_info + + + + + + + + insert into basic_config_info + + id, + data_resource_name, + data_sources_system_name, + host, + port, + database_type, + database_name, + username, + password, + init_link_num, + max_link_num, + max_wait_time, + max_wait_times, + connection_params, + remark, + + + #{id}, + #{dataResourceName}, + #{dataSourcesSystemName}, + #{host}, + #{port}, + #{username}, + #{password}, + #{databaseType}, + #{databaseName}, + #{initLinkNum}, + #{maxLinkNum}, + #{maxWaitTime}, + #{maxWaitTimes}, + #{connectionParams}, + #{remark}, + + + + + update basic_config_info + + data_resource_name = #{dataResourceName}, + data_sources_system_name = #{dataSourcesSystemName}, + host = #{host}, + port = #{port}, + database_type = #{databaseType}, + database_name = #{databaseName}, + username = #{username}, + password = #{password}, + init_link_num = #{initLinkNum}, + max_link_num = #{maxLinkNum}, + max_wait_time = #{maxWaitTime}, + max_wait_times = #{maxWaitTimes}, + connection_params = #{connectionParams}, + remark = #{remark}, + + where id = #{id} + + + + delete from basic_config_info where id = #{id} + + + + delete from basic_config_info where id in + + #{id} + + + diff --git a/muyu-modules/muyu-etl/pom.xml b/muyu-modules/muyu-etl/pom.xml new file mode 100644 index 0000000..7b765bc --- /dev/null +++ b/muyu-modules/muyu-etl/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-etl + pom + + muyu-etl-common + muyu-etl-remote + muyu-etl-service + + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index da6f5a3..0341ae3 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index 73a4638..a359151 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index c84571b..c440cf7 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,12 +14,13 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index 2a9eaf6..5f668fc 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,15 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: etl logging: level: com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 846198c..751a242 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -13,6 +13,8 @@ muyu-gen muyu-job muyu-file + muyu-etl + 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 b4dd5a5..c89a13f 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 139.224.67.14:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index fc97f1d..f50de99 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,15 @@ ${muyu.version} + + com.muyu + muyu-etl-common + 3.6.3 + + + + +