From d0f278624ebefd00182866ff5c7cdb142217bf6b Mon Sep 17 00:00:00 2001 From: snoop Date: Tue, 24 Apr 2018 17:59:56 +0900 Subject: [PATCH] fixed service --- .../central/module/apikey/dao/ApiKeyDAO.java | 3 ++- .../apikey/service/CentralApiKeyService.java | 3 ++- .../central/module/auth/dao/AuthCrawlerDAO.java | 6 ++++-- .../auth/service/CentralAuthCrawlerService.java | 15 +++++++++------ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/loafle/overflow/central/module/apikey/dao/ApiKeyDAO.java b/src/main/java/com/loafle/overflow/central/module/apikey/dao/ApiKeyDAO.java index 6871925..2d2fce3 100644 --- a/src/main/java/com/loafle/overflow/central/module/apikey/dao/ApiKeyDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/apikey/dao/ApiKeyDAO.java @@ -1,8 +1,9 @@ package com.loafle.overflow.central.module.apikey.dao; -import com.loafle.overflow.central.module.domain.model.Domain; + import com.loafle.overflow.model.apikey.ApiKey; +import com.loafle.overflow.model.domain.Domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/central/module/apikey/service/CentralApiKeyService.java b/src/main/java/com/loafle/overflow/central/module/apikey/service/CentralApiKeyService.java index 1837354..a191f12 100644 --- a/src/main/java/com/loafle/overflow/central/module/apikey/service/CentralApiKeyService.java +++ b/src/main/java/com/loafle/overflow/central/module/apikey/service/CentralApiKeyService.java @@ -3,8 +3,9 @@ package com.loafle.overflow.central.module.apikey.service; import com.loafle.overflow.central.commons.exception.OverflowException; import com.loafle.overflow.central.module.apikey.dao.ApiKeyDAO; -import com.loafle.overflow.central.module.domain.model.Domain; + import com.loafle.overflow.model.apikey.ApiKey; +import com.loafle.overflow.model.domain.Domain; import com.loafle.overflow.service.central.apikey.ApiKeyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/loafle/overflow/central/module/auth/dao/AuthCrawlerDAO.java b/src/main/java/com/loafle/overflow/central/module/auth/dao/AuthCrawlerDAO.java index 0e0c18d..279ef42 100644 --- a/src/main/java/com/loafle/overflow/central/module/auth/dao/AuthCrawlerDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/auth/dao/AuthCrawlerDAO.java @@ -1,9 +1,11 @@ package com.loafle.overflow.central.module.auth.dao; -import com.loafle.overflow.central.module.meta.model.MetaCrawler; -import com.loafle.overflow.central.module.target.model.Target; + + import com.loafle.overflow.model.auth.AuthCrawler; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.target.Target; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/central/module/auth/service/CentralAuthCrawlerService.java b/src/main/java/com/loafle/overflow/central/module/auth/service/CentralAuthCrawlerService.java index 28da92d..3162083 100644 --- a/src/main/java/com/loafle/overflow/central/module/auth/service/CentralAuthCrawlerService.java +++ b/src/main/java/com/loafle/overflow/central/module/auth/service/CentralAuthCrawlerService.java @@ -1,13 +1,15 @@ package com.loafle.overflow.central.module.auth.service; -import com.loafle.overflow.central.commons.exception.OverflowException; + import com.loafle.overflow.central.module.auth.dao.AuthCrawlerDAO; -import com.loafle.overflow.central.module.infra.model.Infra; -import com.loafle.overflow.central.module.infra.service.InfraService; -import com.loafle.overflow.central.module.meta.model.MetaCrawler; -import com.loafle.overflow.central.module.target.model.Target; + +import com.loafle.overflow.central.module.infra.service.CentralInfraService; +import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.model.auth.AuthCrawler; +import com.loafle.overflow.model.infra.Infra; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.target.Target; import com.loafle.overflow.service.central.auth.AuthCrawlerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +24,7 @@ public class CentralAuthCrawlerService implements AuthCrawlerService { private AuthCrawlerDAO authCrawlerDAO; @Autowired - private InfraService infraService; + private CentralInfraService infraService; public AuthCrawler regist(AuthCrawler authCrawler) { @@ -39,6 +41,7 @@ public class CentralAuthCrawlerService implements AuthCrawlerService { return this.authCrawlerDAO.save(dbAuthCrawler); } + public boolean checkAuthCrawler(long infraId, MetaCrawler crawler, String authJson) throws OverflowException { Infra infra = this.infraService.read(infraId);