nhanvubk/ger-market-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
dengli
2023-12-01 21:57:28 +08:00
parent 19a082f7e2 39a5a6e17e
commit 68e0248ce6
16 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/generated/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java → src/main/generated/cn/stock/market/infrastructure/db/po/QSiteSettingPO.java
View File

@@ -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.*; import static com.querydsl.core.types.PathMetadataFactory.*;

2
src/main/generated/cn/stock/market/infrastructure/stockdb/po/QStockPO.java → src/main/generated/cn/stock/market/infrastructure/db/po/QStockPO.java
View File

@@ -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.*; import static com.querydsl.core.types.PathMetadataFactory.*;

2
src/main/java/cn/stock/market/domain/basic/convert/SiteSettingConvert.java
View File

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert; import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
import cn.qutaojing.common.utils.SpringUtils; import cn.qutaojing.common.utils.SpringUtils;
import cn.stock.market.domain.basic.entity.SiteSetting; 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 * StockConvert

2
src/main/java/cn/stock/market/domain/basic/convert/StockConvert.java
View File

@@ -3,7 +3,7 @@ package cn.stock.market.domain.basic.convert;
import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert; import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
import cn.qutaojing.common.utils.SpringUtils; import cn.qutaojing.common.utils.SpringUtils;
import cn.stock.market.domain.basic.entity.Stock; 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.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
src/main/java/cn/stock/market/domain/basic/entity/SiteSetting.java
View File

@@ -10,7 +10,7 @@ import com.google.common.collect.Lists;
import cn.qutaojing.common.utils.Beans; import cn.qutaojing.common.utils.Beans;
import cn.stock.market.dto.command.StockCreateCommand; 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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
src/main/java/cn/stock/market/domain/basic/entity/Stock.java
View File

@@ -2,7 +2,7 @@ package cn.stock.market.domain.basic.entity;
import cn.qutaojing.common.utils.Beans; import cn.qutaojing.common.utils.Beans;
import cn.stock.market.dto.command.StockCreateCommand; 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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

4
src/main/java/cn/stock/market/domain/basic/repository/SiteSettingRepository.java
View File

@@ -10,8 +10,8 @@ import cn.qutaojing.common.domain.respostory.LocalCacheRepository;
import cn.qutaojing.common.utils.SpringUtils; import cn.qutaojing.common.utils.SpringUtils;
import cn.stock.market.domain.basic.convert.SiteSettingConvert; import cn.stock.market.domain.basic.convert.SiteSettingConvert;
import cn.stock.market.domain.basic.entity.SiteSetting; import cn.stock.market.domain.basic.entity.SiteSetting;
import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; import cn.stock.market.infrastructure.db.po.SiteSettingPO;
import cn.stock.market.infrastructure.stockdb.repo.SiteSettingRepo; import cn.stock.market.infrastructure.db.repo.SiteSettingRepo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
/** /**

6
src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java
View File

@@ -5,7 +5,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@@ -22,8 +22,8 @@ import cn.qutaojing.common.jpa.ConditionBuilder;
import cn.qutaojing.common.utils.SpringUtils; import cn.qutaojing.common.utils.SpringUtils;
import cn.stock.market.domain.basic.convert.StockConvert; import cn.stock.market.domain.basic.convert.StockConvert;
import cn.stock.market.domain.basic.entity.Stock; 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 cn.stock.market.infrastructure.stockdb.repo.StockRepo; import cn.stock.market.infrastructure.db.repo.StockRepo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
/** /**

2
src/main/java/cn/stock/market/domain/basic/service/StockService.java
View File

@@ -22,7 +22,7 @@ import okhttp3.Protocol;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Request.Builder; import okhttp3.Request.Builder;
import org.apache.commons.lang3.StringUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;

2
src/main/java/cn/stock/market/dto/StockDTO.java
View File

@@ -1,6 +1,6 @@
package cn.stock.market.dto; 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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

4
src/main/java/cn/stock/market/infrastructure/stockdb/po/SiteSettingPO.java → src/main/java/cn/stock/market/infrastructure/db/po/SiteSettingPO.java
View File

@@ -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.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
@@ -33,6 +33,6 @@ public class SiteSettingPO {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
Integer id; Integer id;
String marketServerList; String marketServerList;
} }

4
src/main/java/cn/stock/market/infrastructure/stockdb/po/StockPO.java → src/main/java/cn/stock/market/infrastructure/db/po/StockPO.java
View File

@@ -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.Integer;
import java.lang.String; import java.lang.String;
@@ -63,6 +63,6 @@ public class StockPO {
* 涨幅比例 * 涨幅比例
*/ */
BigDecimal increaseRatio; BigDecimal increaseRatio;
Integer stockState; Integer stockState;
} }

4
src/main/java/cn/stock/market/infrastructure/stockdb/repo/SiteSettingRepo.java → src/main/java/cn/stock/market/infrastructure/db/repo/SiteSettingRepo.java
View File

@@ -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 com.rp.spring.jpa.GenericJpaRepository;
import cn.stock.market.infrastructure.stockdb.po.SiteSettingPO; import cn.stock.market.infrastructure.db.po.SiteSettingPO;
/** /**
* StockRepo * StockRepo

4
src/main/java/cn/stock/market/infrastructure/stockdb/repo/StockRepo.java → src/main/java/cn/stock/market/infrastructure/db/repo/StockRepo.java
View File

@@ -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 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; import java.lang.Integer;

154
src/main/java/cn/stock/market/infrastructure/stockdb/config/StockDatasourceConfig.java
View File

@@ -1,77 +1,77 @@
package cn.stock.market.infrastructure.stockdb.config; //package cn.stock.market.infrastructure.stockdb.config;
//
import java.util.Map; //import java.util.Map;
//
import javax.persistence.EntityManagerFactory; //import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource; //import javax.sql.DataSource;
//
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; //import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; //import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; //import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; //import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
import org.springframework.boot.context.properties.ConfigurationProperties; //import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; //import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; //import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; //import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager; //import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; //import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.transaction.PlatformTransactionManager; //import org.springframework.transaction.PlatformTransactionManager;
//
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; //import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.rp.spring.jpa.GenericJpaRepositoryFactoryBean; //import com.rp.spring.jpa.GenericJpaRepositoryFactoryBean;
import com.rp.spring.jpa.GenericJpaRepositoryImpl; //import com.rp.spring.jpa.GenericJpaRepositoryImpl;
//
/** ///**
* // *
* title: ErpDatasourceConfig.java // * title: ErpDatasourceConfig.java
* ERP 数据源设置 // * ERP 数据源设置
* // *
* @author rplees // * @author rplees
* @email rplees.i.ly@gmail.com // * @email rplees.i.ly@gmail.com
* @version 1.0 // * @version 1.0
* @created Jan 5, 2018 11:44:49 AM // * @created Jan 5, 2018 11:44:49 AM
*/ // */
@Configuration //@Configuration
@ComponentScan({ "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) //@ComponentScan({ "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"})
@EnableJpaRepositories( //@EnableJpaRepositories(
repositoryBaseClass = GenericJpaRepositoryImpl.class, // repositoryBaseClass = GenericJpaRepositoryImpl.class,
repositoryFactoryBeanClass = GenericJpaRepositoryFactoryBean.class, // repositoryFactoryBeanClass = GenericJpaRepositoryFactoryBean.class,
entityManagerFactoryRef = "stockEntityManagerFactory", // entityManagerFactoryRef = "stockEntityManagerFactory",
transactionManagerRef = "stockTransactionManager", // transactionManagerRef = "stockTransactionManager",
basePackages = { "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"}) // basePackages = { "cn.stock.market.infrastructure.stockdb.po", "cn.stock.market.infrastructure.stockdb.repo"})
public class StockDatasourceConfig { //public class StockDatasourceConfig {
@Autowired HibernateProperties hibernateProperties; // @Autowired HibernateProperties hibernateProperties;
@Bean(name = "stockDataSource") // @Bean(name = "stockDataSource")
@ConfigurationProperties(prefix="spring.datasource.stock") // @ConfigurationProperties(prefix="spring.datasource.stock")
public DataSource dataSource() { // public DataSource dataSource() {
return DruidDataSourceBuilder.create().build(); // return DruidDataSourceBuilder.create().build();
} // }
//
@Bean(name = "stockJpaProperties") // @Bean(name = "stockJpaProperties")
@ConfigurationProperties(prefix = "spring.jpa") // @ConfigurationProperties(prefix = "spring.jpa")
public JpaProperties jpaProperties() { // public JpaProperties jpaProperties() {
return new JpaProperties(); // return new JpaProperties();
} // }
//
@Bean(name = "stockEntityManagerFactory") // @Bean(name = "stockEntityManagerFactory")
public LocalContainerEntityManagerFactoryBean entityManagerFactory( // public LocalContainerEntityManagerFactoryBean entityManagerFactory(
EntityManagerFactoryBuilder builder, // EntityManagerFactoryBuilder builder,
@Qualifier("stockJpaProperties") JpaProperties jpaProperties, // @Qualifier("stockJpaProperties") JpaProperties jpaProperties,
@Qualifier("stockDataSource") DataSource dataSource) { // @Qualifier("stockDataSource") DataSource dataSource) {
Map<String, Object> properties = hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings()); // Map<String, Object> properties = hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings());
return builder // return builder
.dataSource(dataSource) // .dataSource(dataSource)
.properties(properties) // .properties(properties)
.packages("cn.stock.market.infrastructure.stockdb.po") // .packages("cn.stock.market.infrastructure.stockdb.po")
.persistenceUnit("stock") // .persistenceUnit("stock")
.build(); // .build();
} // }
//
@Bean(name = "stockTransactionManager") // @Bean(name = "stockTransactionManager")
public PlatformTransactionManager transactionManager(@Qualifier("stockEntityManagerFactory") EntityManagerFactory entityManagerFactory) { // public PlatformTransactionManager transactionManager(@Qualifier("stockEntityManagerFactory") EntityManagerFactory entityManagerFactory) {
return new JpaTransactionManager(entityManagerFactory); // return new JpaTransactionManager(entityManagerFactory);
} // }
} //}

4
src/main/resources/application-base-alpha.yml
View File

@@ -3,7 +3,7 @@ spring:
show-sql: true show-sql: true
# Redis配置 # Redis配置
redis: redis:
host: 43.128.20.124 host: 43.132.212.180
password: ruTZ9J3gaDhknJ password: ruTZ9J3gaDhknJ
port: 36379 port: 36379
database: 1 database: 1
@@ -17,7 +17,7 @@ spring:
datasource: datasource:
stock-market: stock-market:
driver-class-name: com.mysql.cj.jdbc.Driver 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 username: root
password: 33BsUUcnXRYgwt password: 33BsUUcnXRYgwt
maxActive: 500 maxActive: 500