diff --git a/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml b/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml index e6936d9f..7fa2091a 100644 --- a/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml +++ b/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml @@ -9,9 +9,9 @@ class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close" - p:url="${yo.fs.datasource.url}" - p:username="${yo.fs.datasource.username}" - p:password="${yo.fs.datasource.password}" + p:url="${yo.freeswitch.datasource.url}" + p:username="${yo.freeswitch.datasource.username}" + p:password="${yo.freeswitch.datasource.password}" /> diff --git a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapperTest.java b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapperTest.java index 6c621c94..fc03fb41 100644 --- a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapperTest.java +++ b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapperTest.java @@ -1,5 +1,6 @@ package com.pudonghot.yo.fs.mapper; +import me.chyxion.tigon.mybatis.Search; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,6 @@ public class SipRegistrationMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentGroupCampaignWeightMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentGroupCampaignWeightMapperTest.java index 47cb57f1..d8a3a8d0 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentGroupCampaignWeightMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentGroupCampaignWeightMapperTest.java @@ -1,8 +1,9 @@ package com.pudonghot.yo.mapper; import org.junit.Test; -import lombok.extern.slf4j.Slf4j; import org.junit.runner.RunWith; +import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,6 +21,6 @@ public class AgentGroupCampaignWeightMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentMapperTest.java index 000bc4b0..a8145d16 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentMapperTest.java @@ -4,10 +4,10 @@ import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Agent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -23,7 +23,7 @@ public class AgentMapperTest { @Test public void testList() { - val list = mapper.list(null); + val list = mapper.list(new Search()); if (!list.isEmpty()) { val agent = list.iterator().next(); agent.setUpdatedBy("donghuang"); diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java index 63f4c7cc..3cf99269 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java @@ -34,7 +34,7 @@ public class CallDetailRecordMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } @Test diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallRecordingMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallRecordingMapperTest.java index 9dcf31a2..239aaa96 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallRecordingMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallRecordingMapperTest.java @@ -3,6 +3,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,6 +21,6 @@ public class CallRecordingMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/QueueMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/QueueMapperTest.java index ead46151..f0264d53 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/QueueMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/QueueMapperTest.java @@ -1,8 +1,9 @@ package com.pudonghot.yo.mapper; -import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; +import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,6 +21,6 @@ public class QueueMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TelecomVendorMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TelecomVendorMapperTest.java index 3c53ba48..ec1ac8b3 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TelecomVendorMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TelecomVendorMapperTest.java @@ -1,8 +1,9 @@ package com.pudonghot.yo.mapper; -import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; +import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,6 +21,6 @@ public class TelecomVendorMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TenantMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TenantMapperTest.java index c69eb476..4ef3eb5b 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TenantMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TenantMapperTest.java @@ -3,6 +3,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,6 +21,6 @@ public class TenantMapperTest { @Test public void testList() { - mapper.list(null); + mapper.list(new Search()); } } diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/WorkRecordMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/WorkRecordMapperTest.java index 0cf7ae5e..8658c7d0 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/WorkRecordMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/WorkRecordMapperTest.java @@ -1,5 +1,6 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.Search; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; @@ -20,6 +21,6 @@ public class WorkRecordMapperTest { @Test public void testList() { - log.info("Result [{}].", mapper.list(null)); + log.info("Result [{}].", mapper.list(new Search())); } } diff --git a/lib/tigon/common/src/main/java/com/wacai/tigon/sequence/support/IdSequenceSupport.java b/lib/tigon/common/src/main/java/com/wacai/tigon/sequence/support/IdSequenceSupport.java index 9cde8f2a..19f1668e 100644 --- a/lib/tigon/common/src/main/java/com/wacai/tigon/sequence/support/IdSequenceSupport.java +++ b/lib/tigon/common/src/main/java/com/wacai/tigon/sequence/support/IdSequenceSupport.java @@ -1,5 +1,6 @@ package com.wacai.tigon.sequence.support; +import lombok.val; import java.util.UUID; import org.bson.types.ObjectId; import com.wacai.tigon.sequence.IdSequence; @@ -24,8 +25,8 @@ public class IdSequenceSupport implements IdSequence { */ @Override public String uuid() { - final UUID uuid = UUID.randomUUID(); - return Long.toHexString(uuid.getMostSignificantBits()) - + Long.toHexString(uuid.getLeastSignificantBits()); + val uuid = UUID.randomUUID(); + return (Long.toHexString(uuid.getMostSignificantBits()) + + Long.toHexString(uuid.getLeastSignificantBits())).toUpperCase(); } } diff --git a/lib/tigon/pom.xml b/lib/tigon/pom.xml index 5a67cb49..a1a27b02 100644 --- a/lib/tigon/pom.xml +++ b/lib/tigon/pom.xml @@ -21,7 +21,7 @@ 2.12.0 5.2.12.RELEASE 2.3.7.RELEASE - 0.0.5 + 0.0.6 diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/service/AgentService.java b/openapi/src/main/java/com/pudonghot/yo/openapi/service/AgentService.java index 19053761..eecd4bf0 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/service/AgentService.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/service/AgentService.java @@ -11,7 +11,7 @@ public interface AgentService extends BaseCrudService { /** * find valid agent - * @param tenantId tennat id + * @param tenantId tenant id * @param account account * @return agent */ diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java index c4edf7c0..a0715cf3 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java @@ -1,12 +1,13 @@ package com.pudonghot.yo.openapi.service.impl; -import com.pudonghot.yo.model.exception.AssertUtils; -import com.pudonghot.yo.model.exception.ErrorCode; -import com.pudonghot.yo.openapi.service.AgentService; +import lombok.val; import me.chyxion.tigon.mybatis.Search; -import org.springframework.stereotype.Service; import com.pudonghot.yo.mapper.AgentMapper; import com.pudonghot.yo.model.domain.Agent; +import org.springframework.stereotype.Service; +import com.pudonghot.yo.model.exception.ErrorCode; +import com.pudonghot.yo.model.exception.AssertUtils; +import com.pudonghot.yo.openapi.service.AgentService; import com.wacai.tigon.service.support.BaseCrudServiceSupport; /** @@ -23,7 +24,7 @@ public class AgentServiceImpl */ @Override public Agent findValid(final Integer tenantId, final String account) { - final Agent agent = find( + val agent = find( new Search(Agent.TENANT_ID, tenantId) .eq(Agent.ACCOUNT, account)); AssertUtils.state(agent != null, ErrorCode.AGENT_NOT_FOUND); diff --git a/pom.xml b/pom.xml index 26b98878..07d9609d 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,7 @@ lib - fsagent - state + server cms openapi campaign diff --git a/fsagent/pom.xml b/server/pom.xml similarity index 93% rename from fsagent/pom.xml rename to server/pom.xml index 33b6a6d0..a5fa41a6 100644 --- a/fsagent/pom.xml +++ b/server/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - yo-fsagent + yo-server 0.0.1-RELEASE - Yo FreeSWITCH Agent - Yo FreeSWITCH Agent + Yo Server + Yo Server jar @@ -18,7 +18,7 @@ - com.pudonghot.yo.fsagent.YoFsAgent + com.pudonghot.yo.YoServer @@ -113,7 +113,7 @@ spring-boot-maven-plugin false - true + false diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/YoFsAgent.java b/server/src/main/java/com/pudonghot/yo/YoServer.java similarity index 75% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/YoFsAgent.java rename to server/src/main/java/com/pudonghot/yo/YoServer.java index b6ac06a8..73cf357e 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/YoFsAgent.java +++ b/server/src/main/java/com/pudonghot/yo/YoServer.java @@ -1,4 +1,4 @@ -package com.pudonghot.yo.fsagent; +package com.pudonghot.yo; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; @@ -10,13 +10,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @Slf4j @SpringBootApplication -public class YoFsAgent { +public class YoServer { /** * main * @param args args */ public static void main(final String[] args) { - SpringApplication.run(YoFsAgent.class, args); + SpringApplication.run(YoServer.class, args); } } diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/AgentStatusController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/AgentStatusController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/AgentStatusController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/AgentStatusController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/BaseDialplanController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/BaseDialplanController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/BaseDialplanController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/BaseDialplanController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/BaseXmlController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/BaseXmlController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/BaseXmlController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/BaseXmlController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/CallSatisfactionController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/CallSatisfactionController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/CallSatisfactionController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/CallSatisfactionController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/IvrController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/IvrController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/IvrController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/IvrController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/OdbcDsnController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/OdbcDsnController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/OdbcDsnController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/OdbcDsnController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/OnAnswerController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/OnAnswerController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/OnAnswerController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/OnAnswerController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/PatchController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/PatchController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/PatchController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/PatchController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/PostRecordingController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/PostRecordingController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/PostRecordingController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/PostRecordingController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/SiteController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/SiteController.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/SiteController.java rename to server/src/main/java/com/pudonghot/yo/fsagent/controller/SiteController.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/AgentRegister.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/AgentRegister.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/AgentRegister.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/AgentRegister.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/AgentUnregister.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/AgentUnregister.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/AgentUnregister.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/AgentUnregister.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ApplicationStartup.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ApplicationStartup.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ApplicationStartup.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ApplicationStartup.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelCreate.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelCreate.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelCreate.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelCreate.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelDestroy.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelDestroy.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelDestroy.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/CampaignChannelDestroy.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelAnswer.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelAnswer.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelAnswer.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelAnswer.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelCreate.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelCreate.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelCreate.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelCreate.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelDestroy.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelDestroy.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelDestroy.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelDestroy.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupComplete.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupComplete.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupComplete.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupComplete.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupCompleteInIVR.java b/server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupCompleteInIVR.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupCompleteInIVR.java rename to server/src/main/java/com/pudonghot/yo/fsagent/listener/ChannelHangupCompleteInIVR.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/model/IvrMenuAndEntries.java b/server/src/main/java/com/pudonghot/yo/fsagent/model/IvrMenuAndEntries.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/model/IvrMenuAndEntries.java rename to server/src/main/java/com/pudonghot/yo/fsagent/model/IvrMenuAndEntries.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/AgentGroupService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/AgentGroupService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/AgentGroupService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/AgentGroupService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/AgentService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/AgentService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/AgentService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/AgentService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/CallSatisfactionService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/CallSatisfactionService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/CallSatisfactionService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/CallSatisfactionService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/EslClientService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/EslClientService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/EslClientService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/EslClientService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/GatewayService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/GatewayService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/GatewayService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/GatewayService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/IvrMenuService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/IvrMenuService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/IvrMenuService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/IvrMenuService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/LocalApiService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/LocalApiService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/LocalApiService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/LocalApiService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/NumberPrivacyService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/NumberPrivacyService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/NumberPrivacyService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/NumberPrivacyService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/QueueService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/QueueService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/QueueService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/QueueService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/RecordingService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/RecordingService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/RecordingService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/RecordingService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/TenantService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/TenantService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/TenantService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/TenantService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/TrunkService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/TrunkService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/TrunkService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/TrunkService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Call.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Call.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Call.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Call.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanConfig.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanConfig.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanConfig.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanConfig.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/DialplanService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Suffix.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Suffix.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Suffix.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/Suffix.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService00Echo.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService00Echo.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService00Echo.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService00Echo.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService01Hangup.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService01Hangup.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService01Hangup.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService01Hangup.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService04AgentReady.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService04AgentReady.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService04AgentReady.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService04AgentReady.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService08AgentNotReady.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService08AgentNotReady.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService08AgentNotReady.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService08AgentNotReady.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService12ChannelHold.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService12ChannelHold.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService12ChannelHold.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService12ChannelHold.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService16ChannelUnhold.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService16ChannelUnhold.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService16ChannelUnhold.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService16ChannelUnhold.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService17Ivr.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService17Ivr.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService17Ivr.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService17Ivr.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService20CampaignToIdAndType.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService20CampaignToIdAndType.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService20CampaignToIdAndType.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService20CampaignToIdAndType.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService24AgentToIdAndType.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService24AgentToIdAndType.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService24AgentToIdAndType.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService24AgentToIdAndType.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService28AgentToTrunkPrefix.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService28AgentToTrunkPrefix.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService28AgentToTrunkPrefix.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService28AgentToTrunkPrefix.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService32AgentToAgent.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService32AgentToAgent.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService32AgentToAgent.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService32AgentToAgent.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService36ExternalToAgent.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService36ExternalToAgent.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService36ExternalToAgent.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/DialplanService36ExternalToAgent.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialArg.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialArg.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialArg.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialArg.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerAgent.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerAgent.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerAgent.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerAgent.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/InnerHelpServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/InnerHelpServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/InnerHelpServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/InnerHelpServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/IvrTransferServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/IvrTransferServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/IvrTransferServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/IvrTransferServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentGroupServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentGroupServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentGroupServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentGroupServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallSatisfactionServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallSatisfactionServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallSatisfactionServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallSatisfactionServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/EslClientServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/EslClientServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/EslClientServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/EslClientServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/GatewayServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/GatewayServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/GatewayServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/GatewayServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java similarity index 98% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java index 486c5137..8623c638 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/LocalApiServiceImpl.java @@ -27,7 +27,7 @@ public class LocalApiServiceImpl private final Environment env; @Value("${site.context-path:}") private String siteContextPath; - @Value("${yo.fsa.server.port:}") + @Value("${yo.fsagent.server.port:}") private String serverPort; @Getter private String basePath; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/NumberPrivacyServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/NumberPrivacyServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/NumberPrivacyServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/NumberPrivacyServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/QueueServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/QueueServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/QueueServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/QueueServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/RecordingServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/RecordingServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/RecordingServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/RecordingServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TenantServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TenantServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TenantServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TenantServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/util/CallStrUtils.java b/server/src/main/java/com/pudonghot/yo/fsagent/util/CallStrUtils.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/util/CallStrUtils.java rename to server/src/main/java/com/pudonghot/yo/fsagent/util/CallStrUtils.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/util/EslEventUtils.java b/server/src/main/java/com/pudonghot/yo/fsagent/util/EslEventUtils.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/util/EslEventUtils.java rename to server/src/main/java/com/pudonghot/yo/fsagent/util/EslEventUtils.java diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/util/OdbcUtils.java b/server/src/main/java/com/pudonghot/yo/fsagent/util/OdbcUtils.java similarity index 100% rename from fsagent/src/main/java/com/pudonghot/yo/fsagent/util/OdbcUtils.java rename to server/src/main/java/com/pudonghot/yo/fsagent/util/OdbcUtils.java diff --git a/server/src/main/java/com/pudonghot/yo/state/package-info.java b/server/src/main/java/com/pudonghot/yo/state/package-info.java new file mode 100644 index 00000000..b5b7959e --- /dev/null +++ b/server/src/main/java/com/pudonghot/yo/state/package-info.java @@ -0,0 +1 @@ +package com.pudonghot.yo.state; \ No newline at end of file diff --git a/state/src/main/java/com/pudonghot/yo/state/service/AgentStatusScheduleService.java b/server/src/main/java/com/pudonghot/yo/state/service/AgentStatusScheduleService.java similarity index 100% rename from state/src/main/java/com/pudonghot/yo/state/service/AgentStatusScheduleService.java rename to server/src/main/java/com/pudonghot/yo/state/service/AgentStatusScheduleService.java diff --git a/state/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java b/server/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java similarity index 100% rename from state/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java rename to server/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java index d29db818..2d87ce5a 100644 --- a/state/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java +++ b/server/src/main/java/com/pudonghot/yo/state/service/AgentStatusService.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.state.service; -import com.pudonghot.yo.model.domain.AgentStatus; import com.wacai.tigon.service.BaseCrudService; +import com.pudonghot.yo.model.domain.AgentStatus; /** * @author Donghuang diff --git a/state/src/main/java/com/pudonghot/yo/state/service/SipRegistrationService.java b/server/src/main/java/com/pudonghot/yo/state/service/SipRegistrationService.java similarity index 100% rename from state/src/main/java/com/pudonghot/yo/state/service/SipRegistrationService.java rename to server/src/main/java/com/pudonghot/yo/state/service/SipRegistrationService.java diff --git a/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java b/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java similarity index 89% rename from state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java index 88f55166..64b593ab 100644 --- a/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java @@ -17,6 +17,7 @@ import com.pudonghot.yo.model.agentevent.AgentEvent; import com.pudonghot.yo.service.CommonCampaignService; import com.pudonghot.yo.mapper.CallDetailRecordMapper; import com.pudonghot.yo.model.domain.CallDetailRecord; +import com.pudonghot.yo.service.LeaderElectionService; import com.pudonghot.yo.state.service.AgentStatusService; import static com.pudonghot.yo.model.domain.AgentStatus.*; import org.springframework.beans.factory.annotation.Value; @@ -54,11 +55,19 @@ public class AgentStatusScheduleServiceImpl implements AgentStatusScheduleServic private CommonAgentEventQueueService agentEventQueueService; @Autowired private CommonCampaignService commonCampaignService; + @Autowired + private LeaderElectionService leaderElectionService; @Scheduled(initialDelayString = "${yo.state.agent.registration-check.init-delay:42000}", fixedRateString = "${yo.state.agent.registration-check.rate:32000}") public void agentRegistrationCheck() { - val checkRegKey = idSeq.get(); + log.debug("Check agent registration."); + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore agent registration check."); + return; + } + + val checkRegKey = idSeq.uuid(); agentStatusMapper.update(checkRegKeyUpdate(checkRegKey), new Search().isNull(AgentStatus.CHECK_REG_KEY)); @@ -84,6 +93,12 @@ public class AgentStatusScheduleServiceImpl implements AgentStatusScheduleServic @Scheduled(cron = "${yo.state.agent.status-check.cron:0 * 7-20 * * *}") public void agentStatusCheck() { + log.debug("Check agent status."); + if (!leaderElectionService.isLeader()) { + log.debug("Server is not leader, ignore agent status check."); + return; + } + val dateMaxIdle = DateUtils.addMinutes( new Date(), -agentIdleSignOutMinutes); diff --git a/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusServiceImpl.java b/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusServiceImpl.java similarity index 100% rename from state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusServiceImpl.java diff --git a/state/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java b/server/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java similarity index 69% rename from state/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java rename to server/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java index 1709667a..8bb0ec7c 100644 --- a/state/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/state/service/impl/SipRegistrationServiceImpl.java @@ -11,6 +11,10 @@ import com.wacai.tigon.service.support.BaseQueryServiceSupport; * @date Jul 13, 2020 16:19:53 */ @Service -public class SipRegistrationServiceImpl extends BaseQueryServiceSupport implements SipRegistrationService { +public class SipRegistrationServiceImpl + extends BaseQueryServiceSupport + implements SipRegistrationService { } diff --git a/server/src/main/resources/application-prod.yml b/server/src/main/resources/application-prod.yml new file mode 100644 index 00000000..61606787 --- /dev/null +++ b/server/src/main/resources/application-prod.yml @@ -0,0 +1,74 @@ +server: + port: 28080 +site: + context-path: '' + +spring: + application: + name: yo-server + freemarker: + settings: + number_format: computer + suffix: '' + jackson: + serialization: + fail-on-empty-beans: false + write-dates-as-timestamps: true + time-zone: GMT+8 + redis: + host: localhost + port: 6379 + redisson: + lock-watchdog-timeout: 5000 + servlet: + multipart: + max-file-size: 128MB + max-request-size: 128MB + +dubbo: + application: + qos-accept-foreign-ip: false + qos-enable: true + qos-port: 22222 + protocol: + name: dubbo + port: -1 + provider: + retries: 0 + timeout: 8000 + registry: + address: zookeeper://localhost:2181 + file: ${user.home}/dubbo-cache/${spring.application.name}/dubbo.cache + scan: + base-packages: com.pudonghot.yo.fsagent.service.dubbo.impl + +yo: + datasource: + url: jdbc:mysql://localhost/callcenter?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai + username: yo + password: yo_query! + freeswitch: + datasource: + url: jdbc:mysql://localhost/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai + username: freeswitch + password: RR!h5IpirsnJ + fsagent: + server: + # Nginx Server Port + port: 8080 + agent-status: + audio: + not-ready: + err: http://172.16.46.35/voice/20191126/5ddcfef282745b00016922d9.wav + ok: http://172.16.46.35/voice/20191126/5ddcd2ca82745b00016922d1.wav + ready: + err: http://172.16.46.35/voice/20191126/5ddcfef182745b00016922d5.wav + ok: http://172.16.46.35/voice/20191126/5ddcd2c882745b00016922cd.wav + dubbo: + service: + version: 1.0.0 + recording: + file-ext: .mp3 + recording-server: + base-path: http://172.20.23.188:8080/rec/ + diff --git a/fsagent/src/main/resources/application-test.properties b/server/src/main/resources/application-test.properties similarity index 100% rename from fsagent/src/main/resources/application-test.properties rename to server/src/main/resources/application-test.properties diff --git a/fsagent/src/main/resources/application.yml b/server/src/main/resources/application.yml similarity index 99% rename from fsagent/src/main/resources/application.yml rename to server/src/main/resources/application.yml index 048a5190..1f8b32b6 100644 --- a/fsagent/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -51,7 +51,7 @@ yo: esl: client: host: localhost - fs: + freeswitch: datasource: url: jdbc:mysql://localhost/fs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai username: freeswitch diff --git a/fsagent/src/main/resources/freeswitch-conf.patch b/server/src/main/resources/freeswitch-conf.patch similarity index 100% rename from fsagent/src/main/resources/freeswitch-conf.patch rename to server/src/main/resources/freeswitch-conf.patch diff --git a/fsagent/src/main/resources/logback.xml b/server/src/main/resources/logback.xml similarity index 82% rename from fsagent/src/main/resources/logback.xml rename to server/src/main/resources/logback.xml index 1e0e82a4..f403f4fb 100644 --- a/fsagent/src/main/resources/logback.xml +++ b/server/src/main/resources/logback.xml @@ -1,7 +1,7 @@ > - + true @@ -11,12 +11,12 @@ - ${log.dir}/${project.artifactId}.log + ${log.dir}/app.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 + ${log.dir}/%d{yyyy-MM, aux}/app-%d{yyyy-MM-dd}.%i.log 32MB diff --git a/fsagent/src/main/resources/spring/spring-yo-fsagent.xml b/server/src/main/resources/spring/spring-yo-server.xml similarity index 73% rename from fsagent/src/main/resources/spring/spring-yo-fsagent.xml rename to server/src/main/resources/spring/spring-yo-server.xml index 139c309a..7a413b82 100644 --- a/fsagent/src/main/resources/spring/spring-yo-fsagent.xml +++ b/server/src/main/resources/spring/spring-yo-server.xml @@ -10,8 +10,11 @@ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd"> - - + + diff --git a/fsagent/src/main/resources/static/check_backend_active.html b/server/src/main/resources/static/check_backend_active.html similarity index 100% rename from fsagent/src/main/resources/static/check_backend_active.html rename to server/src/main/resources/static/check_backend_active.html diff --git a/fsagent/src/main/resources/templates/config/acl.conf.xml b/server/src/main/resources/templates/config/acl.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/acl.conf.xml rename to server/src/main/resources/templates/config/acl.conf.xml diff --git a/fsagent/src/main/resources/templates/config/curl.conf.xml b/server/src/main/resources/templates/config/curl.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/curl.conf.xml rename to server/src/main/resources/templates/config/curl.conf.xml diff --git a/fsagent/src/main/resources/templates/config/event_socket.conf.xml b/server/src/main/resources/templates/config/event_socket.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/event_socket.conf.xml rename to server/src/main/resources/templates/config/event_socket.conf.xml diff --git a/fsagent/src/main/resources/templates/config/fifo.conf.xml b/server/src/main/resources/templates/config/fifo.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/fifo.conf.xml rename to server/src/main/resources/templates/config/fifo.conf.xml diff --git a/fsagent/src/main/resources/templates/config/ivr.conf.xml b/server/src/main/resources/templates/config/ivr.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/ivr.conf.xml rename to server/src/main/resources/templates/config/ivr.conf.xml diff --git a/fsagent/src/main/resources/templates/config/logfile.conf.xml b/server/src/main/resources/templates/config/logfile.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/logfile.conf.xml rename to server/src/main/resources/templates/config/logfile.conf.xml diff --git a/fsagent/src/main/resources/templates/config/main.conf.xml b/server/src/main/resources/templates/config/main.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/main.conf.xml rename to server/src/main/resources/templates/config/main.conf.xml diff --git a/fsagent/src/main/resources/templates/config/odbc_cdr.conf.xml b/server/src/main/resources/templates/config/odbc_cdr.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/odbc_cdr.conf.xml rename to server/src/main/resources/templates/config/odbc_cdr.conf.xml diff --git a/fsagent/src/main/resources/templates/config/sofia.conf.xml b/server/src/main/resources/templates/config/sofia.conf.xml similarity index 100% rename from fsagent/src/main/resources/templates/config/sofia.conf.xml rename to server/src/main/resources/templates/config/sofia.conf.xml diff --git a/fsagent/src/main/resources/templates/dialplan/agent-not-ready.xml b/server/src/main/resources/templates/dialplan/agent-not-ready.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/agent-not-ready.xml rename to server/src/main/resources/templates/dialplan/agent-not-ready.xml diff --git a/fsagent/src/main/resources/templates/dialplan/agent-ready.xml b/server/src/main/resources/templates/dialplan/agent-ready.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/agent-ready.xml rename to server/src/main/resources/templates/dialplan/agent-ready.xml diff --git a/fsagent/src/main/resources/templates/dialplan/agent-to-agent.xml b/server/src/main/resources/templates/dialplan/agent-to-agent.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/agent-to-agent.xml rename to server/src/main/resources/templates/dialplan/agent-to-agent.xml diff --git a/fsagent/src/main/resources/templates/dialplan/campaign-to-agent.xml b/server/src/main/resources/templates/dialplan/campaign-to-agent.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/campaign-to-agent.xml rename to server/src/main/resources/templates/dialplan/campaign-to-agent.xml diff --git a/fsagent/src/main/resources/templates/dialplan/channel-hold.xml b/server/src/main/resources/templates/dialplan/channel-hold.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/channel-hold.xml rename to server/src/main/resources/templates/dialplan/channel-hold.xml diff --git a/fsagent/src/main/resources/templates/dialplan/channel-unhold.xml b/server/src/main/resources/templates/dialplan/channel-unhold.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/channel-unhold.xml rename to server/src/main/resources/templates/dialplan/channel-unhold.xml diff --git a/fsagent/src/main/resources/templates/dialplan/dialplan.xml b/server/src/main/resources/templates/dialplan/dialplan.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/dialplan.xml rename to server/src/main/resources/templates/dialplan/dialplan.xml diff --git a/fsagent/src/main/resources/templates/dialplan/echo.xml b/server/src/main/resources/templates/dialplan/echo.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/echo.xml rename to server/src/main/resources/templates/dialplan/echo.xml diff --git a/fsagent/src/main/resources/templates/dialplan/external-to-agent.xml b/server/src/main/resources/templates/dialplan/external-to-agent.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/external-to-agent.xml rename to server/src/main/resources/templates/dialplan/external-to-agent.xml diff --git a/fsagent/src/main/resources/templates/dialplan/hangup.xml b/server/src/main/resources/templates/dialplan/hangup.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/hangup.xml rename to server/src/main/resources/templates/dialplan/hangup.xml diff --git a/fsagent/src/main/resources/templates/dialplan/inbound-to-agent.xml b/server/src/main/resources/templates/dialplan/inbound-to-agent.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/inbound-to-agent.xml rename to server/src/main/resources/templates/dialplan/inbound-to-agent.xml diff --git a/fsagent/src/main/resources/templates/dialplan/inbound.xml b/server/src/main/resources/templates/dialplan/inbound.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/inbound.xml rename to server/src/main/resources/templates/dialplan/inbound.xml diff --git a/fsagent/src/main/resources/templates/dialplan/ivr.xml b/server/src/main/resources/templates/dialplan/ivr.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/ivr.xml rename to server/src/main/resources/templates/dialplan/ivr.xml diff --git a/fsagent/src/main/resources/templates/dialplan/local-extension.xml b/server/src/main/resources/templates/dialplan/local-extension.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/local-extension.xml rename to server/src/main/resources/templates/dialplan/local-extension.xml diff --git a/fsagent/src/main/resources/templates/dialplan/rec.xml b/server/src/main/resources/templates/dialplan/rec.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/rec.xml rename to server/src/main/resources/templates/dialplan/rec.xml diff --git a/fsagent/src/main/resources/templates/dialplan/trunk-outbound.xml b/server/src/main/resources/templates/dialplan/trunk-outbound.xml similarity index 100% rename from fsagent/src/main/resources/templates/dialplan/trunk-outbound.xml rename to server/src/main/resources/templates/dialplan/trunk-outbound.xml diff --git a/fsagent/src/main/resources/templates/directory/general.xml b/server/src/main/resources/templates/directory/general.xml similarity index 100% rename from fsagent/src/main/resources/templates/directory/general.xml rename to server/src/main/resources/templates/directory/general.xml diff --git a/fsagent/src/main/resources/templates/directory/registration.xml b/server/src/main/resources/templates/directory/registration.xml similarity index 100% rename from fsagent/src/main/resources/templates/directory/registration.xml rename to server/src/main/resources/templates/directory/registration.xml diff --git a/fsagent/src/main/resources/templates/empty.xml b/server/src/main/resources/templates/empty.xml similarity index 100% rename from fsagent/src/main/resources/templates/empty.xml rename to server/src/main/resources/templates/empty.xml diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java b/server/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java similarity index 95% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java rename to server/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java index 74823cd6..7ddf17d7 100644 --- a/fsagent/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/fsagent/DialServiceTest.java @@ -1,11 +1,11 @@ package com.pudonghot.yo.fsagent; +import com.pudonghot.yo.YoServer; import lombok.val; import org.junit.Test; import java.util.Arrays; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.tuple.Pair; import com.pudonghot.yo.fsagent.api.DialService; import com.pudonghot.yo.fsagent.api.request.CallLeg; import com.pudonghot.yo.fsagent.api.request.ReqDial; @@ -23,7 +23,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoFsAgent.class) +@SpringBootTest(classes = YoServer.class) public class DialServiceTest { @Autowired diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java b/server/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java similarity index 89% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java rename to server/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java index e9902305..2c0c8d11 100644 --- a/fsagent/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java +++ b/server/src/test/java/com/pudonghot/yo/fsagent/OdbcUtilsTest.java @@ -1,5 +1,6 @@ package com.pudonghot.yo.fsagent; +import com.pudonghot.yo.YoServer; import com.pudonghot.yo.fsagent.util.OdbcUtils; import org.junit.Test; import javax.sql.DataSource; @@ -18,7 +19,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoFsAgent.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = YoServer.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class OdbcUtilsTest { @Autowired diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java b/server/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java similarity index 84% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java rename to server/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java index 607a3c49..a386d927 100644 --- a/fsagent/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/fsagent/RecordingServiceTest.java @@ -1,5 +1,6 @@ package com.pudonghot.yo.fsagent; +import com.pudonghot.yo.YoServer; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; @@ -14,7 +15,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoFsAgent.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = YoServer.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class RecordingServiceTest { @Autowired diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/TestDriver.java b/server/src/test/java/com/pudonghot/yo/fsagent/TestDriver.java similarity index 100% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/TestDriver.java rename to server/src/test/java/com/pudonghot/yo/fsagent/TestDriver.java diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java b/server/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java similarity index 88% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java rename to server/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java index 8e7c74c6..d735cd6f 100644 --- a/fsagent/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java +++ b/server/src/test/java/com/pudonghot/yo/fsagent/TrunkServiceTest.java @@ -1,5 +1,6 @@ package com.pudonghot.yo.fsagent; +import com.pudonghot.yo.YoServer; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; @@ -17,7 +18,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = YoFsAgent.class, webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = YoServer.class, webEnvironment = WebEnvironment.RANDOM_PORT) public class TrunkServiceTest { @Autowired diff --git a/fsagent/src/test/java/com/pudonghot/yo/fsagent/util/CallStrUtilsTest.java b/server/src/test/java/com/pudonghot/yo/fsagent/util/CallStrUtilsTest.java similarity index 100% rename from fsagent/src/test/java/com/pudonghot/yo/fsagent/util/CallStrUtilsTest.java rename to server/src/test/java/com/pudonghot/yo/fsagent/util/CallStrUtilsTest.java diff --git a/state/src/test/java/com/pudonghot/yo/state/TestDriver.java b/server/src/test/java/com/pudonghot/yo/state/TestDriver.java similarity index 100% rename from state/src/test/java/com/pudonghot/yo/state/TestDriver.java rename to server/src/test/java/com/pudonghot/yo/state/TestDriver.java diff --git a/fsagent/src/test/resources/spring/spring-test.xml b/server/src/test/resources/spring/spring-test.xml similarity index 100% rename from fsagent/src/test/resources/spring/spring-test.xml rename to server/src/test/resources/spring/spring-test.xml diff --git a/state/pom.xml b/state/pom.xml deleted file mode 100644 index 21126d8c..00000000 --- a/state/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - yo-state - 0.0.1-RELEASE - Yo State - Yo State - jar - - - com.pudonghot.yo - yo - 0.0.1-SNAPSHOT - ../ - - - - com.pudonghot.yo.state.YoState - - - - - 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.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/state/src/main/java/com/pudonghot/yo/state/YoState.java b/state/src/main/java/com/pudonghot/yo/state/YoState.java deleted file mode 100644 index a012c6ce..00000000 --- a/state/src/main/java/com/pudonghot/yo/state/YoState.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.pudonghot.yo.state; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Donghuang
- * Oct 26, 2019 15:56:08 - */ -@SpringBootApplication -public class YoState { - - /** - * main - * - * @param args args - */ - public static void main(final String[] args) { - SpringApplication.run(YoState.class, args); - } -} diff --git a/state/src/main/java/com/pudonghot/yo/state/controller/SiteController.java b/state/src/main/java/com/pudonghot/yo/state/controller/SiteController.java deleted file mode 100644 index 6f935520..00000000 --- a/state/src/main/java/com/pudonghot/yo/state/controller/SiteController.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pudonghot.yo.state.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Donghuang - * @date Jul 10, 2020 10:57:21 - */ -@Controller -public class SiteController { - - @GetMapping("/") - public void index() { - } -} diff --git a/state/src/main/resources/application-test.properties b/state/src/main/resources/application-test.properties deleted file mode 100644 index 778e0925..00000000 --- a/state/src/main/resources/application-test.properties +++ /dev/null @@ -1,26 +0,0 @@ -# Yo State -server.port=8085 -spring.application.name=yo-state -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 diff --git a/state/src/main/resources/application.properties b/state/src/main/resources/application.properties deleted file mode 100644 index 91b6613c..00000000 --- a/state/src/main/resources/application.properties +++ /dev/null @@ -1,23 +0,0 @@ -server.port=8086 -spring.application.name=yo-state -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 - diff --git a/state/src/main/resources/logback.xml b/state/src/main/resources/logback.xml deleted file mode 100644 index e20bd991..00000000 --- a/state/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/state/src/main/resources/spring/spring-yo-state.xml b/state/src/main/resources/spring/spring-yo-state.xml deleted file mode 100644 index 3cad6df1..00000000 --- a/state/src/main/resources/spring/spring-yo-state.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/state/src/main/resources/static/check_backend_active.html b/state/src/main/resources/static/check_backend_active.html deleted file mode 100644 index a0aba931..00000000 --- a/state/src/main/resources/static/check_backend_active.html +++ /dev/null @@ -1 +0,0 @@ -OK \ No newline at end of file diff --git a/state/src/test/resources/spring/spring-test.xml b/state/src/test/resources/spring/spring-test.xml deleted file mode 100644 index e569cc31..00000000 --- a/state/src/test/resources/spring/spring-test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - -