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

# Conflicts:
#	src/main/java/cn/stock/market/domain/basic/service/StockService.java
This commit is contained in:
gs
2024-06-20 14:47:53 +08:00
22 changed files with 1014 additions and 115 deletions

View File

@@ -1,6 +1,7 @@
stages:
# 构建
- build
- dockerize
- webhook
build:
@@ -37,6 +38,28 @@ build:
- mvn clean install -Dmaven.test.skip=true
- ls
- echo ">>>>>>Finish Building<<<<<<"
dockerize:
stage: dockerize
tags:
- hk2
dependencies:
- build
only:
- main
- develop
script:
- echo ">>>>>>Start Building Image<<<<<<"
- ls
- ls target
- echo $DOCKER_PASSWORD
- echo $CI_PIPELINE_ID
- docker build -t juyoutech/india_stock_market:latest .
- docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_PIPELINE_ID
- docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_COMMIT_BRANCH
- docker login -u juyoutech -p dckr_pat_8rg23IBA2kZMOCX4IJKApb8m5l8
- docker push juyoutech/india_stock_market:latest
- docker push juyoutech/india_stock_market:$CI_PIPELINE_ID
- docker push juyoutech/india_stock_market:$CI_COMMIT_BRANCH
webhook:
stage: webhook
only:
@@ -46,7 +69,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_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
- curl --max-time 30 http://149.88.86.7:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
- echo ">>>>>>Start Deploy Finish<<<<<<"

17
Dockerfile Normal file
View File

@@ -0,0 +1,17 @@
FROM openjdk:8
RUN echo "deb http://archive.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list \
&& echo "deb-src http://archive.debian.org/debian/ stretch main contrib non-free" >> /etc/apt/sources.list \
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid
RUN apt-get update
#RUN apt-get install -y iputils-ping dnsutils vim net-tools --allow-unauthenticated
WORKDIR /app
COPY target/india_market_java.jar /app/app.jar
COPY docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
CMD ["docker-entrypoint.sh"]

21
docker-entrypoint.sh Normal file
View File

@@ -0,0 +1,21 @@
#!/bin/sh
export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \
-Dspring.redis.host=$REDIS_HOST \
-Dspring.redis.password=$REDIS_PASS \
-Dmarket.domain=$MARKET_HOST \
-Dspring.redis.port=$REDIS_PORT \
-Dspring.datasource.stock-market.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
-Dspring.datasource.stock-market.username=$MYSQL_USER \
-Dspring.datasource.stock-market.password=$MYSQL_PASSWORD \
-Dspring.datasource.stock.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
-Dspring.datasource.stock.username=$MYSQL_USER \
-Dspring.datasource.stock.password=$MYSQL_PASSWORD"
echo 'param:'$@
echo 'JAVA_OPTS:'$JAVA_OPTS
java $JAVA_OPTS -jar /app/app.jar $@
tail -f /dev/null

View File

@@ -264,7 +264,7 @@
<repositories>
<repository>
<id>nexus</id>
<url>https://nexus.duofu88.com/repository/maven-public/</url>
<url>https://nexus.main99.com/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>

View File

@@ -1,22 +1,19 @@
package cn.stock.market.domain.basic.service;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
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.EttechchartsApis;
import cn.stock.market.infrastructure.api.GrowwInApis;
import cn.stock.market.infrastructure.api.TodayApis;
import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
import cn.stock.market.infrastructure.api.investing.InvestingApis;
@@ -28,16 +25,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Stopwatch;
import okhttp3.OkHttpClient;
import okhttp3.Protocol;
import okhttp3.Request;
import okhttp3.Request.Builder;
import org.apache.commons.lang3.StringUtils;
import cn.stock.market.infrastructure.db.po.QStockPO;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.HttpEntity;
@@ -62,11 +54,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.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;
@@ -986,4 +973,149 @@ public class StockService {
}
return ServerResponse.createBySuccess(indexVoList);
}
public ServerResponse getIndexByBtoday(){
List<IndiaIndexVo> indexVoList = new ArrayList<>();
try {
String exchange = "bse";
IndiaIndexVo vo1 = new IndiaIndexVo();
String coCode = "20558";
JSONObject object = TodayApis.getStockDetail(exchange, coCode);
IndiaStockVO market = objToVo(object);
market.setName("BSESENSEX指数");
vo1.setIndexVo(market);
//获取k线图 1D 当天的数据
String format = "S";
String durationType = "D";
String duration = "1";
List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
vo1.setKLine(kine);
indexVoList.add(vo1);
}catch (Exception e){
log.error("BToday获取BSESENSEX指数数据异常异常信息。。。。", e);
try {
GrowwInApis.requestSenSexData(indexVoList);
} catch (Exception e1) {
log.error("GrowwIn获取BSESENSEX指数数据异常异常信息。。。。", e1);
try{
EttechchartsApis.requestSensexData(indexVoList);
} catch (Exception e2) {
log.error("Ettechcharts获取BSESENSEX指数数据异常异常信息。。。。", e2);
}
}
}
try {
String exchange = "nse";
IndiaIndexVo vo1 = new IndiaIndexVo();
String coCode = "20559";
JSONObject object = TodayApis.getStockDetail(exchange, coCode);
IndiaStockVO market = objToVo(object);
market.setName("NIFTY50指数");
vo1.setIndexVo(market);
//获取k线图 1D 当天的数据
String format = "S";
String durationType = "D";
String duration = "1";
List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
vo1.setKLine(kine);
indexVoList.add(vo1);
}catch (Exception e){
log.error("BToday获取NIFTY50指数数据异常异常信息。。。。", e);
try {
GrowwInApis.requestNifty50Data(indexVoList);
} catch (Exception e1) {
log.error("GrowwIn获取NIFTY50指数数据异常异常信息。。。。", e1);
try{
EttechchartsApis.requestNifty50Data(indexVoList);
} catch (Exception e2) {
log.error("Ettechcharts获取NIFTY50指数数据异常异常信息。。。。", e2);
}
}
}
return ServerResponse.createBySuccess(indexVoList);
}
private IndiaStockVO objToVo(JSONObject object){
IndiaStockVO market = new IndiaStockVO();
if(object.containsKey("prev_close")){
market.setClose(object.getString("prev_close"));
}
if(object.containsKey("price")){
market.setNowPrice(object.getString("price"));
}
if(object.containsKey("perchg")){
market.setRate(object.getString("perchg"));
}
if(object.containsKey("high_price")){
market.setHigh(object.getString("high_price"));
}
if(object.containsKey("low_price")){
market.setLow(object.getString("low_price"));
}
if(object.containsKey("open_price")){
market.setOpen(object.getString("open_price"));
}
return market;
// stockListVO.setName(jsonObject.getString("companyname"));
// stockListVO.setCode(jsonObject.getString("co_code"));
// stockListVO.setSpell(jsonObject.getString("symbol"));
// stockListVO.setGid(jsonObject.getString("co_code"));
// stockListVO.setNowPrice(jsonObject.getString("price"));
// stockListVO.setHcrate(jsonObject.getBigDecimal("perchg"));
// stockListVO.setToday_max(jsonObject.getString("high_price"));
// stockListVO.setToday_min(jsonObject.getString("low_price"));
// stockListVO.setBusiness_balance(jsonObject.getString("val_traded"));
// stockListVO.setBusiness_amount(jsonObject.getString("vol_traded"));
// stockListVO.setPreclose_px(jsonObject.getString("prev_close"));
// stockListVO.setOpen_px(jsonObject.getString("open_price"));
}
public ServerResponse getEttechcharts(){
List<IndiaIndexVo> indexVoList = new ArrayList<>();
try {
//获取详情
String indexid = "2365";
String exchange = "47";
String keyName = "sensex";
IndiaIndexVo vo1 = new IndiaIndexVo();
JSONObject object = EttechchartsApis.getStockDetail(indexid, exchange,keyName);
IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
market.setName("BSESENSEX指数");
vo1.setIndexVo(market);
//获取k线图 1min 当天的数据 分钟
String scripcode = "SENSEX";
List kine = EttechchartsApis.getStockKline(scripcode,exchange);
vo1.setKLine(kine);
indexVoList.add(vo1);
}catch (Exception e){
log.info("获取BSESENSEX指数数据异常异常信息{}。。。。",e.getMessage());
}
try {
//获取详情
String indexid = "2369";
String exchangeid = "50";
String keyName = "nifty";
IndiaIndexVo vo1 = new IndiaIndexVo();
JSONObject object = EttechchartsApis.getStockDetail(indexid, exchangeid,keyName);
IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
market.setName("NIFTY50指数");
vo1.setIndexVo(market);
//获取k线图 1min 当天的数据 分钟
String scripcode = "NSE+Index";
List kine = EttechchartsApis.getStockKline(scripcode,exchangeid);
vo1.setKLine(kine);
indexVoList.add(vo1);
}catch (Exception e){
log.info("获取NIFTY50指数数据异常异常信息{}。。。。",e.getMessage());
}
return ServerResponse.createBySuccess(indexVoList);
}
}

View File

