From 6e1f360a01c00942d63c2877deeb5b1e188f24d9 Mon Sep 17 00:00:00 2001 From: dengli Date: Fri, 1 Dec 2023 10:04:33 +0800 Subject: [PATCH 01/62] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=B0=E5=BA=A6?= =?UTF-8?q?=E8=82=A1=E7=A5=A8K=E7=BA=BF=EF=BC=8C=E8=8B=B1=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/basic/service/StockService.java | 60 +++++++++++++++++++ .../stock/market/utils/HttpClientRequest.java | 24 ++++++++ 2 files changed, 84 insertions(+) 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 024e58a..b165c8f 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 @@ -638,6 +638,21 @@ public class StockService { return null; } + //印度股票时线-K线 英情 + public ServerResponse getYCTimeK(String codeId) { + String sina_result = ""; + + try { + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/7310/historical/chart/?interval=PT5M&pointscount="+codeId); + JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); + + return ServerResponse.createBySuccess(json); + } catch (Exception e) { + log.error("获取出错，错误信息 = {}", e); + } + return null; + } + //印度股票日线-K线 public ServerResponse getDayK(String stockCode) { String sina_result = ""; @@ -653,6 +668,21 @@ public class StockService { return null; } + //印度股票日线-K线 + public ServerResponse getYQDayK(String codeId) { + String sina_result = ""; + + try { + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1D&pointscount="+codeId); + JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); + + return ServerResponse.createBySuccess(json); + } catch (Exception e) { + log.error("获取出错，错误信息 = {}", e); + } + return null; + } + //印度股票周线-K线 public ServerResponse getWeekK(String stockCode) { String sina_result = ""; @@ -669,6 +699,21 @@ public class StockService { } + //印度股票周线-K线 英情 + public ServerResponse getYQWeekK(String codeId) { + String sina_result = ""; + + try { + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1W&pointscount="+codeId); + JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); + + return ServerResponse.createBySuccess(json); + } catch (Exception e) { + log.error("获取出错，错误信息 = {}", e); + } + return null; + } + //印度股票月线-K线 public ServerResponse getMonthK(String stockCode) { String sina_result = ""; @@ -684,6 +729,21 @@ public class StockService { return null; } + //印度股票月线-K线 英情 + public ServerResponse getYQMonthK(String codeId) { + String sina_result = ""; + + try { + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1M&pointscount="+codeId); + JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); + + return ServerResponse.createBySuccess(json); + } catch (Exception e) { + log.error("获取出错，错误信息 = {}", e); + } + return null; + } + public ServerResponse getNewStockList() { try { JSONObject jsonParam = new JSONObject(); diff --git a/src/main/java/cn/stock/market/utils/HttpClientRequest.java b/src/main/java/cn/stock/market/utils/HttpClientRequest.java index 5655eb9..bcad2f6 100644 --- a/src/main/java/cn/stock/market/utils/HttpClientRequest.java +++ b/src/main/java/cn/stock/market/utils/HttpClientRequest.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Set; import com.github.pagehelper.StringUtil; +import okhttp3.*; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.client.ClientProtocolException; @@ -73,6 +74,29 @@ public class HttpClientRequest { } return result; } + public static String http2Get(String url) throws IOException { + OkHttpClient client = new OkHttpClient.Builder() + .protocols(java.util.Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1)) + .build(); + Request request = new Request.Builder() + .url(url) // 替换为你要请求的URL + .addHeader("Cf-Ray", "82e0bc56ccabfabe-SJC") + .addHeader("X-Correlation-Id", "a3120e84-ab22-4a03-81bc-270bbb373c1f") + .addHeader("Server", "cloudflare") + .addHeader("Cf-Cache-Status", "DYNAMIC") + .addHeader("Alt-Svc", "h3=\":443\"; ma=86400") + .addHeader("Date", "Thu, 30 Nov 2023 05:36:57 GMT") + .addHeader("Content-Encoding", "br") + .addHeader("Content-Type", "application/json") + .addHeader("X-Envoy-Upstream-Service", "434") + .addHeader("Via", "1.1 google") + .addHeader("X-App-Version", "1.45.3") + .addHeader("Cf-Cache-Status", "DYNAMIC") + .build(); + Call call = client.newCall(request); + Response response = call.execute(); + return response.body().string(); + } /** * 获取cooike * @param url From 93dc5cbceef2615315cd4f7bbce752b275766f4d Mon Sep 17 00:00:00 2001 From: rplees Date: Fri, 1 Dec 2023 10:20:00 +0800 Subject: [PATCH 02/62] no message --- pom.xml | 63 ++++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 24199f9..c71da9c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - war + jar cn.qutaojing qutaojing-micro-pom @@ -176,18 +176,40 @@ - stock-market + india_stock_market - + org.apache.maven.plugins maven-compiler-plugin 3.8.1 + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.9.RELEASE + + true + JAR + + + + + + repackage + + + false + + + + com.mysema.maven @@ -219,38 +241,5 @@ true - \ No newline at end of file From 17ddd9afc9feb5dfb9ebc0c6807129f793f9acaa Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Fri, 1 Dec 2023 10:45:39 +0800 Subject: [PATCH 03/62] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/config/MarketDatasourceConfig.java | 4 +- .../market/infrastructure/db/po/QCityPO.java | 57 +++++++++++++++++ .../market/infrastructure/db/po/QCounter.java | 47 ++++++++++++++ .../market/infrastructure/db/po/QDic.java | 41 ++++++++++++ .../infrastructure/db/po/QJsonInfoPO.java | 45 +++++++++++++ .../infrastructure/db/po/QRealtimePO.java | 51 +++++++++++++++ .../infrastructure/db/po/QSiteArticlePO.java | 61 ++++++++++++++++++ .../infrastructure/db/po/QSiteNewsPO.java | 61 ++++++++++++++++++ .../infrastructure/db/po/QSysLogPO.java | 63 +++++++++++++++++++ .../stockdb/po/QSiteSettingPO.java | 39 ++++++++++++ .../infrastructure/stockdb/po/QStockPO.java | 61 ++++++++++++++++++ 11 files changed, 527 insertions(+), 3 deletions(-) create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QDic.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java create mode 100644 src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java diff --git a/src/main/java/cn/stock/market/infrastructure/db/config/MarketDatasourceConfig.java b/src/main/java/cn/stock/market/infrastructure/db/config/MarketDatasourceConfig.java index c6eda87..d4d7a94 100644 --- a/src/main/java/cn/stock/market/infrastructure/db/config/MarketDatasourceConfig.java +++ b/src/main/java/cn/stock/market/infrastructure/db/config/MarketDatasourceConfig.java @@ -37,14 +37,12 @@ import com.rp.spring.jpa.GenericJpaRepositoryImpl; * @created Jan 26, 2018 3:57:47 PM */ @Configuration -@ComponentScan({ "cn.stock.**.db.po", "com.stock.**.db.repo","cn.qutaojing.**.po", "cn.qutaojing.**.repo" }) +@ComponentScan({ "cn.stock.**.db.po", "cn.stock.**.db.repo"}) @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", transactionManagerRef = "transactionManager", repositoryBaseClass = GenericJpaRepositoryImpl.class, repositoryFactoryBeanClass = GenericJpaRepositoryFactoryBean.class, basePackages = { - "cn.qutaojing.ipay.infrastructure.db.po", "cn.qutaojing.ipay.infrastructure.db.repo", - "cn.stock.trade.infrastructure.db.po", "cn.stock.trade.infrastructure.db.repo", "cn.stock.market.infrastructure.db.po", "cn.stock.market.infrastructure.db.repo"}) public class MarketDatasourceConfig { @Autowired HibernateProperties hibernateProperties; diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java new file mode 100644 index 0000000..b3f51fc --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java @@ -0,0 +1,57 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QCityPO is a Querydsl query type for CityPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QCityPO extends EntityPathBase { + + private static final long serialVersionUID = -1922934307L; + + public static final QCityPO cityPO = new QCityPO("cityPO"); + + public final StringPath cityCode = createString("cityCode"); + + public final NumberPath id = createNumber("id", Integer.class); + + public final StringPath latitude = createString("latitude"); + + public final StringPath levelType = createString("levelType"); + + public final StringPath longitude = createString("longitude"); + + public final StringPath name = createString("name"); + + public final StringPath parentId = createString("parentId"); + + public final StringPath path = createString("path"); + + public final StringPath remark = createString("remark"); + + public final StringPath shortName = createString("shortName"); + + public final StringPath zipCode = createString("zipCode"); + + public QCityPO(String variable) { + super(CityPO.class, forVariable(variable)); + } + + public QCityPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QCityPO(PathMetadata metadata) { + super(CityPO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java b/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java new file mode 100644 index 0000000..b4e09d0 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java @@ -0,0 +1,47 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QCounter is a Querydsl query type for Counter + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QCounter extends EntityPathBase { + + private static final long serialVersionUID = 690984745L; + + public static final QCounter counter = new QCounter("counter"); + + public final NumberPath count = createNumber("count", Long.class); + + public final DateTimePath createTime = createDateTime("createTime", java.util.Date.class); + + public final StringPath fkId = createString("fkId"); + + public final StringPath k = createString("k"); + + public final StringPath type = createString("type"); + + public final DateTimePath updateTime = createDateTime("updateTime", java.util.Date.class); + + public QCounter(String variable) { + super(Counter.class, forVariable(variable)); + } + + public QCounter(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QCounter(PathMetadata metadata) { + super(Counter.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java b/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java new file mode 100644 index 0000000..1657c83 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java @@ -0,0 +1,41 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QDic is a Querydsl query type for Dic + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QDic extends EntityPathBase { + + private static final long serialVersionUID = -1801755605L; + + public static final QDic dic = new QDic("dic"); + + public final DateTimePath createTime = createDateTime("createTime", java.util.Date.class); + + public final StringPath k = createString("k"); + + public final StringPath val = createString("val"); + + public QDic(String variable) { + super(Dic.class, forVariable(variable)); + } + + public QDic(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QDic(PathMetadata metadata) { + super(Dic.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java new file mode 100644 index 0000000..266e8cd --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java @@ -0,0 +1,45 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QJsonInfoPO is a Querydsl query type for JsonInfoPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QJsonInfoPO extends EntityPathBase { + + private static final long serialVersionUID = 537860584L; + + public static final QJsonInfoPO jsonInfoPO = new QJsonInfoPO("jsonInfoPO"); + + public final DateTimePath createAt = createDateTime("createAt", java.util.Date.class); + + public final StringPath ext = createString("ext"); + + public final NumberPath id = createNumber("id", Integer.class); + + public final StringPath type = createString("type"); + + public final DateTimePath updateAt = createDateTime("updateAt", java.util.Date.class); + + public QJsonInfoPO(String variable) { + super(JsonInfoPO.class, forVariable(variable)); + } + + public QJsonInfoPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QJsonInfoPO(PathMetadata metadata) { + super(JsonInfoPO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java new file mode 100644 index 0000000..fa06b13 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java @@ -0,0 +1,51 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QRealtimePO is a Querydsl query type for RealtimePO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QRealtimePO extends EntityPathBase { + + private static final long serialVersionUID = -677602211L; + + public static final QRealtimePO realtimePO = new QRealtimePO("realtimePO"); + + public final NumberPath amounts = createNumber("amounts", Integer.class); + + public final NumberPath averagePrice = createNumber("averagePrice", Double.class); + + public final NumberPath id = createNumber("id", Integer.class); + + public final NumberPath price = createNumber("price", Double.class); + + public final NumberPath rates = createNumber("rates", Double.class); + + public final StringPath stockCode = createString("stockCode"); + + public final StringPath time = createString("time"); + + public final NumberPath volumes = createNumber("volumes", Integer.class); + + public QRealtimePO(String variable) { + super(RealtimePO.class, forVariable(variable)); + } + + public QRealtimePO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QRealtimePO(PathMetadata metadata) { + super(RealtimePO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java new file mode 100644 index 0000000..323dc56 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java @@ -0,0 +1,61 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QSiteArticlePO is a Querydsl query type for SiteArticlePO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QSiteArticlePO extends EntityPathBase { + + private static final long serialVersionUID = -38085285L; + + public static final QSiteArticlePO siteArticlePO = new QSiteArticlePO("siteArticlePO"); + + public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); + + public final StringPath artCnt = createString("artCnt"); + + public final StringPath artImg = createString("artImg"); + + public final StringPath artSummary = createString("artSummary"); + + public final StringPath artTitle = createString("artTitle"); + + public final StringPath artType = createString("artType"); + + public final StringPath author = createString("author"); + + public final NumberPath hitTimes = createNumber("hitTimes", Integer.class); + + public final NumberPath id = createNumber("id", Integer.class); + + public final NumberPath isShow = createNumber("isShow", Integer.class); + + public final StringPath sourceId = createString("sourceId"); + + public final StringPath spiderUrl = createString("spiderUrl"); + + public final NumberPath views = createNumber("views", Integer.class); + + public QSiteArticlePO(String variable) { + super(SiteArticlePO.class, forVariable(variable)); + } + + public QSiteArticlePO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QSiteArticlePO(PathMetadata metadata) { + super(SiteArticlePO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java new file mode 100644 index 0000000..9d6eb24 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java @@ -0,0 +1,61 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QSiteNewsPO is a Querydsl query type for SiteNewsPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QSiteNewsPO extends EntityPathBase { + + private static final long serialVersionUID = 525777388L; + + public static final QSiteNewsPO siteNewsPO = new QSiteNewsPO("siteNewsPO"); + + public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); + + public final StringPath content = createString("content"); + + public final StringPath description = createString("description"); + + public final NumberPath id = createNumber("id", Integer.class); + + public final StringPath imgurl = createString("imgurl"); + + public final DateTimePath showTime = createDateTime("showTime", java.util.Date.class); + + public final StringPath sourceId = createString("sourceId"); + + public final StringPath sourceName = createString("sourceName"); + + public final NumberPath status = createNumber("status", Integer.class); + + public final StringPath title = createString("title"); + + public final NumberPath type = createNumber("type", Integer.class); + + public final DateTimePath updateTime = createDateTime("updateTime", java.util.Date.class); + + public final NumberPath views = createNumber("views", Integer.class); + + public QSiteNewsPO(String variable) { + super(SiteNewsPO.class, forVariable(variable)); + } + + public QSiteNewsPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QSiteNewsPO(PathMetadata metadata) { + super(SiteNewsPO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java new file mode 100644 index 0000000..742df59 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java @@ -0,0 +1,63 @@ +package cn.stock.market.infrastructure.db.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QSysLogPO is a Querydsl query type for SysLogPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QSysLogPO extends EntityPathBase { + + private static final long serialVersionUID = -2037818903L; + + public static final QSysLogPO sysLogPO = new QSysLogPO("sysLogPO"); + + public final StringPath actionType = createString("actionType"); + + public final StringPath content = createString("content"); + + public final DateTimePath createAt = createDateTime("createAt", java.util.Date.class); + + public final StringPath ext = createString("ext"); + + public final NumberPath id = createNumber("id", Integer.class); + + public final StringPath module = createString("module"); + + public final StringPath operatorId = createString("operatorId"); + + public final StringPath operatorName = createString("operatorName"); + + public final StringPath operatorPhone = createString("operatorPhone"); + + public final StringPath roleType = createString("roleType"); + + public final NumberPath storeId = createNumber("storeId", Integer.class); + + public final StringPath title = createString("title"); + + public final StringPath uniqueId = createString("uniqueId"); + + public final DateTimePath updateAt = createDateTime("updateAt", java.util.Date.class); + + public QSysLogPO(String variable) { + super(SysLogPO.class, forVariable(variable)); + } + + public QSysLogPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QSysLogPO(PathMetadata metadata) { + super(SysLogPO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java new file mode 100644 index 0000000..c9e4d71 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java @@ -0,0 +1,39 @@ +package cn.stock.market.infrastructure.stockdb.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QSiteSettingPO is a Querydsl query type for SiteSettingPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QSiteSettingPO extends EntityPathBase { + + private static final long serialVersionUID = -51441337L; + + public static final QSiteSettingPO siteSettingPO = new QSiteSettingPO("siteSettingPO"); + + public final NumberPath id = createNumber("id", Integer.class); + + public final StringPath marketServerList = createString("marketServerList"); + + public QSiteSettingPO(String variable) { + super(SiteSettingPO.class, forVariable(variable)); + } + + public QSiteSettingPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QSiteSettingPO(PathMetadata metadata) { + super(SiteSettingPO.class, metadata); + } + +} + diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java new file mode 100644 index 0000000..5dd97b5 --- /dev/null +++ b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java @@ -0,0 +1,61 @@ +package cn.stock.market.infrastructure.stockdb.po; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.Generated; +import com.querydsl.core.types.Path; + + +/** + * QStockPO is a Querydsl query type for StockPO + */ +@Generated("com.querydsl.codegen.EntitySerializer") +public class QStockPO extends EntityPathBase { + + private static final long serialVersionUID = -1246401708L; + + public static final QStockPO stockPO = new QStockPO("stockPO"); + + public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); + + public final NumberPath id = createNumber("id", Integer.class); + + public final NumberPath increaseRatio = createNumber("increaseRatio", java.math.BigDecimal.class); + + public final NumberPath isLock = createNumber("isLock", Integer.class); + + public final NumberPath isShow = createNumber("isShow", Integer.class); + + public final NumberPath spreadRate = createNumber("spreadRate", java.math.BigDecimal.class); + + public final StringPath stockCode = createString("stockCode"); + + public final StringPath stockGid = createString("stockGid"); + + public final StringPath stockName = createString("stockName"); + + public final StringPath stockPlate = createString("stockPlate"); + + public final StringPath stockSpell = createString("stockSpell"); + + public final NumberPath stockState = createNumber("stockState", Integer.class); + + public final StringPath stockType = createString("stockType"); + + public QStockPO(String variable) { + super(StockPO.class, forVariable(variable)); + } + + public QStockPO(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QStockPO(PathMetadata metadata) { + super(StockPO.class, metadata); + } + +} + From 6fbe925fecd0b570962f95c775a29463eb5a2410 Mon Sep 17 00:00:00 2001 From: dengli Date: Fri, 1 Dec 2023 17:12:35 +0800 Subject: [PATCH 04/62] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8B=B1=E6=83=85?= =?UTF-8?q?=E4=B8=AA=E8=82=A1=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/basic/service/StockService.java | 134 ++++++++++++++++-- .../market/utils/SSLSocketClientUtil.java | 60 ++++++++ .../stock/market/web/StockApiController.java | 2 +- 3 files changed, 182 insertions(+), 14 deletions(-) create mode 100644 src/main/java/cn/stock/market/utils/SSLSocketClientUtil.java 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 b165c8f..b91edc7 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 @@ -2,19 +2,25 @@ package cn.stock.market.domain.basic.service; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.X509TrustManager; import javax.persistence.EntityExistsException; import javax.servlet.http.HttpServletRequest; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.text.StrFormatter; import cn.stock.market.dto.model.*; import cn.stock.market.infrastructure.api.sina.vo.HotSearchVO; +import cn.stock.market.utils.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import okhttp3.OkHttpClient; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Request.Builder; import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -44,11 +50,6 @@ import cn.stock.market.infrastructure.api.sina.vo.MarketVOResult; import cn.stock.market.infrastructure.api.sina.vo.k.MinDataVO; import cn.stock.market.infrastructure.api.sina.vo.k.echarts.EchartsDataVO; import cn.stock.market.infrastructure.stockdb.po.QStockPO; -import cn.stock.market.utils.GetPyByChinese; -import cn.stock.market.utils.HttpClientRequest; -import cn.stock.market.utils.PropertiesUtil; -import cn.stock.market.utils.ServerResponse; -import cn.stock.market.utils.Utils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.client.RestTemplate; @@ -70,6 +71,41 @@ public class StockService { String apikey = "VF7SHRYOFIYHCIKE"; + public static final String API_HEADER = ":method: GET\n" + + ":scheme: https\n" + + ":path: /get_screen.php?screen_ID=22&skinID=1&overview_table_order=1&time_utc_offset=28800&pair_ID=1156730&additionalTimeframes=Yes&lang_ID=6&include_pair_attr=true&v2=1\n" + + ":authority: cnappapi.investing.com\n" + + "cache-control: no-cache\n" + + "user-agent: Investing.China/64 CFNetwork/1390 Darwin/22.0.0\n" + + "x-os: ios\n" + + "x-idfa-perm: 0\n" + + "x-os-ver: 16.0\n" + + "x-app-ver: 156\n" + + "apf_src: no\n" + + "x-meta-ver: 14\n" + + "accept-language: zh-CN,zh-Hans;q=0.9\n" + + "accept: */*\n" + + "ccode: CN\n" + + ""; + + static OkHttpClient httpClient; + public static OkHttpClient httpClient() { + if(httpClient == null) { + X509TrustManager manager = SSLSocketClientUtil.getX509TrustManager(); + httpClient = new OkHttpClient.Builder() + .followRedirects(true) // 为了制造非200状态码，禁止302跳转 + .protocols(Collections.unmodifiableList(Arrays.asList(Protocol.HTTP_1_1, Protocol.HTTP_2)))// 启用http2.0协议 //, Protocol.HTTP_2 + .sslSocketFactory(SSLSocketClientUtil.getSocketFactory(manager), manager) + .hostnameVerifier(SSLSocketClientUtil.getHostnameVerifier())//忽略校验 + .retryOnConnectionFailure(true) + .connectTimeout(60, TimeUnit.SECONDS) + .readTimeout(60, TimeUnit.SECONDS) + .build(); + } + + return httpClient; + } + public ServerResponse getMarket() { String market_url = "https://hq.sinajs.cn/rn=1520407404627&list=s_sh000001,s_sz399001,s_sz399006,s_sz399300,s_sz399005,s_sz399673,s_sz399106,s_sz399004,s_sz399100"; String result = null; @@ -623,6 +659,53 @@ public class StockService { return null; } + //印度股票个股详情 英财 + public ServerResponse getYCStockInfo(String codeId) { + String sina_result = ""; + + try { + INDStockInfo indStockInfo = new INDStockInfo(); + String tmpl = "https://cnappapi.investing.com/get_screen.php?v2=1&additionalTimeframes=Yes&time_utc_offset=28800&overview_table_order=0&skinID=1&lang_ID=6&include_pair_attr=true&screen_ID=22&pair_ID={}"; + String url = StrFormatter.format(tmpl, codeId); + log.info("url: {}", url); + Builder builder = new Request.Builder().url(url).method("GET", null); + addHeader(builder, API_HEADER); + sina_result = httpClient().newCall(builder.build()).execute().body().string(); + JSONArray pairs_data = JSON.parseObject(sina_result) + .getJSONArray("data").getJSONObject(0) + .getJSONObject("screen_data").getJSONArray("pairs_data"); + + JSONArray overview_table = pairs_data.getJSONObject(0).getJSONArray("overview_table"); + JSONObject info_header = pairs_data.getJSONObject(0).getJSONObject("info_header"); + indStockInfo.setClose(find_overview_table_value_with_key(overview_table, "昨收")); + indStockInfo.setVolume(find_overview_table_value_with_key(overview_table, "成交量")); + indStockInfo.setOpen(find_overview_table_value_with_key(overview_table, "开盘")); + String range = find_overview_table_value_with_key(overview_table, "当日幅度"); //6.91 - 7.89 + if(StringUtils.isNotBlank(range)) { + String[] split = range.trim().split("-"); + indStockInfo.setLow(numberToString(split[0])); + indStockInfo.setHigh(numberToString(split[1])); + } + String last = info_header.getString("last"); //当前价 + indStockInfo.setPrice(numberToString(last)); + + String percent_tooltip_value = info_header.getString("percent_tooltip_value"); //涨幅 + indStockInfo.setPrice(percent_tooltip_value); + String change = info_header.getString("change"); //涨幅值 ("+0.65") + if(change.startsWith("+")) { + indStockInfo.setChange(numberToString(change.substring(1))); + } else { + indStockInfo.setChange(numberToString(change)); + } + + return ServerResponse.createBySuccess(indStockInfo); + + } catch (Exception e) { + log.error("获取出错，错误信息 = {}", e); + } + return null; + } + //印度股票时线-K线 public ServerResponse getTimeK(String stockCode) { String sina_result = ""; @@ -643,7 +726,7 @@ public class StockService { String sina_result = ""; try { - sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/7310/historical/chart/?interval=PT5M&pointscount="+codeId); + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/"+codeId+"/historical/chart/?interval=PT5M&pointscount=160"); JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); return ServerResponse.createBySuccess(json); @@ -673,7 +756,7 @@ public class StockService { String sina_result = ""; try { - sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1D&pointscount="+codeId); + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/"+codeId+"/historical/chart/?interval=P1D&pointscount=160"); JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); return ServerResponse.createBySuccess(json); @@ -704,7 +787,7 @@ public class StockService { String sina_result = ""; try { - sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1W&pointscount="+codeId); + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/"+codeId+"/historical/chart/?interval=P1W&pointscount=160"); JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); return ServerResponse.createBySuccess(json); @@ -734,7 +817,7 @@ public class StockService { String sina_result = ""; try { - sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/17984/historical/chart/?interval=P1M&pointscount="+codeId); + sina_result = HttpClientRequest.http2Get("https://api.investing.com/api/financialdata/"+codeId+"/historical/chart/?interval=P1M&pointscount=160"); JSONObject json = JSONObject.parseObject(sina_result).getJSONObject("Time Series (Daily)"); return ServerResponse.createBySuccess(json); @@ -771,4 +854,29 @@ public class StockService { } return ServerResponse.createByErrorMsg("请求失败"); } + + public static String find_overview_table_value_with_key(JSONArray overview_table_value, String key) { + for (Object obj : overview_table_value) { + JSONObject item = (JSONObject) obj; + if(StringUtils.equals(item.getString("key"), key)) { + return item.getString("val"); + } + } + + return null; + } + + public static String numberToString(String string) { + return StringUtils.replace(string, ",", ""); + } + + public static void addHeader(Builder builder,String headerLines) { + String[] headers = StringUtils.split(headerLines, "\n"); + for (String header : headers) { + String[] split2 = StringUtils.split(header, ": "); + String key = split2[0]; + String value = StringUtils.substring(header, key.length() + 2); + builder.header(key, value); + } + } } \ No newline at end of file diff --git a/src/main/java/cn/stock/market/utils/SSLSocketClientUtil.java b/src/main/java/cn/stock/market/utils/SSLSocketClientUtil.java new file mode 100644 index 0000000..65020f6 --- /dev/null +++ b/src/main/java/cn/stock/market/utils/SSLSocketClientUtil.java @@ -0,0 +1,60 @@ +package cn.stock.market.utils; + +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +public class SSLSocketClientUtil { + + public static SSLSocketFactory getSocketFactory(TrustManager manager) { + SSLSocketFactory socketFactory = null; + try { + SSLContext sslContext = SSLContext.getInstance("SSL"); + sslContext.init(null, new TrustManager[]{manager}, new SecureRandom()); + socketFactory = sslContext.getSocketFactory(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (KeyManagementException e) { + e.printStackTrace(); + } + return socketFactory; + } + + public static X509TrustManager getX509TrustManager() { + return new X509TrustManager() { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { + + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { + + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + }; + } + + public static HostnameVerifier getHostnameVerifier() { + HostnameVerifier hostnameVerifier = new HostnameVerifier() { + @Override + public boolean verify(String s, SSLSession sslSession) { + return true; + } + }; + return hostnameVerifier; + } +} \ No newline at end of file diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index dc05731..3c7f9e5 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -119,7 +119,7 @@ public class StockApiController { @ApiOperation(value = "印度股票个股详情", httpMethod = "GET") @ResponseBody public ServerResponse getINDStockInfo(@RequestParam("stockCode") String stockCode) { - return this.stockService.getStockInfo(stockCode); + return this.stockService.getYCStockInfo(stockCode); } //印度股票时线-K线 From cbea156aea6e536ce42be84696d51775ba04ba45 Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Fri, 1 Dec 2023 17:27:35 +0800 Subject: [PATCH 05/62] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/repository/StockRepository.java | 2 +- .../domain/basic/service/StockService.java | 5 +- .../market/infrastructure/db/po/QCityPO.java | 57 ----------------- .../market/infrastructure/db/po/QCounter.java | 47 -------------- .../market/infrastructure/db/po/QDic.java | 41 ------------ .../infrastructure/db/po/QJsonInfoPO.java | 45 ------------- .../infrastructure/db/po/QRealtimePO.java | 51 --------------- .../infrastructure/db/po/QSiteArticlePO.java | 61 ------------------ .../infrastructure/db/po/QSiteNewsPO.java | 61 ------------------ .../infrastructure/db/po/QSysLogPO.java | 63 ------------------- .../stockdb/po/QSiteSettingPO.java | 39 ------------ .../infrastructure/stockdb/po/QStockPO.java | 61 ------------------ 12 files changed, 2 insertions(+), 531 deletions(-) delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QDic.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java delete mode 100644 src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java 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 6eb589e..f4c27a7 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,6 +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 org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -21,7 +22,6 @@ 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.QStockPO; import cn.stock.market.infrastructure.stockdb.po.StockPO; import cn.stock.market.infrastructure.stockdb.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 b165c8f..6e06c81 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,9 +16,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.select.Elements; +import cn.stock.market.infrastructure.stockdb.po.QStockPO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.HttpEntity; @@ -43,7 +41,6 @@ import cn.stock.market.infrastructure.api.sina.vo.MarketVO; import cn.stock.market.infrastructure.api.sina.vo.MarketVOResult; import cn.stock.market.infrastructure.api.sina.vo.k.MinDataVO; import cn.stock.market.infrastructure.api.sina.vo.k.echarts.EchartsDataVO; -import cn.stock.market.infrastructure.stockdb.po.QStockPO; import cn.stock.market.utils.GetPyByChinese; import cn.stock.market.utils.HttpClientRequest; import cn.stock.market.utils.PropertiesUtil; diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java deleted file mode 100644 index b3f51fc..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QCityPO.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QCityPO is a Querydsl query type for CityPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QCityPO extends EntityPathBase { - - private static final long serialVersionUID = -1922934307L; - - public static final QCityPO cityPO = new QCityPO("cityPO"); - - public final StringPath cityCode = createString("cityCode"); - - public final NumberPath id = createNumber("id", Integer.class); - - public final StringPath latitude = createString("latitude"); - - public final StringPath levelType = createString("levelType"); - - public final StringPath longitude = createString("longitude"); - - public final StringPath name = createString("name"); - - public final StringPath parentId = createString("parentId"); - - public final StringPath path = createString("path"); - - public final StringPath remark = createString("remark"); - - public final StringPath shortName = createString("shortName"); - - public final StringPath zipCode = createString("zipCode"); - - public QCityPO(String variable) { - super(CityPO.class, forVariable(variable)); - } - - public QCityPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QCityPO(PathMetadata metadata) { - super(CityPO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java b/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java deleted file mode 100644 index b4e09d0..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QCounter.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QCounter is a Querydsl query type for Counter - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QCounter extends EntityPathBase { - - private static final long serialVersionUID = 690984745L; - - public static final QCounter counter = new QCounter("counter"); - - public final NumberPath count = createNumber("count", Long.class); - - public final DateTimePath createTime = createDateTime("createTime", java.util.Date.class); - - public final StringPath fkId = createString("fkId"); - - public final StringPath k = createString("k"); - - public final StringPath type = createString("type"); - - public final DateTimePath updateTime = createDateTime("updateTime", java.util.Date.class); - - public QCounter(String variable) { - super(Counter.class, forVariable(variable)); - } - - public QCounter(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QCounter(PathMetadata metadata) { - super(Counter.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java b/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java deleted file mode 100644 index 1657c83..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QDic.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QDic is a Querydsl query type for Dic - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QDic extends EntityPathBase { - - private static final long serialVersionUID = -1801755605L; - - public static final QDic dic = new QDic("dic"); - - public final DateTimePath createTime = createDateTime("createTime", java.util.Date.class); - - public final StringPath k = createString("k"); - - public final StringPath val = createString("val"); - - public QDic(String variable) { - super(Dic.class, forVariable(variable)); - } - - public QDic(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QDic(PathMetadata metadata) { - super(Dic.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java deleted file mode 100644 index 266e8cd..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QJsonInfoPO.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QJsonInfoPO is a Querydsl query type for JsonInfoPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QJsonInfoPO extends EntityPathBase { - - private static final long serialVersionUID = 537860584L; - - public static final QJsonInfoPO jsonInfoPO = new QJsonInfoPO("jsonInfoPO"); - - public final DateTimePath createAt = createDateTime("createAt", java.util.Date.class); - - public final StringPath ext = createString("ext"); - - public final NumberPath id = createNumber("id", Integer.class); - - public final StringPath type = createString("type"); - - public final DateTimePath updateAt = createDateTime("updateAt", java.util.Date.class); - - public QJsonInfoPO(String variable) { - super(JsonInfoPO.class, forVariable(variable)); - } - - public QJsonInfoPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QJsonInfoPO(PathMetadata metadata) { - super(JsonInfoPO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java deleted file mode 100644 index fa06b13..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QRealtimePO.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QRealtimePO is a Querydsl query type for RealtimePO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QRealtimePO extends EntityPathBase { - - private static final long serialVersionUID = -677602211L; - - public static final QRealtimePO realtimePO = new QRealtimePO("realtimePO"); - - public final NumberPath amounts = createNumber("amounts", Integer.class); - - public final NumberPath averagePrice = createNumber("averagePrice", Double.class); - - public final NumberPath id = createNumber("id", Integer.class); - - public final NumberPath price = createNumber("price", Double.class); - - public final NumberPath rates = createNumber("rates", Double.class); - - public final StringPath stockCode = createString("stockCode"); - - public final StringPath time = createString("time"); - - public final NumberPath volumes = createNumber("volumes", Integer.class); - - public QRealtimePO(String variable) { - super(RealtimePO.class, forVariable(variable)); - } - - public QRealtimePO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QRealtimePO(PathMetadata metadata) { - super(RealtimePO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java deleted file mode 100644 index 323dc56..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteArticlePO.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QSiteArticlePO is a Querydsl query type for SiteArticlePO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QSiteArticlePO extends EntityPathBase { - - private static final long serialVersionUID = -38085285L; - - public static final QSiteArticlePO siteArticlePO = new QSiteArticlePO("siteArticlePO"); - - public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); - - public final StringPath artCnt = createString("artCnt"); - - public final StringPath artImg = createString("artImg"); - - public final StringPath artSummary = createString("artSummary"); - - public final StringPath artTitle = createString("artTitle"); - - public final StringPath artType = createString("artType"); - - public final StringPath author = createString("author"); - - public final NumberPath hitTimes = createNumber("hitTimes", Integer.class); - - public final NumberPath id = createNumber("id", Integer.class); - - public final NumberPath isShow = createNumber("isShow", Integer.class); - - public final StringPath sourceId = createString("sourceId"); - - public final StringPath spiderUrl = createString("spiderUrl"); - - public final NumberPath views = createNumber("views", Integer.class); - - public QSiteArticlePO(String variable) { - super(SiteArticlePO.class, forVariable(variable)); - } - - public QSiteArticlePO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QSiteArticlePO(PathMetadata metadata) { - super(SiteArticlePO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java deleted file mode 100644 index 9d6eb24..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QSiteNewsPO.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QSiteNewsPO is a Querydsl query type for SiteNewsPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QSiteNewsPO extends EntityPathBase { - - private static final long serialVersionUID = 525777388L; - - public static final QSiteNewsPO siteNewsPO = new QSiteNewsPO("siteNewsPO"); - - public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); - - public final StringPath content = createString("content"); - - public final StringPath description = createString("description"); - - public final NumberPath id = createNumber("id", Integer.class); - - public final StringPath imgurl = createString("imgurl"); - - public final DateTimePath showTime = createDateTime("showTime", java.util.Date.class); - - public final StringPath sourceId = createString("sourceId"); - - public final StringPath sourceName = createString("sourceName"); - - public final NumberPath status = createNumber("status", Integer.class); - - public final StringPath title = createString("title"); - - public final NumberPath type = createNumber("type", Integer.class); - - public final DateTimePath updateTime = createDateTime("updateTime", java.util.Date.class); - - public final NumberPath views = createNumber("views", Integer.class); - - public QSiteNewsPO(String variable) { - super(SiteNewsPO.class, forVariable(variable)); - } - - public QSiteNewsPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QSiteNewsPO(PathMetadata metadata) { - super(SiteNewsPO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java deleted file mode 100644 index 742df59..0000000 --- a/src/main/java/cn/stock/market/infrastructure/db/po/QSysLogPO.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.stock.market.infrastructure.db.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QSysLogPO is a Querydsl query type for SysLogPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QSysLogPO extends EntityPathBase { - - private static final long serialVersionUID = -2037818903L; - - public static final QSysLogPO sysLogPO = new QSysLogPO("sysLogPO"); - - public final StringPath actionType = createString("actionType"); - - public final StringPath content = createString("content"); - - public final DateTimePath createAt = createDateTime("createAt", java.util.Date.class); - - public final StringPath ext = createString("ext"); - - public final NumberPath id = createNumber("id", Integer.class); - - public final StringPath module = createString("module"); - - public final StringPath operatorId = createString("operatorId"); - - public final StringPath operatorName = createString("operatorName"); - - public final StringPath operatorPhone = createString("operatorPhone"); - - public final StringPath roleType = createString("roleType"); - - public final NumberPath storeId = createNumber("storeId", Integer.class); - - public final StringPath title = createString("title"); - - public final StringPath uniqueId = createString("uniqueId"); - - public final DateTimePath updateAt = createDateTime("updateAt", java.util.Date.class); - - public QSysLogPO(String variable) { - super(SysLogPO.class, forVariable(variable)); - } - - public QSysLogPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QSysLogPO(PathMetadata metadata) { - super(SysLogPO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java deleted file mode 100644 index c9e4d71..0000000 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QSiteSettingPO.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.stock.market.infrastructure.stockdb.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QSiteSettingPO is a Querydsl query type for SiteSettingPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QSiteSettingPO extends EntityPathBase { - - private static final long serialVersionUID = -51441337L; - - public static final QSiteSettingPO siteSettingPO = new QSiteSettingPO("siteSettingPO"); - - public final NumberPath id = createNumber("id", Integer.class); - - public final StringPath marketServerList = createString("marketServerList"); - - public QSiteSettingPO(String variable) { - super(SiteSettingPO.class, forVariable(variable)); - } - - public QSiteSettingPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QSiteSettingPO(PathMetadata metadata) { - super(SiteSettingPO.class, metadata); - } - -} - diff --git a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java b/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java deleted file mode 100644 index 5dd97b5..0000000 --- a/src/main/java/cn/stock/market/infrastructure/stockdb/po/QStockPO.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.stock.market.infrastructure.stockdb.po; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; -import com.querydsl.core.types.Path; - - -/** - * QStockPO is a Querydsl query type for StockPO - */ -@Generated("com.querydsl.codegen.EntitySerializer") -public class QStockPO extends EntityPathBase { - - private static final long serialVersionUID = -1246401708L; - - public static final QStockPO stockPO = new QStockPO("stockPO"); - - public final DateTimePath addTime = createDateTime("addTime", java.util.Date.class); - - public final NumberPath id = createNumber("id", Integer.class); - - public final NumberPath increaseRatio = createNumber("increaseRatio", java.math.BigDecimal.class); - - public final NumberPath isLock = createNumber("isLock", Integer.class); - - public final NumberPath isShow = createNumber("isShow", Integer.class); - - public final NumberPath spreadRate = createNumber("spreadRate", java.math.BigDecimal.class); - - public final StringPath stockCode = createString("stockCode"); - - public final StringPath stockGid = createString("stockGid"); - - public final StringPath stockName = createString("stockName"); - - public final StringPath stockPlate = createString("stockPlate"); - - public final StringPath stockSpell = createString("stockSpell"); - - public final NumberPath stockState = createNumber("stockState", Integer.class); - - public final StringPath stockType = createString("stockType"); - - public QStockPO(String variable) { - super(StockPO.class, forVariable(variable)); - } - - public QStockPO(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QStockPO(PathMetadata metadata) { - super(StockPO.class, metadata); - } - -} - From 7a326e6ef272c542fdfafad03fa4b28c8cef74e5 Mon Sep 17 00:00:00 2001 From: rplees Date: Fri, 1 Dec 2023 19:08:04 +0800 Subject: [PATCH 06/62] no message --- .gitlab-ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb07f4d..db0fe76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,10 +25,10 @@ build: ' > $HOME/.m2/settings.xml artifacts: - name: stock-market.war + name: india_stock_market.jar expire_in: 1 day paths: - - ./target/stock-market.war + - ./target/india_stock_market.jar script: - echo ">>>>>>Start Building<<<<<<" - pwd @@ -36,22 +36,17 @@ build: - mvn -v - mvn clean install -Dmaven.test.skip=true - ls - #- apt-get install -y curl - #- curl --max-time 20 http://43.128.20.12:11113/api/webhook/justpull?project=api\&setenv_file=alpha.sh\&publish_env=alpha - echo ">>>>>>Finish Building<<<<<<" webhook: stage: webhook - #tags: - # - gz only: - - main - develop script: - echo ">>>>>>Start Deploy<<<<<<" - ls - apt-get update - apt-get install -y curl - - curl --max-time 30 http://43.139.146.165:11113/api/webhook/justpull?project=market\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-alpha.sh + - curl --max-time 30 http://43.132.212.180:11113/api/webhook/justpull?project=india_stock_market\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh - echo ">>>>>>Start Deploy Finish<<<<<<" From 9d226490173f8d7acb0019f1068d105aa17c588f Mon Sep 17 00:00:00 2001 From: rplees Date: Fri, 1 Dec 2023 19:15:43 +0800 Subject: [PATCH 07/62] no message --- .gitlab-ci.yml | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db0fe76..e6f4525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,10 +25,10 @@ build: ' > $HOME/.m2/settings.xml artifacts: - name: india_stock_market.jar + name: india_market_java.jar expire_in: 1 day paths: - - ./target/india_stock_market.jar + - ./target/india_market_java.jar script: - echo ">>>>>>Start Building<<<<<<" - pwd @@ -46,7 +46,7 @@ webhook: - ls - apt-get update - apt-get install -y curl - - curl --max-time 30 http://43.132.212.180:11113/api/webhook/justpull?project=india_stock_market\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh + - curl --max-time 30 http://43.132.212.180:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh - echo ">>>>>>Start Deploy Finish<<<<<<" diff --git a/pom.xml b/pom.xml index c71da9c..ac329f3 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ - india_stock_market + india_market_java \\n \\n
\\n \\n
\\n \\\"BS_logo\\\"\\n