diff options
Diffstat (limited to 'galaxy-job-executor')
7 files changed, 14 insertions, 19 deletions
diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml index 871e7ac..1e99ae7 100644 --- a/galaxy-job-executor/pom.xml +++ b/galaxy-job-executor/pom.xml @@ -54,14 +54,9 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>com.zdjizhi</groupId> - <artifactId>galaxy</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> + <groupId>com.mesalab</groupId> + <artifactId>galaxy-tool</artifactId> + <version>${project.parent.version}</version> </dependency> </dependencies> diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/HttpClientUtils.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/HttpClientUtils.java index 1c74605..610ab71 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/HttpClientUtils.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/HttpClientUtils.java @@ -2,7 +2,7 @@ package com.mesalab.job.executor.core.utils; import com.mesalab.job.executor.core.config.HttpConfig; import com.mesalab.job.executor.exception.BusinessException; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.StringUtil; import org.apache.commons.io.IOUtils; import org.apache.http.*; import org.apache.http.client.ClientProtocolException; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/KafkaUtils.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/KafkaUtils.java index c92b8c3..4aeda2c 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/KafkaUtils.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/core/utils/KafkaUtils.java @@ -1,7 +1,7 @@ package com.mesalab.job.executor.core.utils; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.kafka.core.KafkaTemplate; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DataflowJob.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DataflowJob.java index c3f75fb..fc080db 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DataflowJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DataflowJob.java @@ -15,8 +15,8 @@ import com.mesalab.job.core.handler.annotation.XxlJob; import com.mesalab.job.core.log.XxlJobLogger; import com.mesalab.job.executor.core.utils.HttpClientUtils; import com.mesalab.job.executor.core.utils.KafkaUtils; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import io.netty.handler.codec.http.HttpMethod; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DruidNativeQueryJob.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DruidNativeQueryJob.java index cf982e3..27724ba 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DruidNativeQueryJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/DruidNativeQueryJob.java @@ -10,8 +10,8 @@ import com.mesalab.job.core.handler.annotation.XxlJob; import com.mesalab.job.core.log.XxlJobLogger; import com.mesalab.job.executor.core.utils.HttpClientUtils; import com.mesalab.job.executor.core.utils.KafkaUtils; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import io.netty.handler.codec.http.HttpMethod; import org.joda.time.DateTimeZone; import org.joda.time.Interval; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/LogStorageQuotaJob.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/LogStorageQuotaJob.java index 6ed7233..cb2ddf7 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/LogStorageQuotaJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/jobhandler/LogStorageQuotaJob.java @@ -14,7 +14,7 @@ import com.mesalab.job.core.biz.model.ReturnT; import com.mesalab.job.core.handler.IJobHandler; import com.mesalab.job.core.handler.annotation.XxlJob; import com.mesalab.job.core.log.XxlJobLogger; -import com.zdjizhi.utils.*; +import com.mesalab.tool.utils.*; import org.apache.http.Header; import org.apache.http.message.BasicHeader; import org.slf4j.Logger; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/service/StorageQuotaService.java b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/service/StorageQuotaService.java index 3a731a3..edab813 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/job/executor/service/StorageQuotaService.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/job/executor/service/StorageQuotaService.java @@ -11,9 +11,9 @@ import com.mesalab.job.executor.core.utils.JobUtil; import com.mesalab.job.executor.core.utils.ZookeeperUtils; import com.mesalab.job.executor.exception.BusinessException; import com.mesalab.job.core.log.XxlJobLogger; -import com.zdjizhi.utils.DateUtils; -import com.zdjizhi.utils.JsonMapper; -import com.zdjizhi.utils.StringUtil; +import com.mesalab.tool.utils.DateUtils; +import com.mesalab.tool.utils.JsonMapper; +import com.mesalab.tool.utils.StringUtil; import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; |