diff --git a/campaign/pom.xml b/campaign/pom.xml deleted file mode 100644 index 3d3a28c9..00000000 --- a/campaign/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - 4.0.0 - yo-campaign - 0.0.1-RELEASE - Yo Campaign - Yo Campaign - jar - - - com.pudonghot.yo - yo - 0.0.1-SNAPSHOT - ../ - - - - com.pudonghot.yo.campaign.YoCampaign - - - - - com.pudonghot.yo - yo-fsagent-api - - - com.pudonghot.yo - yo-openapi-dto - - - com.pudonghot.yo - yo-service-common - - - com.wacai.tigon - tigon-common - - - com.pudonghot.yo - yo-web-common - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - io.github.openfeign - feign-httpclient - - - io.github.openfeign - feign-jackson - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.apache.dubbo - dubbo-spring-boot-starter - - - org.apache.dubbo - dubbo-dependencies-zookeeper - pom - - - - org.projectlombok - lombok - provided - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - false - true - - - - pl.project13.maven - git-commit-id-plugin - - - - diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/YoCampaign.java b/campaign/src/main/java/com/pudonghot/yo/campaign/YoCampaign.java deleted file mode 100644 index 6161f051..00000000 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/YoCampaign.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.pudonghot.yo.campaign; - -import org.springframework.boot.SpringApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Donghuang - * @date Jul 18, 2020 17:25:36 - */ -@EnableFeignClients -@SpringBootApplication -public class YoCampaign { - - /** - * main - * - * @param args args - */ - public static void main(final String[] args) { - SpringApplication.run(YoCampaign.class, args); - } -} diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/controller/SiteController.java b/campaign/src/main/java/com/pudonghot/yo/campaign/controller/SiteController.java deleted file mode 100644 index cbd42728..00000000 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/controller/SiteController.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pudonghot.yo.campaign.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Donghuang - * @date Jul 18, 2020 17:24:13 - */ -@Controller -public class SiteController { - - @GetMapping("/") - public void index() { - } -} diff --git a/campaign/src/main/resources/application-test.properties b/campaign/src/main/resources/application-test.properties deleted file mode 100644 index ade2116d..00000000 --- a/campaign/src/main/resources/application-test.properties +++ /dev/null @@ -1,36 +0,0 @@ -# Yo Campaign -server.port=8086 -spring.application.name=yo-campaign -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.write-dates-as-timestamps=true -spring.jackson.serialization.fail-on-empty-beans=false -spring.servlet.multipart.max-file-size=256MB -spring.servlet.multipart.max-request-size=256MB -site.context-path= - -tigon.query-service.scan.page-size=512 - -# Datasource Yo -yo.datasource.url=jdbc:mysql://localhost/callcenter?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -yo.datasource.username=yo -yo.datasource.password=yo_query! - -# Datasource FreeSWITCH -yo.fs.datasource.url=jdbc:mysql://localhost/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -yo.fs.datasource.username=freeswitch -yo.fs.datasource.password=RR!h5IpirsnJ - -# Redis -spring.redis.host=localhost -spring.redis.port=6379 -# spring.redis.password=123456 - -# Dubbo -dubbo.registry.address=zookeeper://localhost:2181 -dubbo.registry.file=${user.home}/dubbo-cache/${spring.application.name}/dubbo.cache -yo.fsagent.dubbo.service.version=1.0.0 - -# Calling List -yo.campaign.feign.calling-list.base-url=http://localhost:1116 -yo.campaign.feign.calling-list.channel=campaign.json - diff --git a/campaign/src/main/resources/application.properties b/campaign/src/main/resources/application.properties deleted file mode 100644 index db475420..00000000 --- a/campaign/src/main/resources/application.properties +++ /dev/null @@ -1,36 +0,0 @@ -server.port=8087 -spring.application.name=yo-campaign -spring.jackson.time-zone=GMT+8 -spring.jackson.serialization.write-dates-as-timestamps=true -spring.jackson.serialization.fail-on-empty-beans=false - -tigon.query-service.scan.page-size=512 - -# Datasource -yo.datasource.url=jdbc:mysql://localhost/yoqw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -yo.datasource.username=yoqw -yo.datasource.password=yoqw_query! - -# Datasource FreeSWITCH -yo.fs.datasource.url=jdbc:mysql://localhost/fs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -yo.fs.datasource.username=freeswitch -yo.fs.datasource.password=RR!h5IpirsnJ - -# Redis -spring.redis.host=localhost -spring.redis.port=6379 -spring.redis.password=123456 - -# Dubbo - -## Dubbo Registry -dubbo.registry.address=zookeeper://localhost:2181 -dubbo.registry.file=${user.home}/dubbo-cache/${spring.application.name}/dubbo.cache -yo.fsagent.dubbo.service.version=1.0.0 - -# Calling List -#yo.campaign.feign.calling-list.base-url=http://localhost:8093/callinglist -#yo.campaign.feign.calling-list.channel=dx-hzqw - -yo.campaign.feign.calling-list.base-url=http://localhost:1116 -yo.campaign.feign.calling-list.channel=callinglist.json diff --git a/campaign/src/main/resources/logback.xml b/campaign/src/main/resources/logback.xml deleted file mode 100644 index e20bd991..00000000 --- a/campaign/src/main/resources/logback.xml +++ /dev/null @@ -1,37 +0,0 @@ - -> - - - - - - true - - %magenta(%d{"yyyy-MM-dd HH:mm:ss,SSS"}) [%thread][%X{traceId}] %highlight(%-5level) %cyan(%logger{15}) - %msg %n - - - - - ${log.dir}/${project.artifactId}.log - - %d{"yyyy-MM-dd HH:mm:ss,SSS"} [%thread][%X{traceId}] %-5level %logger{15} %msg %n - - - ${log.dir}/%d{yyyy-MM, aux}/${project.artifactId}-%d{yyyy-MM-dd}.%i.log - - 32MB - - - - - - - - - - - - - - - diff --git a/campaign/src/main/resources/spring/spring-yo-campaign.xml b/campaign/src/main/resources/spring/spring-yo-campaign.xml deleted file mode 100644 index 1b95140a..00000000 --- a/campaign/src/main/resources/spring/spring-yo-campaign.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/campaign/src/main/resources/static/check_backend_active.html b/campaign/src/main/resources/static/check_backend_active.html deleted file mode 100644 index a0aba931..00000000 --- a/campaign/src/main/resources/static/check_backend_active.html +++ /dev/null @@ -1 +0,0 @@ -OK \ No newline at end of file diff --git a/campaign/src/test/resources/spring/spring-test.xml b/campaign/src/test/resources/spring/spring-test.xml deleted file mode 100644 index 678e2c60..00000000 --- a/campaign/src/test/resources/spring/spring-test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/pom.xml b/pom.xml index 5290570c..955045af 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ lib server cms - campaign diff --git a/campaign/callinglist.json b/server/callinglist.json similarity index 100% rename from campaign/callinglist.json rename to server/callinglist.json diff --git a/server/pom.xml b/server/pom.xml index a5fa41a6..f5d8fb53 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -62,6 +62,18 @@ org.springframework.boot spring-boot-starter-freemarker + + org.springframework.cloud + spring-cloud-starter-openfeign + + + io.github.openfeign + feign-httpclient + + + io.github.openfeign + feign-jackson + org.springframework.boot spring-boot-starter-actuator diff --git a/server/src/main/java/com/pudonghot/yo/YoServer.java b/server/src/main/java/com/pudonghot/yo/YoServer.java index e7b0e0f3..0ce8571e 100644 --- a/server/src/main/java/com/pudonghot/yo/YoServer.java +++ b/server/src/main/java/com/pudonghot/yo/YoServer.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer; @@ -14,6 +15,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * Dec 02, 2019 21:06:05 */ @Slf4j +@EnableFeignClients @SpringBootApplication public class YoServer implements WebMvcConfigurer { diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/feign/config/FeignClientConfiguration.java b/server/src/main/java/com/pudonghot/yo/campaign/feign/config/FeignClientConfiguration.java similarity index 100% rename from campaign/src/main/java/com/pudonghot/yo/campaign/feign/config/FeignClientConfiguration.java rename to server/src/main/java/com/pudonghot/yo/campaign/feign/config/FeignClientConfiguration.java diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/feign/response/RespCallingList.java b/server/src/main/java/com/pudonghot/yo/campaign/feign/response/RespCallingList.java similarity index 100% rename from campaign/src/main/java/com/pudonghot/yo/campaign/feign/response/RespCallingList.java rename to server/src/main/java/com/pudonghot/yo/campaign/feign/response/RespCallingList.java diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java b/server/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java similarity index 85% rename from campaign/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java rename to server/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java index efc7aee0..58be2dc6 100644 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java +++ b/server/src/main/java/com/pudonghot/yo/campaign/feign/service/FeignCallingListService.java @@ -11,19 +11,20 @@ import com.pudonghot.yo.campaign.feign.config.FeignClientConfiguration; * donghuang@wacai.com
* Jan 07, 2020 14:36:47 */ -@FeignClient(url = "${yo.campaign.feign.calling-list.base-url}", +@FeignClient(url = "${yo.campaign.calling-list.feign.base-url}", name = "CampaignFeign", configuration = FeignClientConfiguration.class) public interface FeignCallingListService { /** - * fetch calling list + * fetch calling list + * * @param numData num data * @param campaignKey campaign key * @param campaignName campaign name * @return calling list */ - @RequestMapping("/${yo.campaign.feign.calling-list.channel}") + @RequestMapping("/${yo.campaign.calling-list.feign.channel}") RespCallingList fetchCallingList( @RequestParam("datanum") int numData, diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/CallingListService.java b/server/src/main/java/com/pudonghot/yo/campaign/service/CallingListService.java similarity index 100% rename from campaign/src/main/java/com/pudonghot/yo/campaign/service/CallingListService.java rename to server/src/main/java/com/pudonghot/yo/campaign/service/CallingListService.java diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/CampaignService.java b/server/src/main/java/com/pudonghot/yo/campaign/service/CampaignService.java similarity index 100% rename from campaign/src/main/java/com/pudonghot/yo/campaign/service/CampaignService.java rename to server/src/main/java/com/pudonghot/yo/campaign/service/CampaignService.java diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java similarity index 91% rename from campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java index bcc9e611..838987c4 100644 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java @@ -20,6 +20,7 @@ import com.pudonghot.yo.mapper.CallingListMapper; import com.pudonghot.yo.model.domain.CallingList; import org.springframework.context.annotation.Lazy; import org.apache.commons.lang3.time.DateFormatUtils; +import com.pudonghot.yo.service.LeaderElectionService; import com.pudonghot.yo.mapper.CallingListPreparedMapper; import com.pudonghot.yo.model.domain.CallingListPrepared; import com.pudonghot.yo.campaign.service.CampaignService; @@ -52,6 +53,8 @@ public class CallingListServiceImpl private CallingListPreparedMapper callingListPreparedMapper; @Autowired private CallingListHistoricalMapper callingListHistoricalMapper; + @Autowired + private LeaderElectionService leaderElectionService; @Value("${yo.campaign.calling-list-lock-expire.seconds:300}") private int expireLockDuration; @@ -60,6 +63,12 @@ public class CallingListServiceImpl @Scheduled(fixedRateString = "${yo.campaign.calling-list-lock-expire.rate:120000}") public void expireLock() { + + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore campaign calling list expire lock scheduler task."); + return; + } + log.info("Expire calling list lock task."); val update = new HashMap(8); update.put(CallingList.STATUS, CallingList.Status.READY); @@ -77,6 +86,12 @@ public class CallingListServiceImpl @Scheduled(fixedRateString = "${yo.campaign.calling-list.task-scheduler.fixed-rate:300000}", initialDelayString = "${yo.campaign.calling-list.task-scheduler.init-delay:32000}") public void fetchRemoteTaskScheduler() { + + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore campaign calling list fetch remote scheduler task."); + return; + } + log.debug("Campaign fetch remote calling list task."); val secondOfDay = TimeUtils.secondOfDay(new Date()); campaignService.scan(new Search(Campaign.ACTIVE, true) @@ -101,6 +116,12 @@ public class CallingListServiceImpl @Scheduled(cron = "${yo.campaign.calling-list.batch-cron:1 1 1 * * *}") public void deleteCalled() { + + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore campaign delete calling list scheduler task."); + return; + } + log.info("Delete called calling list."); val deleteCalled = mapper.delete( new Search(CallingList.STATUS, diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java similarity index 94% rename from campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java index 2d41c1b6..5c8fd601 100644 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java @@ -15,6 +15,7 @@ import com.pudonghot.yo.model.domain.Campaign; import com.pudonghot.yo.mapper.AgentStatusMapper; import org.springframework.context.annotation.Lazy; import com.pudonghot.yo.service.CommonCallDataService; +import com.pudonghot.yo.service.LeaderElectionService; import com.pudonghot.yo.fsagent.api.CampaignDialService; import com.pudonghot.yo.campaign.service.CampaignService; import org.springframework.beans.factory.annotation.Value; @@ -49,10 +50,18 @@ public class CampaignServiceImpl private CampaignDialService dialService; @Autowired private CommonCallDataService commonCallDataService; + @Autowired + private LeaderElectionService leaderElectionService; @Scheduled(fixedRateString = "${yo.campaign.task-scheduler.fixed-rate:6000}", initialDelayString = "${yo.campaign.task-scheduler.init-delay:32000}") public void taskScheduler() { + + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore campaign scheduler task."); + return; + } + val secondOfDay = TimeUtils.secondOfDay(new Date()); scan(new Search(Campaign.ACTIVE, true) .eq(Campaign.STATUS, Campaign.Status.RUNNING) diff --git a/server/src/main/resources/application-prod.yml b/server/src/main/resources/application-prod.yml index 61606787..49bc2e8a 100644 --- a/server/src/main/resources/application-prod.yml +++ b/server/src/main/resources/application-prod.yml @@ -1,7 +1,14 @@ server: - port: 28080 -site: - context-path: '' + port: 1893 + +tigon: + web: + jsonview: + success-key: success + data-key: + code-key: retcode + code-type: string + message-key: message spring: application: @@ -54,7 +61,7 @@ yo: password: RR!h5IpirsnJ fsagent: server: - # Nginx Server Port + # Nginx Port port: 8080 agent-status: audio: @@ -71,4 +78,16 @@ yo: file-ext: .mp3 recording-server: base-path: http://172.20.23.188:8080/rec/ - + leader: + lock-name: LOCK_LEADER_SERVER + campaign: + task-scheduler: + fixed-rate: 8000 + dial-batch: 36 + calling-list: + task-scheduler: + fixed-rate: 240000 + batch-cron: 12 12 0 * * * + feign: + base-url: http://stsl.wldmz.cc/stsl-web-partner/call-data/taskdata + channel: dx-hzqw diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 1f8b32b6..2f4e7e46 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -3,9 +3,18 @@ server: error: include-stacktrace: always +tigon: + web: + jsonview: + success-key: success + code-key: retcode + code-type: string + message-key: message + data-key: + spring: application: - name: yo-fsagent + name: yo-server freemarker: cache: false settings: @@ -40,8 +49,6 @@ dubbo: file: ${user.home}/dubbo-cache/${spring.application.name}/dubbo.cache scan: base-packages: com.pudonghot.yo.fsagent.service.dubbo.impl -site: - context-path: '' yo: datasource: @@ -70,3 +77,14 @@ yo: version: 1.0.0 recording-server: base-path: http://172.16.52.80/fs/rec/ + campaign: + task-scheduler: + fixed-rate: 8000 + dial-batch: 36 + calling-list: + task-scheduler: + fixed-rate: 240000 + batch-cron: 12 12 0 * * * + feign: + base-url: http://stsl.wldmz.cc/stsl-web-partner/call-data/taskdata + channel: dx-hzqw diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java b/server/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java similarity index 91% rename from campaign/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java rename to server/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java index a41c9a3e..59935933 100644 --- a/campaign/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/campaign/FeignCallingListServiceTest.java @@ -3,6 +3,7 @@ package com.pudonghot.yo.campaign; import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; +import com.pudonghot.yo.YoServer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoCampaign.class) +@SpringBootTest(classes = YoServer.class) public class FeignCallingListServiceTest { @Autowired diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/TestDriver.java b/server/src/test/java/com/pudonghot/yo/campaign/TestDriver.java similarity index 100% rename from campaign/src/test/java/com/pudonghot/yo/campaign/TestDriver.java rename to server/src/test/java/com/pudonghot/yo/campaign/TestDriver.java diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java b/server/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java similarity index 89% rename from campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java rename to server/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java index 89a64f83..c2ec2ce5 100644 --- a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java @@ -3,10 +3,10 @@ package com.pudonghot.yo.campaign.service; import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; +import com.pudonghot.yo.YoServer; import lombok.extern.slf4j.Slf4j; import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.sequence.IdSequence; -import com.pudonghot.yo.campaign.YoCampaign; import com.pudonghot.yo.model.domain.Campaign; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoCampaign.class) +@SpringBootTest(classes = YoServer.class) public class CallingListServiceTest { @Autowired private CampaignService campaignService; @@ -31,7 +31,7 @@ public class CallingListServiceTest { public void testFetchRemote() { val campaign = campaignService.find( new Search(Campaign.CAMPAIGN_KEY, "5694")); - callingListService.fetchRemote(idSeq.get(), campaign); + callingListService.fetchRemote(idSeq.uuid(), campaign); } @Test diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java b/server/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java similarity index 90% rename from campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java rename to server/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java index 3965c01e..f1fa9af0 100644 --- a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java @@ -3,9 +3,9 @@ package com.pudonghot.yo.campaign.service; import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; +import com.pudonghot.yo.YoServer; import lombok.extern.slf4j.Slf4j; import me.chyxion.tigon.mybatis.Search; -import com.pudonghot.yo.campaign.YoCampaign; import com.pudonghot.yo.model.domain.Campaign; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoCampaign.class) +@SpringBootTest(classes = YoServer.class) public class CampaignServiceTest { @Autowired private CampaignService campaignService; diff --git a/server/src/test/resources/spring/spring-test.xml b/server/src/test/resources/spring/spring-test.xml index e569cc31..678e2c60 100644 --- a/server/src/test/resources/spring/spring-test.xml +++ b/server/src/test/resources/spring/spring-test.xml @@ -1,14 +1,6 @@ - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd">