初始化

cloud-etl-common/src/main/java/com/muyu/domain/BasicConfigInfo.java

@@ -1,91 +0,0 @@
-package com.muyu.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.web.domain.BaseEntity;
-
-import com.muyu.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 Saisai
- * @date 2024-04-20
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
-public class BasicConfigInfo extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id", type = IdType.AUTO)
-    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;
-
-
-}

cloud-etl-common/src/main/java/com/muyu/domain/Req/BasicConfigQueryReq.java

@@ -1,76 +0,0 @@
-package com.muyu.domain.Req;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.muyu.common.core.annotation.Excel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Date;
-
-/**
- * @ClassName BasicQueryReq
- * @Description 描述
- * @Author SaiSai.Liu
- * @Date 2024/4/21 10:42
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@SuperBuilder
-public class BasicConfigQueryReq {
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id", type = IdType.AUTO)
-    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;
-
-}

cloud-etl-common/src/main/java/com/muyu/domain/req/SourceReq.java

@@ -19,35 +19,61 @@ public class SourceReq extends BaseEntity {
     /** 主键 */
     @TableId(value = "id", type = IdType.AUTO)
     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;
 
 }

cloud-etl-server/src/main/java/com/muyu/MuyuApplication.java

@@ -1,18 +0,0 @@
-package com.muyu;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @Author：qdm
- * @Package：com.muyu
- * @Project：cloud-etl
- * @name：MuyuApplication
- * @Date：2024/8/20 20:28
- */
-@SpringBootApplication
-public class MuyuApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(MuyuApplication.class, args);
-    }
-}

cloud-etl-server/src/main/java/com/muyu/cloud/etl/MuYuPayApplication.java

@@ -1,4 +1,4 @@
-package com.muyu.cloud.pay;
+package com.muyu.cloud.etl;
 
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;

cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/ETLController.java

@@ -1,10 +1,9 @@
-package com.muyu.controller;
+package com.muyu.cloud.etl.controller;
 
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.domain.AssetImpower;
-import com.muyu.service.EtlService;
+import com.muyu.cloud.etl.service.EtlService;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/SourceController.java

@@ -1,6 +1,6 @@
-package com.muyu.cloud.pay.controller;
+package com.muyu.cloud.etl.controller;
 
-import com.muyu.cloud.pay.service.SourceService;
+import com.muyu.cloud.etl.service.SourceService;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;

cloud-etl-server/src/main/java/com/muyu/cloud/etl/mapper/EtlMapper.java

@@ -1,4 +1,4 @@
-package com.muyu.mapper;
+package com.muyu.cloud.etl.mapper;
 
 import com.muyu.domain.AssetImpower;
 import org.apache.ibatis.annotations.Mapper;

cloud-etl-server/src/main/java/com/muyu/cloud/etl/mapper/SourceMapper.java

@@ -1,4 +1,4 @@
-package com.muyu.cloud.pay.mapper;
+package com.muyu.cloud.etl.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.domain.Source;

cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java

@@ -1,4 +1,4 @@
-package com.muyu.service;
+package com.muyu.cloud.etl.service;
 
 import com.muyu.domain.AssetImpower;
 

cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java

@@ -1,4 +1,4 @@
-package com.muyu.cloud.pay.service;
+package com.muyu.cloud.etl.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.domain.Source;

cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java

@@ -1,8 +1,8 @@
-package com.muyu.service.serviceImpl;
+package com.muyu.cloud.etl.service.impl;
 
 import com.muyu.domain.AssetImpower;
-import com.muyu.mapper.EtlMapper;
+import com.muyu.cloud.etl.mapper.EtlMapper;
-import com.muyu.service.EtlService;
+import com.muyu.cloud.etl.service.EtlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java

@@ -1,8 +1,8 @@
-package com.muyu.cloud.pay.service.impl;
+package com.muyu.cloud.etl.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.cloud.pay.mapper.SourceMapper;
+import com.muyu.cloud.etl.mapper.SourceMapper;
-import com.muyu.cloud.pay.service.SourceService;
+import com.muyu.cloud.etl.service.SourceService;
 import com.muyu.domain.Source;
 import com.muyu.domain.req.SourceReq;
 import org.springframework.beans.factory.annotation.Autowired;

cloud-etl-server/src/main/resources/mapper/EtlMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.mapper.EtlMapper">
+<mapper namespace="com.muyu.cloud.etl.mapper.EtlMapper">
     <sql id="selectAssetDataDictVo">
         select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict
     </sql>

cloud-etl-server/src/main/resources/mapper/SourceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.cloud.pay.mapper.SourceMapper">
+<mapper namespace="com.muyu.cloud.etl.mapper.SourceMapper">
     <resultMap type="com.muyu.domain.Source" id="SourceMapper">
         <result property="id"    column="id"    />
         <result property="dataResourceName"    column="data_resource_name"    />

logs/cloud-etl/error.log

@@ -124,7 +124,7 @@ java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 12 millise
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 21:57:14.841 [com.alibaba.nacos.client.Worker.2] ERROR c.a.n.c.a.i.p.HttpLoginProcessor - [getResponse,102] - [NacosClientAuthServiceImpl] login http request failed url: http://106.14.148.95:8848/nacos/v1/auth/users/login, params: {username=nacos}, bodyMap: {password=nacos}, errorMsg: Connect timed out
 21:57:16.380 [com.alibaba.nacos.client.remote.worker.1] ERROR c.a.n.c.r.c.g.GrpcClient - [printIfErrorEnabled,102] - Server check fail, please check server 106.14.148.95 ,port 9848 is available , error ={}
 java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 9 milliseconds, 898000 nanoseconds delay) for com.alibaba.nacos.shaded.io.grpc.stub.ClientCalls$GrpcFuture@5c8066ca[status=PENDING, info=[GrpcFuture{clientCall=PendingCall{realCall=ClientCallImpl{method=MethodDescriptor{fullMethodName=Request/request, type=UNARY, idempotent=false, safe=false, sampledToLocalTracing=true, requestMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@493da830, responseMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@1f939a0f, schemaDescriptor=com.alibaba.nacos.api.grpc.auto.RequestGrpc$RequestMethodDescriptorSupplier@45658133}}}}]]
@@ -187,7 +187,7 @@ java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 9 millisec
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 21:57:19.986 [com.alibaba.nacos.client.remote.worker.1] ERROR c.a.n.c.r.c.g.GrpcClient - [printIfErrorEnabled,102] - Server check fail, please check server 106.14.148.95 ,port 9848 is available , error ={}
 java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 240200 nanoseconds delay) for com.alibaba.nacos.shaded.io.grpc.stub.ClientCalls$GrpcFuture@71df9047[status=PENDING, info=[GrpcFuture{clientCall=PendingCall{realCall=ClientCallImpl{method=MethodDescriptor{fullMethodName=Request/request, type=UNARY, idempotent=false, safe=false, sampledToLocalTracing=true, requestMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@493da830, responseMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@1f939a0f, schemaDescriptor=com.alibaba.nacos.api.grpc.auto.RequestGrpc$RequestMethodDescriptorSupplier@45658133}}}}]]
 	at com.alibaba.nacos.shaded.com.google.common.util.concurrent.AbstractFuture.get(AbstractFuture.java:531)
@@ -249,7 +249,7 @@ java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 14 millise
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 21:57:20.860 [com.alibaba.nacos.client.Worker.4] ERROR c.a.n.c.a.i.p.HttpLoginProcessor - [getResponse,102] - [NacosClientAuthServiceImpl] login http request failed url: http://106.14.148.95:8848/nacos/v1/auth/users/login, params: {username=nacos}, bodyMap: {password=nacos}, errorMsg: Connect timed out
 21:57:22.368 [com.alibaba.nacos.client.naming.security.0] ERROR c.a.n.c.a.i.p.HttpLoginProcessor - [getResponse,102] - [NacosClientAuthServiceImpl] login http request failed url: http://106.14.148.95:8848/nacos/v1/auth/users/login, params: {username=nacos}, bodyMap: {password=nacos}, errorMsg: Connect timed out
 21:57:23.420 [main] ERROR c.a.n.c.r.c.g.GrpcClient - [printIfErrorEnabled,102] - Server check fail, please check server 106.14.148.95 ,port 9848 is available , error ={}
@@ -299,7 +299,7 @@ java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 8 millisec
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 21:57:23.529 [main] ERROR c.a.n.c.r.client - [printIfErrorEnabled,102] - Send request fail, request = InstanceRequest{headers={app=unknown}, requestId='null'}, retryTimes = 0, errorMessage = Client not connected, current status:STARTING
 21:57:23.630 [main] ERROR c.a.n.c.r.client - [printIfErrorEnabled,102] - Send request fail, request = InstanceRequest{headers={app=unknown}, requestId='null'}, retryTimes = 1, errorMessage = Client not connected, current status:STARTING
 21:57:23.715 [com.alibaba.nacos.client.remote.worker.1] ERROR c.a.n.c.r.c.g.GrpcClient - [printIfErrorEnabled,102] - Server check fail, please check server 106.14.148.95 ,port 9848 is available , error ={}
@@ -353,7 +353,7 @@ com.alibaba.nacos.api.exception.NacosException: Client not connected, current st
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 21:57:26.438 [com.alibaba.nacos.client.remote.worker.1] ERROR c.a.n.c.r.c.g.GrpcClient - [printIfErrorEnabled,102] - Server check fail, please check server 106.14.148.95 ,port 9848 is available , error ={}
 java.util.concurrent.TimeoutException: Waited 3000 milliseconds (plus 9 milliseconds, 160100 nanoseconds delay) for com.alibaba.nacos.shaded.io.grpc.stub.ClientCalls$GrpcFuture@35167b0a[status=PENDING, info=[GrpcFuture{clientCall=PendingCall{realCall=ClientCallImpl{method=MethodDescriptor{fullMethodName=Request/request, type=UNARY, idempotent=false, safe=false, sampledToLocalTracing=true, requestMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@493da830, responseMarshaller=com.alibaba.nacos.shaded.io.grpc.protobuf.lite.ProtoLiteUtils$MessageMarshaller@1f939a0f, schemaDescriptor=com.alibaba.nacos.api.grpc.auto.RequestGrpc$RequestMethodDescriptorSupplier@45658133}}}}]]
 	at com.alibaba.nacos.shaded.com.google.common.util.concurrent.AbstractFuture.get(AbstractFuture.java:531)
@@ -456,7 +456,7 @@ org.springframework.context.ApplicationContextException: Failed to start bean 'w
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 Caused by: java.lang.reflect.UndeclaredThrowableException: null
 	at org.springframework.util.ReflectionUtils.rethrowRuntimeException(ReflectionUtils.java:147)
 	at com.alibaba.cloud.nacos.registry.NacosServiceRegistry.register(NacosServiceRegistry.java:83)
@@ -525,7 +525,7 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
@@ -595,7 +595,7 @@ The last packet sent successfully to the server was 0 milliseconds ago. The driv
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 Caused by: com.mysql.cj.exceptions.CJCommunicationsException: Communications link failure
 
 The last packet sent successfully to the server was 0 milliseconds ago. The driver has not received any packets from the server.
@@ -730,7 +730,7 @@ org.springframework.beans.factory.BeanCreationException: Error creating bean wit
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
-	at com.muyu.cloud.pay.MuYuPayApplication.main(MuYuPayApplication.java:14)
+	at com.muyu.cloud.etl.MuYuPayApplication.main(MuYuPayApplication.java:14)
 Caused by: com.baomidou.dynamic.datasource.exception.ErrorCreateDataSourceException: druid create error
 	at com.baomidou.dynamic.datasource.creator.druid.DruidDataSourceCreator.createDataSource(DruidDataSourceCreator.java:139)
 	at com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator.createDataSource(DefaultDataSourceCreator.java:97)

pom.xml

@@ -6,8 +6,8 @@
 
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-server</artifactId>
+        <artifactId>cloud-server-parent</artifactId>
-        <version>3.6.3</version>
+        <version>3.6.4</version>
     </parent>
 
     <groupId>com.muyu</groupId>