From d494452a15badd95661ab53e247a54deaf08817b Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Tue, 10 Sep 2024 15:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/basic/SourceConfig.java | 1 + .../src/main/java/com/muyu/mysql/MySqlDataSource.java | 1 + .../src/main/java/com/muyu/data/base/BaseDataAbsSource.java | 1 - .../src/main/java/com/muyu/data/base/BaseQuery.java | 1 + .../src/main/java/com/muyu/data/base/BaseQueryHandler.java | 1 + cloud-etl-server/pom.xml | 5 +---- .../com/muyu/cloud/etl/controller/AccreditController.java | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloud-etl-client/src/main/java/com/muyu/basic/SourceConfig.java b/cloud-etl-client/src/main/java/com/muyu/basic/SourceConfig.java index cf2154a..12f5801 100644 --- a/cloud-etl-client/src/main/java/com/muyu/basic/SourceConfig.java +++ b/cloud-etl-client/src/main/java/com/muyu/basic/SourceConfig.java @@ -5,3 +5,4 @@ import com.muyu.domain.Source; public interface SourceConfig { public Source findSourceById(Long id); } + diff --git a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java index 588e00a..a7c55bd 100644 --- a/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java +++ b/cloud-etl-client/src/main/java/com/muyu/mysql/MySqlDataSource.java @@ -430,4 +430,5 @@ public class MySqlDataSource extends BaseDataAbsSource { } + } diff --git a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataAbsSource.java b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataAbsSource.java index 23d54f2..47f7ffa 100644 --- a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataAbsSource.java +++ b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseDataAbsSource.java @@ -3,7 +3,6 @@ package com.muyu.data.base; public abstract class BaseDataAbsSource implements BaseDataSource{ - @Override public void setQuery(BaseQuery baseQuery){ BaseQueryHandler.set(baseQuery); diff --git a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQuery.java b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQuery.java index 40a224d..b4217a9 100644 --- a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQuery.java +++ b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQuery.java @@ -13,3 +13,4 @@ import lombok.experimental.SuperBuilder; public class BaseQuery { private Long dataSourceId; } + diff --git a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQueryHandler.java b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQueryHandler.java index c49f204..8f53a55 100644 --- a/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQueryHandler.java +++ b/cloud-etl-common/src/main/java/com/muyu/data/base/BaseQueryHandler.java @@ -16,3 +16,4 @@ public class BaseQueryHandler { } } + diff --git a/cloud-etl-server/pom.xml b/cloud-etl-server/pom.xml index 0c414b1..8462130 100644 --- a/cloud-etl-server/pom.xml +++ b/cloud-etl-server/pom.xml @@ -32,8 +32,6 @@ - - com.oracle.database.jdbc @@ -56,8 +54,7 @@ com.muyu cloud-etl-common - 1.0.1 - compile + 1.0.0 diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java index 39773cb..b05ed00 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/AccreditController.java @@ -9,7 +9,6 @@ import com.muyu.domain.rep.AccreditUserRep; import com.muyu.domain.req.AccreditReq; import com.muyu.mysql.MySqlDataSource; import com.muyu.mysql.MySqlQuery; -import lombok.extern.java.Log; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -76,4 +75,5 @@ public class AccreditController { + }