diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java b/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java index 09b7861..501c63d 100644 --- a/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java +++ b/cloud-etl-common/src/main/java/com/muyu/domain/TableInfo.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.TreeEntity; +import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @EqualsAndHashCode(callSuper = true) @TableName(value ="table_info") //数据库表相关 -public class TableInfo extends TreeEntity { +public class TableInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -47,7 +47,6 @@ public class TableInfo extends TreeEntity { @Excel(name = "是否核心 'Y'是 'N'不是") private String center; - private Long parentId; } diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java index b26255e..fb54aff 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java @@ -248,6 +248,7 @@ public class SourceServiceImpl extends ServiceImpl impleme String NumericScale = String.valueOf(resultSet.getInt(8)); String isNullable = String.valueOf(resultSet.getObject(9)); String columnDefault = String.valueOf(resultSet.getObject(10)); + Structure build = Structure.builder() .tableId(table.getId()) .columnName(String.valueOf(columnName)) diff --git a/logs/cloud-etl/info.log b/logs/cloud-etl/info.log index 153eef3..b15ab78 100644 --- a/logs/cloud-etl/info.log +++ b/logs/cloud-etl/info.log @@ -108,3 +108,49 @@ 20:40:49.925 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed 20:40:49.925 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success, 20:40:49.925 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye +20:54:43.023 [main] INFO c.m.c.e.MuYuEtlApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev" +20:54:45.173 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +20:54:45.173 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24] +20:54:45.251 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +20:54:46.519 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited +20:54:46.520 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success +20:54:46.521 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master] +20:54:46.614 [main] INFO c.m.c.d.MyMetaObjectHandler - [,17] - 元对象字段填充控制器 ------- 加载完成 +20:54:47.485 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**]. +20:54:51.633 [main] INFO c.m.c.x.XXLJobConfig - [xxlJobExecutor,25] - >>>>>>>>>>> xxl-job config init success. +20:54:53.893 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-one-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@2b33553b[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoOneParam] +20:54:53.893 [main] INFO c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-no-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@4ba62429[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoNoParam] +20:54:54.161 [Thread-12] INFO c.x.j.c.s.EmbedServer - [run,82] - >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9999 +20:54:55.169 [main] INFO c.a.n.client.naming - [initNamespaceForNaming,62] - initializer namespace from ans.namespace attribute : null +20:54:55.170 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$0,66] - initializer namespace from ALIBABA_ALIWARE_NAMESPACE attribute :null +20:54:55.170 [main] INFO c.a.n.client.naming - [lambda$initNamespaceForNaming$1,73] - initializer namespace from namespace attribute :null +20:54:55.175 [main] INFO c.a.n.client.naming - [,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource +20:54:55.179 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success. +20:54:55.179 [main] INFO c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success. +20:54:55.280 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of ad49b950-698e-4d0f-9c53-d0168fa275b7 +20:54:55.281 [main] INFO c.a.n.client.naming - [,109] - Create naming rpc client for uuid->ad49b950-698e-4d0f-9c53-d0168fa275b7 +20:54:55.282 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager +20:54:55.282 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService +20:54:55.282 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler +20:54:55.282 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Try to connect to server on start up, server: {serverIp = '47.116.184.54', server main port = 8848} +20:54:55.283 [main] INFO c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:47.116.184.54 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false} +20:54:55.354 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Success to connect to server [47.116.184.54:8848] on start up, connectionId = 1724504096279_139.224.212.27_63388 +20:54:55.354 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler +20:54:55.354 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$632/0x00000136015244a8 +20:54:55.354 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.c.r.client - [printIfInfoEnabled,63] - [ad49b950-698e-4d0f-9c53-d0168fa275b7] Notify connected event to listeners. +20:54:55.354 [com.alibaba.nacos.client.remote.worker.0] INFO c.a.n.client.naming - [onConnected,90] - Grpc connection connect +20:54:55.355 [main] INFO c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] cloud-2112 registering service cloud-source with instance Instance{instanceId='null', ip='192.168.1.101', port=10005, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=null, preserved.register.source=SPRING_CLOUD}} +20:54:55.385 [main] INFO c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-source 192.168.1.101:10005 register finished +20:54:56.574 [main] INFO c.m.c.e.MuYuEtlApplication - [logStarted,56] - Started MuYuEtlApplication in 18.049 seconds (process running for 18.761) +20:54:56.584 [main] INFO c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis +20:54:56.584 [main] INFO c.a.n.c.c.i.CacheData - [,99] - nacos.cache.data.init.snapshot = true +20:54:56.585 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source-dev.yml+DEFAULT_GROUP+cloud-2112 +20:54:56.594 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source-dev.yml, group=DEFAULT_GROUP, cnt=1 +20:54:56.595 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source-dev.yml, group=DEFAULT_GROUP +20:54:56.595 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source.yml+DEFAULT_GROUP+cloud-2112 +20:54:56.595 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source.yml, group=DEFAULT_GROUP, cnt=1 +20:54:56.595 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source.yml, group=DEFAULT_GROUP +20:54:56.596 [main] INFO c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source+DEFAULT_GROUP+cloud-2112 +20:54:56.596 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source, group=DEFAULT_GROUP, cnt=1 +20:54:56.596 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source, group=DEFAULT_GROUP +20:54:56.748 [RMI TCP Connection(2)-172.16.0.4] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'