diff --git a/pom.xml b/pom.xml index 240eaa35..ed7cf148 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,9 @@ **/*.jar + + src/main/resources + diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/config/DataSourceConfig.java b/src/main/java/com/gzzn/omms/msgexchangeapi/config/DataSourceConfig.java deleted file mode 100644 index 492493e3..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/config/DataSourceConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.config; - -import javax.sql.DataSource; - -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -@Configuration -public class DataSourceConfig { - @Bean(name = "primaryDataSource") - @Primary - @ConfigurationProperties(prefix="spring.datasource.primary") - public DataSource primaryDataSource() - { - return DataSourceBuilder.create().build(); - } - - - @Bean(name = "secondaryDataSource") - @ConfigurationProperties(prefix="spring.datasource.secondary") - public DataSource secondaryDataSource() - { - return DataSourceBuilder.create().build(); - } -} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/config/PrimaryConfig.java b/src/main/java/com/gzzn/omms/msgexchangeapi/config/PrimaryConfig.java deleted file mode 100644 index ef79eff9..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/config/PrimaryConfig.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.config; - -import java.util.Map; - -import javax.persistence.EntityManager; -import javax.sql.DataSource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; - - - -@Configuration -@EnableTransactionManagement -@EnableJpaRepositories( - entityManagerFactoryRef="entityManagerFactoryPrimary", - transactionManagerRef="transactionManagerPrimary", - basePackages= { "com.gzzn.omms.msgexchangeapi.domain.primary.dao" } - ) //设置Repository所在位置 - public class PrimaryConfig - { - - @Autowired - @Qualifier("primaryDataSource") - private DataSource primaryDataSource; - - @Primary - @Bean(name = "entityManagerPrimary") - public EntityManager entityManager(EntityManagerFactoryBuilder builder) - { - return entityManagerFactoryPrimary(builder).getObject().createEntityManager(); - } - - @Primary - @Bean(name = "entityManagerFactoryPrimary") - public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary (EntityManagerFactoryBuilder builder) - { - return builder - .dataSource(primaryDataSource) - .properties(getVendorProperties(primaryDataSource)) - .packages("com.gzzn.omms.msgexchangeapi.domain.primary.entity") //设置实体类所在位置 - .persistenceUnit("primaryPersistenceUnit") - .build(); - } - - @Autowired private JpaProperties jpaProperties; - private Map getVendorProperties(DataSource dataSource) - { - return jpaProperties.getHibernateProperties(dataSource); - } - - @Primary - @Bean(name = "transactionManagerPrimary") - public PlatformTransactionManager transactionManagerPrimary(EntityManagerFactoryBuilder builder) - { - return new JpaTransactionManager(entityManagerFactoryPrimary(builder).getObject()); - } - - } - diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/config/SecondaryConfig.java b/src/main/java/com/gzzn/omms/msgexchangeapi/config/SecondaryConfig.java deleted file mode 100644 index 10dad7a4..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/config/SecondaryConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.config; - -import java.util.Map; - -import javax.persistence.EntityManager; -import javax.sql.DataSource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@Configuration -@EnableTransactionManagement -@EnableJpaRepositories( - entityManagerFactoryRef="entityManagerFactorySecondary", - transactionManagerRef="transactionManagerSecondary", - basePackages= { "com.gzzn.omms.msgexchangeapi.domain.secondary.dao" } - ) //设置Repository所在位置 - - public class SecondaryConfig - { - @Autowired - @Qualifier("secondaryDataSource") - private DataSource secondaryDataSource; - - @Bean(name = "entityManagerSecondary") - public EntityManager entityManager(EntityManagerFactoryBuilder builder) - { - return entityManagerFactorySecondary(builder).getObject().createEntityManager(); - } - - @Bean(name = "entityManagerFactorySecondary") - public LocalContainerEntityManagerFactoryBean - entityManagerFactorySecondary (EntityManagerFactoryBuilder builder) - { - return builder - .dataSource(secondaryDataSource) - .properties(getVendorProperties(secondaryDataSource)) - .packages("com.gzzn.omms.msgexchangeapi.domain.secondary.entity") //设置实体类所在位置 - .persistenceUnit("secondaryPersistenceUnit") - .build(); - } - - @Autowired - private JpaProperties jpaProperties; - private Map getVendorProperties(DataSource dataSource) - { - return jpaProperties.getHibernateProperties(dataSource); - } - - @Bean(name = "transactionManagerSecondary") - PlatformTransactionManager transactionManagerSecondary(EntityManagerFactoryBuilder builder) - { - return new JpaTransactionManager(entityManagerFactorySecondary(builder).getObject()); - } - } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/CminmsgsController.java b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/CminmsgsController.java index 5a371cbe..77a94d3e 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/CminmsgsController.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/CminmsgsController.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.dto.ResponseDto; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.service.ICminmsgService; @RestController diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CminmsgDao.java b/src/main/java/com/gzzn/omms/msgexchangeapi/dao/CminmsgDao.java similarity index 72% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CminmsgDao.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/dao/CminmsgDao.java index 7e7d5a5f..be8abea1 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CminmsgDao.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/dao/CminmsgDao.java @@ -1,11 +1,11 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.dao; +package com.gzzn.omms.msgexchangeapi.dao; import java.util.Date; import java.util.List; import org.springframework.data.repository.CrudRepository; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CmoutmsgDao.java b/src/main/java/com/gzzn/omms/msgexchangeapi/dao/CmoutmsgDao.java similarity index 50% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CmoutmsgDao.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/dao/CmoutmsgDao.java index 43d37adb..b42194c0 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/dao/CmoutmsgDao.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/dao/CmoutmsgDao.java @@ -1,8 +1,8 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.dao; +package com.gzzn.omms.msgexchangeapi.dao; import org.springframework.data.repository.CrudRepository; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cmoutmsg; +import com.gzzn.omms.msgexchangeapi.entity.Cmoutmsg; public interface CmoutmsgDao extends CrudRepository { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/ContextDao.java b/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/ContextDao.java deleted file mode 100644 index 11629867..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/ContextDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.domain.secondary.dao; - -import org.springframework.data.repository.CrudRepository; - -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.Context; - -public interface ContextDao extends CrudRepository { - -} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cminmsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cminmsg.java similarity index 94% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cminmsg.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cminmsg.java index 923dc2bb..eb27ae03 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cminmsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cminmsg.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity; +package com.gzzn.omms.msgexchangeapi.entity; import java.io.Serializable; import javax.persistence.*; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cmoutmsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cmoutmsg.java similarity index 94% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cmoutmsg.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cmoutmsg.java index 2ac9089a..548eb258 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/Cmoutmsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/Cmoutmsg.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity; +package com.gzzn.omms.msgexchangeapi.entity; import java.io.Serializable; import javax.persistence.*; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Meta.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Meta.java similarity index 88% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Meta.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Meta.java index c83731e9..0d4a3a7a 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Meta.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Meta.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg; +package com.gzzn.omms.msgexchangeapi.entity.msg; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Msg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java similarity index 80% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Msg.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java index 87b1f847..addd9813 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/Msg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg; +package com.gzzn.omms.msgexchangeapi.entity.msg; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsg.java similarity index 76% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsg.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsg.java index f14847cb..5b8731b1 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsg.java @@ -1,12 +1,12 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.rqfd; +package com.gzzn.omms.msgexchangeapi.entity.msg.rqfd; import java.util.Date; import java.util.Locale; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Meta; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; +import com.gzzn.omms.msgexchangeapi.entity.msg.Meta; +import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; import com.gzzn.omms.msgexchangeapi.utils.DateTimeUtil; @JacksonXmlRootElement(localName="MSG") diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsgBody.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsgBody.java similarity index 86% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsgBody.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsgBody.java index 6302a04d..7733db56 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/rqfd/RefdMsgBody.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/rqfd/RefdMsgBody.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.rqfd; +package com.gzzn.omms.msgexchangeapi.entity.msg.rqfd; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CHDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java similarity index 85% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CHDT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java index 66d26487..881d8b69 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CHDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class CHDT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CKDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java similarity index 86% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CKDT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java index bd388b62..54294ba6 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/CKDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class CKDT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java similarity index 63% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsg.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java index 2043830d..84167731 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java @@ -1,6 +1,6 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; +import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; public class DnldMsg extends Msg { public static final String TYPE = "SCHD"; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsgBody.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java similarity index 79% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsgBody.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java index 29292bab..60f2dbd9 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/DnldMsgBody.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; import java.util.List; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ERUT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java similarity index 79% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ERUT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java index 96494b60..c4eff4fd 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ERUT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class ERUT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/FLTR.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java similarity index 92% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/FLTR.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java index ec951e0d..00889f87 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/FLTR.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; import java.util.List; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/GTDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java similarity index 85% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/GTDT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java index 2169b997..ffb679f0 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/GTDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class GTDT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/PSDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java similarity index 82% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/PSDT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java index 0bbc4703..cd00b493 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/PSDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class PSDT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ROUT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java similarity index 82% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ROUT.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java index 80ca89a3..57a0ca14 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/primary/entity/msg/schd/dnld/ROUT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld; +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; public class ROUT { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java index ebe4840d..204af053 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.FlightInfo; +import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; +import com.gzzn.omms.msgexchangeapi.redis.entity.FlightInfo; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; @Service diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/ContextDao.java b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/ContextDao.java new file mode 100644 index 00000000..df4e37c0 --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/ContextDao.java @@ -0,0 +1,9 @@ +package com.gzzn.omms.msgexchangeapi.redis.dao; + +import org.springframework.data.repository.CrudRepository; + +import com.gzzn.omms.msgexchangeapi.redis.entity.Context; + +public interface ContextDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/FlightInfoDao.java b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/FlightInfoDao.java similarity index 50% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/FlightInfoDao.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/FlightInfoDao.java index 656a97db..1e28328c 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/dao/FlightInfoDao.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/dao/FlightInfoDao.java @@ -1,8 +1,8 @@ -package com.gzzn.omms.msgexchangeapi.domain.secondary.dao; +package com.gzzn.omms.msgexchangeapi.redis.dao; import org.springframework.data.repository.CrudRepository; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.FlightInfo; +import com.gzzn.omms.msgexchangeapi.redis.entity.FlightInfo; public interface FlightInfoDao extends CrudRepository{ diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/Context.java b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/Context.java similarity index 85% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/Context.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/Context.java index 9d344b09..e0f30527 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/Context.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/Context.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.secondary.entity; +package com.gzzn.omms.msgexchangeapi.redis.entity; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/FlightInfo.java b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/FlightInfo.java similarity index 80% rename from src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/FlightInfo.java rename to src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/FlightInfo.java index fa8a90da..7fcd3f45 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/domain/secondary/entity/FlightInfo.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/entity/FlightInfo.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.domain.secondary.entity; +package com.gzzn.omms.msgexchangeapi.redis.entity; import javax.persistence.Entity; import javax.persistence.Id; @@ -10,7 +10,7 @@ import javax.persistence.Table; * */ @Entity -@Table(name="flightschdinfo") +@Table(name="flightInfo") public class FlightInfo { @Id diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java index 0add6417..72600363 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java @@ -8,12 +8,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; -import com.gzzn.omms.msgexchangeapi.domain.primary.dao.CmoutmsgDao; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cmoutmsg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.rqfd.RefdMsg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.rqfd.RefdMsgBody; -import com.gzzn.omms.msgexchangeapi.domain.secondary.dao.ContextDao; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.Context; +import com.gzzn.omms.msgexchangeapi.dao.CmoutmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.Cmoutmsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.rqfd.RefdMsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.rqfd.RefdMsgBody; +import com.gzzn.omms.msgexchangeapi.redis.dao.ContextDao; +import com.gzzn.omms.msgexchangeapi.redis.entity.Context; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.DateTimeUtil; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/CminmsgServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/CminmsgServiceImpl.java index 2bab9c7c..f4a3b7a0 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/CminmsgServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/CminmsgServiceImpl.java @@ -8,9 +8,9 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.gzzn.omms.msgexchangeapi.domain.primary.dao.CminmsgDao; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; +import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; @Service public class CminmsgServiceImpl implements ICminmsgService { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/FlightInfoServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/FlightInfoServiceImpl.java index a803e2ad..fc09da24 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/FlightInfoServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/FlightInfoServiceImpl.java @@ -6,12 +6,11 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.schd.dnld.DnldMsg; -import com.gzzn.omms.msgexchangeapi.domain.secondary.dao.FlightInfoDao; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.FlightInfo; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.DnldMsg; import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher; +import com.gzzn.omms.msgexchangeapi.redis.dao.FlightInfoDao; +import com.gzzn.omms.msgexchangeapi.redis.entity.FlightInfo; import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; @Service diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICminmsgService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICminmsgService.java index bf71b70c..8a3e2352 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICminmsgService.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICminmsgService.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; public interface ICminmsgService { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/IFlightInfoService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/IFlightInfoService.java index e448eed9..1c900cbe 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/IFlightInfoService.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/IFlightInfoService.java @@ -2,8 +2,8 @@ package com.gzzn.omms.msgexchangeapi.service; import java.util.List; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.FlightInfo; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.redis.entity.FlightInfo; public interface IFlightInfoService { /** diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java b/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java index 497e3ee6..c6722092 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java @@ -9,10 +9,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.domain.secondary.dao.ContextDao; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.Context; -import com.gzzn.omms.msgexchangeapi.domain.secondary.entity.FlightInfo; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.redis.dao.ContextDao; +import com.gzzn.omms.msgexchangeapi.redis.entity.Context; +import com.gzzn.omms.msgexchangeapi.redis.entity.FlightInfo; import com.gzzn.omms.msgexchangeapi.service.ICminmsgService; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.service.IFlightInfoService; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a7b73ab2..c7b9fbcb 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,24 +1,13 @@ spring: datasource: - primary: - username: ommsxc - password: ommsxc - url: jdbc:oracle:thin:@130.120.3.236:1521/xe - driver: oracle.jdbc.driver.OracleDriver - tomcat: - max-active: 30 - test-on-borrow: true - initial-size: 3 - - secondary: - username: ommsxc - password: ommsxc - url: jdbc:oracle:thin:@130.120.3.236:1521/xe - driver: oracle.jdbc.driver.OracleDriver - tomcat: - max-active: 30 - test-on-borrow: true - initial-size: 3 + username: ommsxc + password: ommsxc + url: jdbc:oracle:thin:@130.120.3.236:1521/xe + driver: oracle.jdbc.driver.OracleDriver + tomcat: + max-active: 30 + test-on-borrow: true + initial-size: 3 kafka: producer: retries: 0 diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java index b6764b8a..620113b6 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/tools/ToolTest.java @@ -25,9 +25,9 @@ import org.springframework.util.StringUtils; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; -import com.gzzn.omms.msgexchangeapi.domain.primary.dao.CminmsgDao; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.domain.primary.entity.msg.Msg; +import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; import com.gzzn.omms.msgexchangeapi.exception.ExchangeServiceException; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.JsonUtil;