@@ -0,0 +1,18 @@
package cn.stock.market.dto;
import lombok.Data;
@Data
public class TodayStockDTO {
private String stockType;
private String stockName;
private String stockUrl;
private String highPrice;
private String lowPrice;
private String lastPrice;
private String prevClosePrice;
private String change;
private String changePercent;
private String dispId;
private String scId;
}

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,233 @@
package cn.stock.market.infrastructure.api;
import cn.stock.market.dto.TodayStockDTO;
import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.http.HttpEntity;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 数据来源网站:<a href="https://groww.in/indices/nifty">...</a>, <a href="https://groww.in/indices/sp-bse-sensex">...</a>
*
* @auther jnerh
*/
public class GrowwInApis {
public static final String INDEX_DETAIL_URL = "https://groww.in/v1/api/stocks_data/v1/accord_points/exchange/%s/segment/CASH/latest_indices_ohlc/%s";
public static final String INDEX_KLINE_URL = "https://groww.in/v1/api/charting_service/v2/chart/delayed/exchange/%s/segment/CASH/%s/daily?intervalInMinutes=%s&minimal=true";
public static void requestSenSexData(List<IndiaIndexVo> indexVoList) {
IndiaIndexVo vo1 = new IndiaIndexVo();
JSONObject object = GrowwInApis.getSenSexDetail();
IndiaStockVO market = GrowwInApis.objToVo(object);
market.setName("BSESENSEX指数");
vo1.setIndexVo(market);
List kine = GrowwInApis.getSenSexKline();
vo1.setKLine(kine);
indexVoList.add(vo1);
}
public static void requestNifty50Data(List<IndiaIndexVo> indexVoList) {
IndiaIndexVo vo1 = new IndiaIndexVo();
JSONObject object = GrowwInApis.getNifty50Detail();
IndiaStockVO market = GrowwInApis.objToVo(object);
market.setName("NIFTY50指数");
vo1.setIndexVo(market);
List kine = GrowwInApis.getNifty50Kline();
vo1.setKLine(kine);
indexVoList.add(vo1);
}
/**
* 获取Nifty50指数详情
*/
public static JSONObject getIndexDetail(String exchange, String type) {
String url = String.format(INDEX_DETAIL_URL, exchange, type);
String str = get(url);
return JSON.parseObject(str);
}
/**
* 获取k线图
*/
public static List getIndexKline(String exchange, String type, String intervalInMinutes) {
String url = String.format(INDEX_KLINE_URL, exchange, type, intervalInMinutes);
String str = get(url);
JSONObject object = JSON.parseObject(str);
return getList(object.getString("candles"));
}
/**
* 获取Nifty50指数详情
*/
public static JSONObject getSenSexDetail() {
return getIndexDetail("BSE", "1");
}
/**
* 获取k线图
*/
public static List getSenSexKline() {
return getIndexKline("BSE", "1", "1");
}
/**
* 获取Nifty50指数详情
*/
public static JSONObject getNifty50Detail() {
return getIndexDetail("NSE", "NIFTY");
}
/**
* 获取k线图
*/
public static List getNifty50Kline() {
return getIndexKline("NSE", "NIFTY", "5");
}
static String get(String url) {
CloseableHttpClient httpClient = null;
CloseableHttpResponse response = null;
String result = "";
try {
httpClient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet(url);
httpGet.setHeader("Referer", "https://groww.in/indices/nifty");
httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0");
httpGet.setHeader("X-App-Id", "growwWeb");
httpGet.setHeader("X-Device-Id", "fd4815a2-49e4-570a-931a-0316d4d8a52d");
httpGet.setHeader("X-Device-Type", "desktop");
httpGet.setHeader("X-Platform", "web");
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
httpGet.setConfig(requestConfig);
response = httpClient.execute(httpGet);
HttpEntity entity = response.getEntity();
result = EntityUtils.toString(entity);
} catch (IOException e) {
e.printStackTrace();
} finally {
if (null != response) {
try {
response.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (null != httpClient) {
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return result;
}
public static IndiaStockVO objToVo(JSONObject object) {
IndiaStockVO market = new IndiaStockVO();
if (object.containsKey("close")) {
market.setClose(object.getString("close"));
}
if (object.containsKey("value")) {
market.setNowPrice(object.getString("value"));
}
if (object.containsKey("dayChangePerc")) {
market.setRate(object.getString("dayChangePerc"));
}
if (object.containsKey("high")) {
market.setHigh(object.getString("high"));
}
if (object.containsKey("low")) {
market.setLow(object.getString("low"));
}
if (object.containsKey("open")) {
market.setOpen(object.getString("open"));
}
return market;
}
private static List getList(String json) {
List<JSONObject> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(json);
for (Object obj : jsonArray) {
JSONObject entity = new JSONObject();
JSONArray jsonArray1 = JSON.parseArray(obj.toString());
entity.put("upd_date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(JSON.parseArray(obj.toString()).getLong(0) * 1000)).replace(" ", "T"));
entity.put("price", jsonArray1.getBigDecimal(1));
dataObject.add(entity);
}
return dataObject;
}
private static TodayStockDTO todayStockDTO(JSONObject jsonObject) {
TodayStockDTO dto = new TodayStockDTO();
if (jsonObject.containsKey("exchange")) {
dto.setStockType(jsonObject.getString("exchange"));
} else {
dto.setStockType("");
}
if (jsonObject.containsKey("lname")) {
dto.setStockName(jsonObject.getString("lname"));
} else {
dto.setStockName("");
}
if (jsonObject.containsKey("high_price")) {
dto.setHighPrice(jsonObject.getString("highPrice"));
} else {
dto.setHighPrice("0.00");
}
if (jsonObject.containsKey("low_price")) {
dto.setLowPrice(jsonObject.getString("low_price"));
} else {
dto.setLowPrice("0.00");
}
if (jsonObject.containsKey("price")) {
dto.setLastPrice(jsonObject.getString("price"));
} else {
dto.setLastPrice("0.00");
}
if (jsonObject.containsKey("close_price")) {
dto.setPrevClosePrice(jsonObject.getString("close_price"));
} else {
dto.setPrevClosePrice("0.00");
}
if (jsonObject.containsKey("netchg")) {
dto.setChange(jsonObject.getString("netchg"));
} else {
dto.setChange("0.00");
}
if (jsonObject.containsKey("perchg")) {
dto.setChangePercent(jsonObject.getString("perchg"));
} else {
dto.setChangePercent("0.00");
}
return dto;
}
public static void main(String[] args) {
System.out.println(getNifty50Detail());
System.out.println(getNifty50Kline());
}
}

View File

@@ -1,5 +1,6 @@
package cn.stock.market.infrastructure.api;
import cn.stock.market.dto.TodayStockDTO;
import cn.stock.market.utils.HttpClientRequest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -20,7 +21,7 @@ public class TodayApis {
}
//获取Top Gainers
public static List<JSONObject> getTopGainers(String exchange){
public static List getTopGainers(String exchange){
String url = "https://marketapi.intoday.in/widget/topgainer/view?exchange=" + exchange;
//返回字符串对象格式:{"status_code":1,"success":true,"data":[{}],"message":"Successful","fromredis":true}
String str = get(url);
@@ -32,17 +33,19 @@ public class TodayApis {
if(!bool){
return null;
}
return getList(object.getString("data"),1);
//进行数据转换
List<JSONObject> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(object.getString("data"));
for (Object obj : jsonArray){
JSONObject entity = JSON.parseObject(obj.toString());
dataObject.add(entity);
}
return dataObject;
// List<TodayStockDTO> dataObject = new ArrayList<>();
// JSONArray jsonArray = JSON.parseArray(object.getString("data"));
// for (Object obj : jsonArray){
//// JSONObject entity = JSON.parseObject(obj.toString());
// TodayStockDTO entity = todayStockDTO(JSON.parseObject(obj.toString()));
// dataObject.add(entity);
// }
// return dataObject;
}
//获取Top Losers
public static List<JSONObject> getTopLosers(String exchange){
public static List getTopLosers(String exchange){
String url = "https://marketapi.intoday.in/widget/toploser/view?exchange=" + exchange;
//返回字符串对象格式:{"status_code":1,"success":true,"data":[{}],"message":"Successful","fromredis":true}
String str = get(url);
@@ -54,17 +57,20 @@ public class TodayApis {
if(!bool){
return null;
}
return getList(object.getString("data"),1);
//进行数据转换
List<JSONObject> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(object.getString("data"));
for (Object obj : jsonArray){
JSONObject entity = JSON.parseObject(obj.toString());
dataObject.add(entity);
}
return dataObject;
//// List<TodayStockDTO> dataObject = new ArrayList<>();
// List<JSONObject> dataObject = new ArrayList<>();
// JSONArray jsonArray = JSON.parseArray(object.getString("data"));
// for (Object obj : jsonArray){
// JSONObject entity = JSON.parseObject(obj.toString());
//// TodayStockDTO entity = todayStockDTO(JSON.parseObject(obj.toString()));
// dataObject.add(entity);
// }
// return dataObject;
}
//获取Most Active Volume
public static List<JSONObject> getMostActiveVolume(String exchange){
public static List getMostActiveVolume(String exchange){
String url = "https://marketapi.intoday.in/widget/mostactivetopper/view?exchange=" + exchange;
//返回字符串对象格式:{"status_code":1,"success":true,"data":[{}],"message":"Successful","fromredis":true}
String str = get(url);
@@ -76,17 +82,19 @@ public class TodayApis {
if(!bool){
return null;
}
return getList(object.getString("data"),1);
//进行数据转换
List<JSONObject> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(object.getString("data"));
for (Object obj : jsonArray){
JSONObject entity = JSON.parseObject(obj.toString());
dataObject.add(entity);
}
return dataObject;
// List<TodayStockDTO> dataObject = new ArrayList<>();
// JSONArray jsonArray = JSON.parseArray(object.getString("data"));
// for (Object obj : jsonArray){
//// JSONObject entity = JSON.parseObject(obj.toString());
// TodayStockDTO entity = todayStockDTO(JSON.parseObject(obj.toString()));
// dataObject.add(entity);
// }
// return dataObject;
}
//获取Most Active Value
public static List<JSONObject> getMostActiveValue(String exchange){
public static List getMostActiveValue(String exchange){
String url = "https://marketapi.intoday.in/widget/mostactivetopperbyvalue/view?exchange=" + exchange;
//返回字符串对象格式:{"status_code":1,"success":true,"data":[{}],"message":"Successful","fromredis":true}
String str = get(url);
@@ -98,14 +106,117 @@ public class TodayApis {
if(!bool){
return null;
}
//进行数据转换
return getList(object.getString("data"),1);
// //进行数据转换
// List<TodayStockDTO> dataObject = new ArrayList<>();
// JSONArray jsonArray = JSON.parseArray(object.getString("data"));
// for (Object obj : jsonArray){
//// JSONObject entity = JSON.parseObject(obj.toString());
// TodayStockDTO entity = todayStockDTO(JSON.parseObject(obj.toString()));
// dataObject.add(entity);
// }
// return dataObject;
}
private static List getList(String json, int type){
if(type == 1){
List<JSONObject> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(object.getString("data"));
JSONArray jsonArray = JSON.parseArray(json);
for (Object obj : jsonArray){
JSONObject entity = JSON.parseObject(obj.toString());
dataObject.add(entity);
}
return dataObject;
}else{
//进行数据转换
List<TodayStockDTO> dataObject = new ArrayList<>();
JSONArray jsonArray = JSON.parseArray(json);
for (Object obj : jsonArray){
TodayStockDTO entity = todayStockDTO(JSON.parseObject(obj.toString()));
dataObject.add(entity);
}
return dataObject;
}
}
private static TodayStockDTO todayStockDTO(JSONObject jsonObject){
TodayStockDTO dto = new TodayStockDTO();
if(jsonObject.containsKey("exchange")){
dto.setStockType(jsonObject.getString("exchange"));
}else {
dto.setStockType("");
}
if(jsonObject.containsKey("lname")){
dto.setStockName(jsonObject.getString("lname"));
}else{
dto.setStockName("");
}
if(jsonObject.containsKey("high_price")){
dto.setHighPrice(jsonObject.getString("highPrice"));
}else{
dto.setHighPrice("0.00");
}
if(jsonObject.containsKey("low_price")){
dto.setLowPrice(jsonObject.getString("low_price"));
}else {
dto.setLowPrice("0.00");
}
if(jsonObject.containsKey("price")){
dto.setLastPrice(jsonObject.getString("price"));
}else{
dto.setLastPrice("0.00");
}
if(jsonObject.containsKey("close_price")){
dto.setPrevClosePrice(jsonObject.getString("close_price"));
}else{
dto.setPrevClosePrice("0.00");
}
if(jsonObject.containsKey("netchg")){
dto.setChange(jsonObject.getString("netchg"));
}else{
dto.setChange("0.00");
}
if(jsonObject.containsKey("perchg")){
dto.setChangePercent(jsonObject.getString("perchg"));
}else{
dto.setChangePercent("0.00");
}
return dto;
}
//获取详情
public static JSONObject getStockDetail(String exchange,String coCode){
String url = String.format("https://marketapi.intoday.in/widget/stockdetail/pullview?co_code=%s&exchange=%s",coCode,exchange);
String str = get(url);
JSONObject object = JSON.parseObject(str);
boolean bool = false;
if(object.containsKey("success")){
bool = object.getBoolean("success");
}
if(!bool){
return new JSONObject();
}
JSONArray jsonArray = JSON.parseArray(object.getString("data"));
JSONObject entity = JSON.parseObject(jsonArray.get(0).toString());
return entity;
}
//获取k线图
public static List getStockKline(String exchange, String coCode, String format, String durationType, String duration){
String url = String.format("https://marketapi.intoday.in/widget/pricechart_company/pullview?exchange=%s&co_code=%s&format=%s&durationtype=%s&duration=%s",
exchange, coCode, format, durationType, duration);
String str = get(url);
JSONObject object = JSON.parseObject(str);
boolean bool = false;
if(object.containsKey("success")){
bool = object.getBoolean("success");
}
if(!bool){
return new ArrayList();
}
return getList(object.getString("data"),1);
}
public static void main(String[] args) {

View File

@@ -107,9 +107,12 @@ public class InvestingTask {
}
/*新闻接口*/
@Scheduled(cron = "0 0 1 * * ?")
@Scheduled(cron = "0 0 0/3 * * ?")
public void saveStockNews() {
log.info("英文股票新闻数据同步开始");
try {
String news = stockService.getNews();
log.info("获取英文股票新闻数据----"+news);
List<String> newsList = Arrays.asList(news.split("<a href="));
newsList = newsList.subList(1, newsList.size());
newsList.forEach( n -> {
@@ -131,6 +134,10 @@ public class InvestingTask {
newsRepository.save(siteNews);
}
});
log.info("英文股票新闻数据同步完成");
} catch (Exception e) {
log.info("新闻数据同步异常,异常信息{}。。。。",e.getMessage());
}
}
}

View File

@@ -212,6 +212,59 @@ public class HttpClientRequest {
return result;
}
public static String doEttechchartsGet(String url) {
CloseableHttpClient httpClient = null;
CloseableHttpResponse response = null;
String result = "";
try {
httpClient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet(url);
// httpGet.setHeader(":authority","ettechcharts.indiatimes.com");
// httpGet.setHeader(":method","GET");
// httpGet.setHeader(":scheme","https");
httpGet.setHeader("accept","*/*");
httpGet.setHeader("accept-encoding","gzip, deflate, br");
httpGet.setHeader("accept-language","zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6");
httpGet.setHeader("user-agent","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36");
httpGet.setHeader("Referer", "https://economictimes.indiatimes.com/");
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
httpGet.setConfig(requestConfig);
response = httpClient.execute(httpGet);
HttpEntity entity = response.getEntity();
result = EntityUtils.toString(entity);
} catch (ClientProtocolException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
if (null != response) {
try {
response.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (null != httpClient) {
try {
httpClient.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return result;
}
public static void main(String[] args) {
String url = "https://marketapi.intoday.in/widget/topgainer/view?exchange=nse";
String str = doGet(url);

View File

@@ -66,6 +66,50 @@ public class RequestCacheUtils {
return response;
}
/**
* 根据时间创建缓存
* @param key key
* @param duration 时间(毫秒)
* @return
*/
public static Cache<String, ServerResponse<?>> cacheByMilliseconds(String key,long duration) {
if(! map.containsKey(key)) {
log.info("创建缓存: {}", key);
Cache<String, ServerResponse<?>> cache = CacheBuilder.newBuilder()
.maximumSize(1000)
.expireAfterWrite(duration,TimeUnit.MILLISECONDS)
.weakValues()
.recordStats()
.build(
// new CacheLoader<String, Object>() {
// @Override
// public Object load(String key) throws Exception {
// return func.apply(key);
// }
// }
);
map.put(key, cache);
}
return map.get(key);
}
@SneakyThrows
public static <T> ServerResponse<T> cache(String module, String key,long duration, Function<String, ServerResponse<?>> func) {
Cache<String, ServerResponse<?>> cache = cacheByMilliseconds(module,duration);
AtomicBoolean bool = new AtomicBoolean(true);
ServerResponse<T> response = (ServerResponse<T>) cache.get(key, () -> {
bool.set(false);
return func.apply(key);
});
if(bool.get()) {
log.info("命中缓存 module: {}, key: {}, 时间戳: {}", module, key, System.currentTimeMillis());
}
return response;
}
public static void main(String[] args) throws InterruptedException {
ServerResponse<Object> response = null;
Function<String, ServerResponse<?>> func = (string) -> {

View File

@@ -20,7 +20,7 @@ import cn.stock.market.domain.basic.service.SiteArticleService;
import cn.stock.market.utils.ServerResponse;
@Controller
@RequestMapping({"/api/market/art/", "/api/hq/art/"})
@RequestMapping({"/market/api/market/art/","/market/api/market/art/","/api/market/art/", "/api/hq/art/"})
@Api(tags = "公告信息")
public class ArticleApiController extends BaseController {

View File

@@ -35,7 +35,7 @@ public class BTodayStockController {
@Autowired
private BtodayStockService btodayStockService;
@GetMapping("/api/bToday/kLine")
@GetMapping({"/market/api/bToday/kLine","/api/bToday/kLine"})
@ApiOperation(value = "股票详情K线图",httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name="exchange",value = "BSE或者NSE"),
@@ -140,7 +140,7 @@ public class BTodayStockController {
"fromredis: 标志是否来自 Redis 缓存false 表示不是", response = JSONObject.class),
})
@GetMapping("/api/bToday/stockDetail")
@GetMapping({"/market/api/bToday/stockDetail","/api/bToday/stockDetail"})
@EncryptFilter(decryptRequest = false)
public com.alibaba.fastjson.JSONObject getPriceChartCompanyPullView(
@RequestParam(value = "exchange") String exchange,

View File

@@ -25,7 +25,7 @@ import springfox.documentation.annotations.ApiIgnore;
* @created Dec 4, 2018 10:22:44 PM
*/
@RestController
@RequestMapping("/api/hq/")
@RequestMapping({"/market/api/hq/","/api/hq/"})
@ApiIgnore
public class InfoController {
@Value("${spring.application.name}")
@@ -40,6 +40,7 @@ public class InfoController {
public Map<String, Object> test(@RequestParam(required = false) String key) {
Map<String, Object> map = Maps.newHashMap();
map.put("stockMarketDbUrl", stockMarketDbUrl);
map.put("stockMarketDbUrl1", stockMarketDbUrl);
if(StringUtils.isNotBlank(key)) {
map.put("key", PropertiesUtil.getProperty(key));
}

View File

@@ -1,5 +1,6 @@
package cn.stock.market.web;
import cn.hutool.core.date.DateUtil;
import cn.stock.market.MoneyStockSuggestDTO;
import cn.stock.market.domain.basic.entity.MoneyStock;
import cn.stock.market.domain.basic.repository.MoneyStockRepository;
@@ -37,10 +38,11 @@ import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
@@ -166,13 +168,17 @@ public class MoneyApiController {
"priceprevclose: 前一交易日的收盘价\n" +
"30DayAvg: 过去30天的平均", response = JSONObject.class),
})
@GetMapping("/api/market/money/getStockDetail")
@GetMapping({"/market/api/market/money/getStockDetail","/api/market/money/getStockDetail"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol ) {
String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s",stockType,symbol);
MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType).and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))).orElse(null);
MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
.and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
.and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
.and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
.orElse(null);
/* if(moneyStock==null){
return ServerResponse.createByErrorMsg("没有找到该股票");
}*/
@@ -203,6 +209,10 @@ public class MoneyApiController {
if(null!=moneyStock){
json1.put("id",moneyStock.getId());
}
if(StringUtils.equals(data.getString("pricecurrent"),"0.00")
&& (!StringUtils.equals(data.getString("priceprevclose"),"0.00"))){
json1.put("pricecurrent",data.getString("priceprevclose"));
}
}
return ServerResponse.createBySuccess(json1);
}
@@ -501,7 +511,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: top gainer", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopGainer")
@GetMapping({"/market/api/market/money/getTopGainer","/api/market/money/getTopGainer"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -517,8 +527,10 @@ public class MoneyApiController {
} else if (StringUtils.equals(stockType, "bse")) {
moneyStockSuggestDTOS = bseGainer();
}
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
Map<Object, Boolean> map = new HashMap<>();
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
.filter(f->StringUtils.isNotBlank(f.getStockName()))
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(selfUlrList)){
@@ -544,7 +556,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: TopLoser", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopLoser")
@GetMapping({"/market/api/market/money/getTopLoser","/api/market/money/getTopLoser"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -557,7 +569,10 @@ public class MoneyApiController {
}else if(StringUtils.equals(stockType,"bse")){
moneyStockSuggestDTOS = bseTopLoser();
}
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
Map<Object, Boolean> map = new HashMap<>();
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
.filter(f->StringUtils.isNotBlank(f.getStockName()))
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
@@ -594,7 +609,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: top active", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopActives")
@GetMapping({"/market/api/market/money/getTopActives","/api/market/money/getTopActives"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -607,7 +622,10 @@ public class MoneyApiController {
}else if(StringUtils.equals(stockType,"bse")){
moneyStockSuggestDTOS = bseActives();
}
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
Map<Object, Boolean> map = new HashMap<>();
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
.filter(f->StringUtils.isNotBlank(f.getStockName()))
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
@@ -636,7 +654,7 @@ public class MoneyApiController {
@GetMapping("/api/market/money/history/kLine")
@GetMapping({"/market/api/market/money/history/kLine","/api/market/money/history/kLine"})
@ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源",response = StockHistoryResponse.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "symbol", value = "Stock symbol 对应的是NSEID 或者是BSEID", required = true, dataType = "String", paramType = "query"),
@@ -659,24 +677,24 @@ public class MoneyApiController {
int countback = 5;
if(StringUtils.equals("H",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (1 * 60 * 60 );
from = to - ( 60 * 60 );
countback = 60;
request.setResolution("1");
}else if(StringUtils.equals("D",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (24 * 60 * 60 );
countback = 9;
request.setResolution("60");
countback = 390;
request.setResolution("1");
}else if(StringUtils.equals("W",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (10 * 24 * 60 * 60 );
countback = 7;
request.setResolution("1D");
from = to - (7 * 24 * 60 * 60 );
countback = 471;
request.setResolution("5");
}else if(StringUtils.equals("M",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (35 * 24 * 60 * 60 );
countback = 30;
request.setResolution("1D");
countback = 328;
request.setResolution("30");
}
request.setFrom(from);
@@ -708,6 +726,7 @@ public class MoneyApiController {
}
if (response != null) {
setResponse(response,resolution);
// API request successful, return the response
return ResponseEntity.ok(response);
} else {
@@ -718,6 +737,50 @@ public class MoneyApiController {
// 返回响应
}
private void setResponse(StockHistoryResponse response,String resolution){
if(!"ok".equals(response.getS())){
return;
}
if(Objects.isNull(response.getT())){
return;
}
if(StringUtils.equals("H",resolution) || StringUtils.equals("D",resolution)) {
List<Long> t = new ArrayList<>();
List<Double> o = new ArrayList<>();
List<Double> h = new ArrayList<>();
List<Double> l = new ArrayList<>();
List<Double> c = new ArrayList<>();
List<Long> v = new ArrayList<>();
//根据时间过滤,只留当天的数据
Date currentTime = new Date();
//判断最后一条是不是当天的数据,如果不是,把最后一条的时间作为当天的时间
long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
if(!DateUtil.isSameDay(currentTime, new Date(getTime))){
currentTime = new Date(getTime);
}
int i = 0;
for (Long time : response.getT()) {
time = time * 1000;
if (DateUtil.isSameDay(currentTime, new Date(time))) {
t.add(response.getT().get(i));
o.add(response.getO().get(i));
h.add(response.getH().get(i));
l.add(response.getL().get(i));
c.add(response.getC().get(i));
v.add(response.getV().get(i));
}
i++;
}
response.setT(t);
response.setO(o);
response.setH(h);
response.setL(l);
response.setC(c);
response.setV(v);
}
}
@@ -742,13 +805,16 @@ public class MoneyApiController {
public static void main(String[] args) {
nseGainer();
nseActives();
nseTopLoser();
bseActives();
bseGainer();
bseTopLoser();
// nseGainer();
//// nseActives();
//// nseTopLoser();
////
//// bseActives();
//// bseGainer();
//// bseTopLoser();
System.out.println(new Date());
System.out.println(new Date(1713949200000L));
System.out.println(DateUtil.isSameDay(new Date(),new Date(1713949200000L)));
}
private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()

View File

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -23,7 +24,7 @@ import java.net.URL;
public class MoneyProxyApiControl {
@RequestMapping(value = "/api/proxy/queryStockMoneyProxy",method = RequestMethod.GET)
@GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
}

View File

@@ -18,7 +18,7 @@ import cn.stock.market.domain.basic.service.SiteNewsService;
import cn.stock.market.utils.ServerResponse;
@Controller
@RequestMapping({"/api/market/news/", "/api/hq/news/"})
@RequestMapping({"/market/api/market/news/", "/market/api/hq/news/","/api/market/news/", "/api/hq/news/"})
@Api(tags="新闻资讯")
public class SiteNewsController {
private static final Logger log = LoggerFactory.getLogger(SiteNewsController.class);

View File

@@ -56,7 +56,7 @@ import springfox.documentation.annotations.ApiIgnore;
@Controller
@Api(value = "/StockApiController", tags = "股票行情")
@RequestMapping({"/api/market/stock/", "/api/hq/stock/"})
@RequestMapping({"/market/api/market/stock/", "/market/api/hq/stock/","/api/market/stock/", "/api/hq/stock/"})
public class StockApiController {
private static final Logger log = LoggerFactory.getLogger(StockApiController.class);
@@ -233,6 +233,25 @@ public class StockApiController {
return this.stockService.getIndiaIndex();
}
@RequestMapping({"getIndiaIndexByToday.do"})
@ApiOperation(value = "印度--获取指定指数信息", httpMethod = "GET")
@ResponseBody
public ServerResponse getIndiaIndexByToday() {
String INDEX_CODE = "TODAY_INDEX";
return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,60000, (string) -> {
return this.stockService.getIndexByBtoday();
});
}
@RequestMapping({"getIndiaIndexByEttech.do"})
@ApiOperation(value = "印度--获取指定指数信息-Ettech", httpMethod = "GET")
@ResponseBody
public ServerResponse getIndiaIndexByEttech() {
String INDEX_CODE = "TODAY_INDEX";
return RequestCacheUtils.cache("getIndiaIndexByEttech.do", INDEX_CODE, (string) -> {
return this.stockService.getEttechcharts();
});
}
//根据股票id查询 股票指数、大盘指数信息
@RequestMapping({"getMarketByStockGid.do"})
@ApiOperation(value = "根据股票id查询 股票指数、大盘指数信息", httpMethod = "GET")

View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@Api(value = "/TodayApiController", tags = "today股票行情")
@RequestMapping({"/api/market/today/"})
@RequestMapping({"/market/api/market/today/","/api/market/today/"})
public class TodayApiController {
@RequestMapping({"getTopGainers.do"})

View File

@@ -17,9 +17,9 @@ spring:
datasource:
stock-market:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://43.132.212.180:33306/india_stock?useUnicode=true&characterEncoding=utf-8
url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8
username: root
password: 33BsUUcnXRYgwt
password: 33BsUUcnXRYgwtIND
maxActive: 500
testWhileIdle: true
validationQuery: SELECT 1

File diff suppressed because one or more lines are too long