From e47e0cdf65a3e7533d3ee21916b6371634c7bc9d Mon Sep 17 00:00:00 2001 From: geek Date: Wed, 6 Jun 2018 17:08:03 +0900 Subject: [PATCH] email token duplication check --- pom.xml | 2 +- ...{EmailAuthService.java => CentralEmailAuthService.java} | 3 ++- .../module/member/service/CentralMemberService.java | 7 +------ .../module/target/service/CentralTargetService.java | 5 +++++ .../central/module/email/service/EmailAuthServiceTest.java | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) rename src/main/java/com/loafle/overflow/central/module/email/service/{EmailAuthService.java => CentralEmailAuthService.java} (98%) diff --git a/pom.xml b/pom.xml index cae24a8..3e5dfa5 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ com.loafle.overflow commons-java - 1.0.13-SNAPSHOT + 1.0.14-SNAPSHOT diff --git a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java b/src/main/java/com/loafle/overflow/central/module/email/service/CentralEmailAuthService.java similarity index 98% rename from src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java rename to src/main/java/com/loafle/overflow/central/module/email/service/CentralEmailAuthService.java index caf5567..bfc86c1 100644 --- a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java +++ b/src/main/java/com/loafle/overflow/central/module/email/service/CentralEmailAuthService.java @@ -15,6 +15,7 @@ import com.loafle.overflow.model.email.EmailAuth; import com.loafle.overflow.model.member.Member; import com.loafle.overflow.model.meta.MetaEmailStatus; import com.loafle.overflow.model.meta.MetaMemberStatus; +import com.loafle.overflow.service.central.email.EmailAuthService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +27,7 @@ import java.util.*; * Created by geek on 17. 6. 28. */ @Service("EmailAuthService") -public class EmailAuthService { +public class CentralEmailAuthService implements EmailAuthService { private static final String WEB_GO_MEMBER_ADDR = "http://127.0.0.1:4200/#/auth/"; @Autowired diff --git a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java index 87f9639..36bef05 100644 --- a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java +++ b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java @@ -1,14 +1,11 @@ package com.loafle.overflow.central.module.member.service; import com.loafle.overflow.core.annotation.WebappAPI; -import com.loafle.overflow.central.commons.utils.EmailSender; import com.loafle.overflow.central.commons.utils.SessionMetadata; -import com.loafle.overflow.central.module.email.service.EmailAuthService; import com.loafle.overflow.central.module.member.dao.MemberDAO; import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.model.apikey.ApiKey; -import com.loafle.overflow.model.domain.Domain; import com.loafle.overflow.model.domain.DomainMember; import com.loafle.overflow.model.email.EmailAuth; import com.loafle.overflow.model.member.Member; @@ -17,6 +14,7 @@ import com.loafle.overflow.model.meta.MetaMemberStatus; import com.loafle.overflow.service.central.apikey.ApiKeyService; import com.loafle.overflow.service.central.domain.DomainMemberService; +import com.loafle.overflow.service.central.email.EmailAuthService; import com.loafle.overflow.service.central.member.MemberService; import com.loafle.overflow.service.central.probe.ProbeService; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +38,6 @@ public class CentralMemberService implements MemberService { @Autowired private EmailAuthService emailAuthService; - @Autowired - private EmailSender emailSender; - @Autowired private ApiKeyService apiKeyService; diff --git a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java index e69677f..7385d90 100644 --- a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java +++ b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java @@ -8,6 +8,7 @@ import com.loafle.overflow.central.module.infra.service.CentralInfraServiceServi import com.loafle.overflow.central.module.probe.service.CentralProbeService; import com.loafle.overflow.central.module.target.dao.TargetDAO; import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.core.model.PageParams; import com.loafle.overflow.core.type.CryptoType; import com.loafle.overflow.model.discovery.Host; import com.loafle.overflow.model.discovery.Service; @@ -20,6 +21,7 @@ import com.loafle.overflow.model.target.Target; import com.loafle.overflow.service.central.target.TargetService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; import org.springframework.transaction.annotation.Transactional; /** @@ -97,6 +99,9 @@ public class CentralTargetService implements TargetService { return this.targetDAO.findByInfraId(infraService.getId()); } + public Page readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException { + return null; + } @Transactional public List registDiscoveredTargets(Long probeId, List hosts, List services) throws OverflowException { diff --git a/src/test/java/com/loafle/overflow/central/module/email/service/EmailAuthServiceTest.java b/src/test/java/com/loafle/overflow/central/module/email/service/EmailAuthServiceTest.java index f9ac2ce..a1f7856 100644 --- a/src/test/java/com/loafle/overflow/central/module/email/service/EmailAuthServiceTest.java +++ b/src/test/java/com/loafle/overflow/central/module/email/service/EmailAuthServiceTest.java @@ -4,6 +4,7 @@ package com.loafle.overflow.central.module.email.service; import com.loafle.overflow.central.spring.AppConfigTest; import com.loafle.overflow.model.email.EmailAuth; import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.service.central.email.EmailAuthService; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith;