From 39a5a6e17edb2b26968a2c3696f7c99a2687bc4a Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Fri, 1 Dec 2023 19:45:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{stockdb => db}/po/QSiteSettingPO.java | 2 +- .../{stockdb => db}/po/QStockPO.java | 2 +- .../basic/convert/SiteSettingConvert.java | 2 +- .../domain/basic/convert/StockConvert.java | 2 +- .../domain/basic/entity/SiteSetting.java | 2 +- .../market/domain/basic/entity/Stock.java | 2 +- .../repository/SiteSettingRepository.java | 4 +- .../basic/repository/StockRepository.java | 6 +- .../domain/basic/service/StockService.java | 2 +- .../java/cn/stock/market/dto/StockDTO.java | 2 +- .../{stockdb => db}/po/SiteSettingPO.java | 4 +- .../{stockdb => db}/po/StockPO.java | 4 +- .../{stockdb => db}/repo/SiteSettingRepo.java | 4 +- .../{stockdb => db}/repo/StockRepo.java | 4 +- .../stockdb/config/StockDatasourceConfig.java | 154 +++++++++--------- src/main/resources/application-base-alpha.yml | 4 +- 16 files changed, 100 insertions(+), 100 deletions(-) rename src/main/generated/cn/stock/market/infrastructure/{stockdb => db}/po/QSiteSettingPO.java (95%) rename src/main/generated/cn/stock/market/infrastructure/{stockdb => db}/po/QStockPO.java (97%) rename src/main/java/cn/stock/market/infrastructure/{stockdb => db}/po/SiteSettingPO.java (93%) rename src/main/java/cn/stock/market/infrastructure/{stockdb => db}/po/StockPO.java (95%) rename src/main/java/cn/stock/market/infrastructure/{stockdb => db}/repo/SiteSettingRepo.java (67%) rename src/main/java/cn/stock/market/infrastructure/{stockdb => db}/repo/StockRepo.java (69%) diff --git a/src/main/generated/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java b/src/main/generated/cn/stock/market/infrastructure/db/po/QSiteSettingPO.java similarity index 95% rename from src/main/generated/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java rename to src/main/generated/cn/stock/market/infrastructure/db/po/QSiteSettingPO.java index c9e4d71..5440bae 100644 --- a/src/main/generated/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java +++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QSiteSettingPO.java @@ -1,4 +1,4 @@ -package cn.stock.market.infrastructure.stockdb.po; +package cn.stock.market.infrastructure.db.po; import static com.querydsl.core.types.PathMetadataFactory.*; diff --git a/src/main/generated/cn/stock/market/infrastructure/stockdb/po/QStockPO.java b/src/main/generated/cn/stock/market/infrastructure/db/po/QStockPO.java similarity index 97% rename from src/main/generated/cn/stock/market/infrastructure/stockdb/po/QStockPO.java rename to src/main/generated/cn/stock/market/infrastructure/db/po/QStockPO.java index 5dd97b5..22c7369 100644 --- a/src/main/generated/cn/stock/market/infrastructure/stockdb/po/QStockPO.java +++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QStockPO.java @@ -1,4 +1,4 @@ -package cn.stock.market.infrastructure.stockdb.po; +package cn.stock.market.infrastructure.db.po; import static com.querydsl.core.types.PathMetadataFactory.*; diff --git a/src/main/java/cn/stock/market/domain/basic/convert/SiteSettingConvert.java b/src/main/java/cn/stock/market/domain/basic/convert/SiteSettingConvert.java index 60ac1f2..ced1e3b 100644 --- a/src/main/java/cn/stock/market/domain/basic/convert/SiteSettingConvert.java +++ b/src/main/java/cn/stock/market/domain/basic/convert/SiteSettingConvert.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert; import cn.qutaojing.common.utils.SpringUtils; import cn.stock.market.domain.basic.entity.SiteSetting; -import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; +import cn.stock.market.infrastructure.db.po.SiteSettingPO; /** * StockConvert diff --git a/src/main/java/cn/stock/market/domain/basic/convert/StockConvert.java b/src/main/java/cn/stock/market/domain/basic/convert/StockConvert.java index d2978de..b3d65e1 100644 --- a/src/main/java/cn/stock/market/domain/basic/convert/StockConvert.java +++ b/src/main/java/cn/stock/market/domain/basic/convert/StockConvert.java @@ -3,7 +3,7 @@ package cn.stock.market.domain.basic.convert; import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert; import cn.qutaojing.common.utils.SpringUtils; import cn.stock.market.domain.basic.entity.Stock; -import cn.stock.market.infrastructure.stockdb.po.StockPO; +import cn.stock.market.infrastructure.db.po.StockPO; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/src/main/java/cn/stock/market/domain/basic/entity/SiteSetting.java b/src/main/java/cn/stock/market/domain/basic/entity/SiteSetting.java index b9f0d99..e3f8684 100644 --- a/src/main/java/cn/stock/market/domain/basic/entity/SiteSetting.java +++ b/src/main/java/cn/stock/market/domain/basic/entity/SiteSetting.java @@ -10,7 +10,7 @@ import com.google.common.collect.Lists; import cn.qutaojing.common.utils.Beans; import cn.stock.market.dto.command.StockCreateCommand; -import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; +import cn.stock.market.infrastructure.db.po.SiteSettingPO; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/cn/stock/market/domain/basic/entity/Stock.java b/src/main/java/cn/stock/market/domain/basic/entity/Stock.java index 6c4cfa2..b5fa629 100644 --- a/src/main/java/cn/stock/market/domain/basic/entity/Stock.java +++ b/src/main/java/cn/stock/market/domain/basic/entity/Stock.java @@ -2,7 +2,7 @@ package cn.stock.market.domain.basic.entity; import cn.qutaojing.common.utils.Beans; import cn.stock.market.dto.command.StockCreateCommand; -import cn.stock.market.infrastructure.stockdb.po.StockPO; +import cn.stock.market.infrastructure.db.po.StockPO; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/cn/stock/market/domain/basic/repository/SiteSettingRepository.java b/src/main/java/cn/stock/market/domain/basic/repository/SiteSettingRepository.java index fa455d8..8c183a4 100644 --- a/src/main/java/cn/stock/market/domain/basic/repository/SiteSettingRepository.java +++ b/src/main/java/cn/stock/market/domain/basic/repository/SiteSettingRepository.java @@ -10,8 +10,8 @@ import cn.qutaojing.common.domain.respostory.LocalCacheRepository; import cn.qutaojing.common.utils.SpringUtils; import cn.stock.market.domain.basic.convert.SiteSettingConvert; import cn.stock.market.domain.basic.entity.SiteSetting; -import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; -import cn.stock.market.infrastructure.stockdb.repo.SiteSettingRepo; +import cn.stock.market.infrastructure.db.po.SiteSettingPO; +import cn.stock.market.infrastructure.db.repo.SiteSettingRepo; import lombok.RequiredArgsConstructor; /** diff --git a/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java b/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java index f4c27a7..bd02858 100644 --- a/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java +++ b/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import cn.stock.market.infrastructure.stockdb.po.QStockPO; +import cn.stock.market.infrastructure.db.po.QStockPO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -22,8 +22,8 @@ import cn.qutaojing.common.jpa.ConditionBuilder; import cn.qutaojing.common.utils.SpringUtils; import cn.stock.market.domain.basic.convert.StockConvert; import cn.stock.market.domain.basic.entity.Stock; -import cn.stock.market.infrastructure.stockdb.po.StockPO; -import cn.stock.market.infrastructure.stockdb.repo.StockRepo; +import cn.stock.market.infrastructure.db.po.StockPO; +import cn.stock.market.infrastructure.db.repo.StockRepo; import lombok.RequiredArgsConstructor; /** diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 6e06c81..6a0672a 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -16,7 +16,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; -import cn.stock.market.infrastructure.stockdb.po.QStockPO; +import cn.stock.market.infrastructure.db.po.QStockPO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.HttpEntity; diff --git a/src/main/java/cn/stock/market/dto/StockDTO.java b/src/main/java/cn/stock/market/dto/StockDTO.java index 8dc74a6..7a51af1 100644 --- a/src/main/java/cn/stock/market/dto/StockDTO.java +++ b/src/main/java/cn/stock/market/dto/StockDTO.java @@ -1,6 +1,6 @@ package cn.stock.market.dto; -import cn.stock.market.infrastructure.stockdb.po.StockPO; +import cn.stock.market.infrastructure.db.po.StockPO; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/SiteSettingPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/SiteSettingPO.java similarity index 93% rename from src/main/java/cn/stock/market/infrastructure/stockdb/po/SiteSettingPO.java rename to src/main/java/cn/stock/market/infrastructure/db/po/SiteSettingPO.java index 8f26340..e359b18 100644 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/po/SiteSettingPO.java +++ b/src/main/java/cn/stock/market/infrastructure/db/po/SiteSettingPO.java @@ -1,4 +1,4 @@ -package cn.stock.market.infrastructure.stockdb.po; +package cn.stock.market.infrastructure.db.po; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -33,6 +33,6 @@ public class SiteSettingPO { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) Integer id; - + String marketServerList; } diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/StockPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/StockPO.java similarity index 95% rename from src/main/java/cn/stock/market/infrastructure/stockdb/po/StockPO.java rename to src/main/java/cn/stock/market/infrastructure/db/po/StockPO.java index 40b07b0..f8d3c87 100644 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/po/StockPO.java +++ b/src/main/java/cn/stock/market/infrastructure/db/po/StockPO.java @@ -1,4 +1,4 @@ -package cn.stock.market.infrastructure.stockdb.po; +package cn.stock.market.infrastructure.db.po; import java.lang.Integer; import java.lang.String; @@ -63,6 +63,6 @@ public class StockPO { * 涨幅比例 */ BigDecimal increaseRatio; - + Integer stockState; } diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/repo/SiteSettingRepo.java b/src/main/java/cn/stock/market/infrastructure/db/repo/SiteSettingRepo.java similarity index 67% rename from src/main/java/cn/stock/market/infrastructure/stockdb/repo/SiteSettingRepo.java rename to src/main/java/cn/stock/market/infrastructure/db/repo/SiteSettingRepo.java index b238935..210e12a 100644 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/repo/SiteSettingRepo.java +++ b/src/main/java/cn/stock/market/infrastructure/db/repo/SiteSettingRepo.java @@ -1,8 +1,8 @@ -package cn.stock.market.infrastructure.stockdb.repo; +package cn.stock.market.infrastructure.db.repo; import com.rp.spring.jpa.GenericJpaRepository; -import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; +import cn.stock.market.infrastructure.db.po.SiteSettingPO; /** * StockRepo diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/repo/StockRepo.java b/src/main/java/cn/stock/market/infrastructure/db/repo/StockRepo.java similarity index 69% rename from src/main/java/cn/stock/market/infrastructure/stockdb/repo/StockRepo.java rename to src/main/java/cn/stock/market/infrastructure/db/repo/StockRepo.java index 0d1a734..97e36b0 100644 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/repo/StockRepo.java +++ b/src/main/java/cn/stock/market/infrastructure/db/repo/StockRepo.java @@ -1,8 +1,8 @@ -package cn.stock.market.infrastructure.stockdb.repo; +package cn.stock.market.infrastructure.db.repo; import com.rp.spring.jpa.GenericJpaRepository; -import cn.stock.market.infrastructure.stockdb.po.StockPO; +import cn.stock.market.infrastructure.db.po.StockPO; import java.lang.Integer; diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/config/StockDatasourceConfig.java b/src/main/java/cn/stock/market/infrastructure/stockdb/config/StockDatasourceConfig.java index 3176577..d982dab 100644 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/config/StockDatasourceConfig.java +++ b/src/main/java/cn/stock/market/infrastructure/stockdb/config/StockDatasourceConfig.java @@ -1,77 +1,77 @@ -package cn.stock.market.infrastructure.stockdb.config; - -import java.util.Map; - -import javax.persistence.EntityManagerFactory; -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.HibernateProperties; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -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 com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.rp.spring.jpa.GenericJpaRepositoryFactoryBean; -import com.rp.spring.jpa.GenericJpaRepositoryImpl; - -/** - * - * title: ErpDatasourceConfig.java - * ERP 数据源设置 - * - * @author rplees - * @email rplees.i.ly@gmail.com - * @version 1.0 - * @created Jan 5, 2018 11:44:49 AM - */ -@Configuration -@ComponentScan({ "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) -@EnableJpaRepositories( - repositoryBaseClass = GenericJpaRepositoryImpl.class, - repositoryFactoryBeanClass = GenericJpaRepositoryFactoryBean.class, - entityManagerFactoryRef = "stockEntityManagerFactory", - transactionManagerRef = "stockTransactionManager", - basePackages = { "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) -public class StockDatasourceConfig { - @Autowired HibernateProperties hibernateProperties; - @Bean(name = "stockDataSource") - @ConfigurationProperties(prefix="spring.datasource.stock") - public DataSource dataSource() { - return DruidDataSourceBuilder.create().build(); - } - - @Bean(name = "stockJpaProperties") - @ConfigurationProperties(prefix = "spring.jpa") - public JpaProperties jpaProperties() { - return new JpaProperties(); - } - - @Bean(name = "stockEntityManagerFactory") - public LocalContainerEntityManagerFactoryBean entityManagerFactory( - EntityManagerFactoryBuilder builder, - @Qualifier("stockJpaProperties") JpaProperties jpaProperties, - @Qualifier("stockDataSource") DataSource dataSource) { - Map properties = hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings()); - return builder - .dataSource(dataSource) - .properties(properties) - .packages("cn.stock.market.infrastructure.stockdb.po") - .persistenceUnit("stock") - .build(); - } - - @Bean(name = "stockTransactionManager") - public PlatformTransactionManager transactionManager(@Qualifier("stockEntityManagerFactory") EntityManagerFactory entityManagerFactory) { - return new JpaTransactionManager(entityManagerFactory); - } -} +//package cn.stock.market.infrastructure.stockdb.config; +// +//import java.util.Map; +// +//import javax.persistence.EntityManagerFactory; +//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.HibernateProperties; +//import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; +//import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +//import org.springframework.boot.context.properties.ConfigurationProperties; +//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.ComponentScan; +//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 com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; +//import com.rp.spring.jpa.GenericJpaRepositoryFactoryBean; +//import com.rp.spring.jpa.GenericJpaRepositoryImpl; +// +///** +// * +// * title: ErpDatasourceConfig.java +// * ERP 数据源设置 +// * +// * @author rplees +// * @email rplees.i.ly@gmail.com +// * @version 1.0 +// * @created Jan 5, 2018 11:44:49 AM +// */ +//@Configuration +//@ComponentScan({ "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) +//@EnableJpaRepositories( +// repositoryBaseClass = GenericJpaRepositoryImpl.class, +// repositoryFactoryBeanClass = GenericJpaRepositoryFactoryBean.class, +// entityManagerFactoryRef = "stockEntityManagerFactory", +// transactionManagerRef = "stockTransactionManager", +// basePackages = { "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) +//public class StockDatasourceConfig { +// @Autowired HibernateProperties hibernateProperties; +// @Bean(name = "stockDataSource") +// @ConfigurationProperties(prefix="spring.datasource.stock") +// public DataSource dataSource() { +// return DruidDataSourceBuilder.create().build(); +// } +// +// @Bean(name = "stockJpaProperties") +// @ConfigurationProperties(prefix = "spring.jpa") +// public JpaProperties jpaProperties() { +// return new JpaProperties(); +// } +// +// @Bean(name = "stockEntityManagerFactory") +// public LocalContainerEntityManagerFactoryBean entityManagerFactory( +// EntityManagerFactoryBuilder builder, +// @Qualifier("stockJpaProperties") JpaProperties jpaProperties, +// @Qualifier("stockDataSource") DataSource dataSource) { +// Map properties = hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings()); +// return builder +// .dataSource(dataSource) +// .properties(properties) +// .packages("cn.stock.market.infrastructure.stockdb.po") +// .persistenceUnit("stock") +// .build(); +// } +// +// @Bean(name = "stockTransactionManager") +// public PlatformTransactionManager transactionManager(@Qualifier("stockEntityManagerFactory") EntityManagerFactory entityManagerFactory) { +// return new JpaTransactionManager(entityManagerFactory); +// } +//} diff --git a/src/main/resources/application-base-alpha.yml b/src/main/resources/application-base-alpha.yml index 221f131..eaf2c47 100644 --- a/src/main/resources/application-base-alpha.yml +++ b/src/main/resources/application-base-alpha.yml @@ -3,7 +3,7 @@ spring: show-sql: true # Redis配置 redis: - host: 43.128.20.124 + host: 43.132.212.180 password: ruTZ9J3gaDhknJ port: 36379 database: 1 @@ -17,7 +17,7 @@ spring: datasource: stock-market: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://124.156.133.209:33306/stock-market?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://43.132.212.180:33306/india_stock?useUnicode=true&characterEncoding=utf-8 username: root password: 33BsUUcnXRYgwt maxActive: 500