详情查询、详情列表查询

# Conflicts:
#   docker-entrypoint.sh

.gitlab-ci.yml

@@ -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://124.156.133.209:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=india/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<<<<<<"
 
 

Dockerfile

@@ -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"]

docker-entrypoint.sh

@@ -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

pom.xml

@@ -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>

src/main/generated/cn/stock/market/infrastructure/db/po/QBtodayStockPO.java

@@ -23,6 +23,10 @@ public class QBtodayStockPO extends EntityPathBase<BtodayStockPO> {
 
     public final NumberPath<Integer> id = createNumber("id", Integer.class);
 
+    public final NumberPath<Integer> isLock = createNumber("isLock", Integer.class);
+
+    public final NumberPath<Integer> isShow = createNumber("isShow", Integer.class);
+
     public final DateTimePath<java.util.Date> lastUpdateTime = createDateTime("lastUpdateTime", java.util.Date.class);
 
     public final StringPath selfUrl = createString("selfUrl");

src/main/generated/cn/stock/market/infrastructure/db/po/QTwelveStockPO.java

@@ -0,0 +1,49 @@
+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;
+
+
+/**
+ * QTwelveStockPO is a Querydsl query type for TwelveStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTwelveStockPO extends EntityPathBase<TwelveStockPO> {
+
+    private static final long serialVersionUID = -100071895L;
+
+    public static final QTwelveStockPO twelveStockPO = new QTwelveStockPO("twelveStockPO");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> isLock = createNumber("isLock", Integer.class);
+
+    public final NumberPath<Integer> isShow = createNumber("isShow", Integer.class);
+
+    public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);
+
+    public final StringPath stockCode = createString("stockCode");
+
+    public final StringPath stockName = createString("stockName");
+
+    public final StringPath stockType = createString("stockType");
+
+    public QTwelveStockPO(String variable) {
+        super(TwelveStockPO.class, forVariable(variable));
+    }
+
+    public QTwelveStockPO(Path<? extends TwelveStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QTwelveStockPO(PathMetadata metadata) {
+        super(TwelveStockPO.class, metadata);
+    }
+
+}
+

src/main/java/cn/stock/market/application/assembler/TwelveStockAssembler.java

@@ -0,0 +1,35 @@
+package cn.stock.market.application.assembler;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.TwelveStockDTO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockAssembler 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockAssembler {
+  public TwelveStockDTO toDTO(TwelveStock e) {
+    TwelveStockDTO dto = Beans.mapper(e, TwelveStockDTO.class);
+    if(dto == null) return dto;
+    fill(e, dto);
+    return  dto;
+  }
+
+  protected void fill(TwelveStock e, TwelveStockDTO dto) {
+    if(dto == null) return;
+    return;
+  }
+
+  public static TwelveStockAssembler of() {
+    return SpringUtils.getBean(TwelveStockAssembler.class);
+  }
+}

src/main/java/cn/stock/market/domain/basic/convert/TwelveStockConvert.java

@@ -0,0 +1,23 @@
+package cn.stock.market.domain.basic.convert;
+
+import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockConvert 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockConvert extends SimpleEntityPOConvert<TwelveStock, TwelveStockPO> {
+  public static TwelveStockConvert of() {
+    return SpringUtils.getBean(TwelveStockConvert.class);
+  }
+}

src/main/java/cn/stock/market/domain/basic/entity/TwelveStock.java

@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStock 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStock extends TwelveStockPO {
+  public void update(TwelveStockCreateCommand cmd) {
+    Beans.copyProperties(cmd, this);
+  }
+}

src/main/java/cn/stock/market/domain/basic/factory/TwelveStockFactory.java

@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.factory;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockFactory 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockFactory {
+  public static TwelveStockFactory of() {
+    return SpringUtils.getBean(TwelveStockFactory.class);
+  }
+
+  public TwelveStock from(TwelveStockCreateCommand cmd) {
+    TwelveStock e = TwelveStock.builder().build();
+    e.update(cmd);
+    return e;
+  }
+}

src/main/java/cn/stock/market/domain/basic/repository/TwelveStockRepository.java

@@ -0,0 +1,46 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.convert.TwelveStockConvert;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import cn.stock.market.infrastructure.db.repo.TwelveStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+import java.lang.Override;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TwelveStockRepository 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Repository
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockRepository extends SimplePoConvertEntityRepository<TwelveStock, TwelveStockPO, Integer> {
+  final TwelveStockRepo repo;
+
+  final TwelveStockConvert convert;
+
+  @Override
+  public GenericJpaRepository<TwelveStockPO, Integer> repo() {
+    return repo;
+  }
+
+  @Override
+  public IEntityPOConvert<TwelveStock, TwelveStockPO> convert() {
+    return convert;
+  }
+
+  public static TwelveStockRepository of() {
+    return SpringUtils.getBean(TwelveStockRepository.class);
+  }
+}

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

@@ -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;
@@ -265,7 +252,7 @@ public class StockService {
 					.header("Referer", "https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
 					.get();
-			result = doc.html().substring(doc.html().indexOf("<div class=\"short-video-img\">"),doc.html().lastIndexOf("<div class=\"short-video-img\">")+500);
+			result = doc.html().substring(doc.html().indexOf("<div class=\"shortvideoimg\" style=\"position:relative\">"),doc.html().lastIndexOf("<div class=\"shortvideoimg\" style=\"position:relative\">")+1200);
 		} catch (Exception e) {
 			return e.toString();
 		}
@@ -945,8 +932,10 @@ public class StockService {
 			market.setName("BSESENSEX指数");
 			vo1.setIndexVo(market);
 
-			String type = "min";
-			List<JSONObject> list = InvestingApis.of().kline(StockCode.of(stockCode), type);
+			String period = "P1D";
+			String interval = "PT5M";
+			String type = "day";
+			List<JSONObject> list = InvestingApis.of().kIndex(stockCode,period,interval, type);
 			if(list == null || list.size() == 0){
 				type = "day";
 				list = InvestingApis.of().kline(StockCode.of(stockCode), type);
@@ -958,13 +947,15 @@ public class StockService {
 		}
 		try {
 			IndiaIndexVo vo2 = new IndiaIndexVo();
-			String stockCode = "8985"; //"17940";
+			String stockCode = "17940"; //"17940";8985
 			IndiaStockVO market = InvestingApis.of().market(StockCode.of(stockCode));
 			market.setName("NIFTY50指数");
 			vo2.setIndexVo(market);
 
-			String type = "min";
-			List<JSONObject> list = InvestingApis.of().kline(StockCode.of(stockCode), type);
+			String period = "P1D";
+			String interval = "PT1M";
+			String type = "day";
+			List<JSONObject> list = InvestingApis.of().kIndex(stockCode,period,interval, type);
 			if(list == null || list.size() == 0){
 				type = "day";
 				list = InvestingApis.of().kline(StockCode.of(stockCode), type);
@@ -976,4 +967,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);
+	}
+
+
 }

src/main/java/cn/stock/market/domain/basic/service/TwelveStockService.java

@@ -0,0 +1,33 @@
+package cn.stock.market.domain.basic.service;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.factory.TwelveStockFactory;
+import cn.stock.market.domain.basic.repository.TwelveStockRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * TwelveStockService 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Service
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockService {
+  final TwelveStockRepository repository;
+
+  final TwelveStockFactory factory;
+
+  public TwelveStockRepository repository() {
+    return repository;
+  }
+
+  public static TwelveStockService of() {
+    return SpringUtils.getBean(TwelveStockService.class);
+  }
+}

src/main/java/cn/stock/market/dto/TodayStockDTO.java

@@ -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;
+}

src/main/java/cn/stock/market/dto/TwelveStockDTO.java

@@ -0,0 +1,23 @@
+package cn.stock.market.dto;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockDTO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockDTO extends TwelveStockPO {
+}

src/main/java/cn/stock/market/dto/TwelveStockData.java

@@ -0,0 +1,22 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class TwelveStockData {
+	
+    private String symbol;
+    
+    private String name;
+    
+    private String currency;
+    
+    private String exchange;
+    
+    private String mic_code;
+    
+    private String country;
+    
+    private String type;
+}
+

src/main/java/cn/stock/market/dto/TwelveStockInfo.java

@@ -0,0 +1,61 @@
+package cn.stock.market.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+/**
+ * TwelveStockInfo类用于存储股票信息。
+ * 该类包含了股票的基本信息和交易数据。
+ */
+@ApiModel("TwelveStockInfo")
+public class TwelveStockInfo {
+    @ApiModelProperty("股票代码")
+    private String stockCode;
+
+    @ApiModelProperty("交易代码")
+    private String symbol;
+
+    @ApiModelProperty("股票名称")
+    private String stockName;
+
+    @ApiModelProperty("股票类型")
+    private String stockType;
+
+    @ApiModelProperty("当前价格")
+    private String lastPrice;
+
+    @ApiModelProperty("变动百分比")
+    private String perchg;
+    @ApiModelProperty("变动值")
+    private String change;
+
+    @ApiModelProperty("开盘价格")
+    private String openPrice;
+
+    @ApiModelProperty("昨日收盘价格")
+    private String previousPrice;
+
+    @ApiModelProperty("成交量")
+    private String volume;
+
+    @ApiModelProperty("最高价格")
+    private String highPrice;
+
+    @ApiModelProperty("最低价格")
+    private String lowPrice;
+
+    @ApiModelProperty("52周最高价格")
+    private String week52HighPrice;
+
+    @ApiModelProperty("52周最低价格")
+    private String week52LowPrice;
+
+    @ApiModelProperty("股票当前的交易状态: 1-表示退市Closed, 2-Opening Auction, 3-Continuous Trading, 15-Intra-day Close (scheduled)")
+    private String status;
+
+    @ApiModelProperty("股票id")
+    private Integer id;
+}
+

src/main/java/cn/stock/market/dto/command/TwelveStockCreateCommand.java

@@ -0,0 +1,48 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockCreateCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+public class TwelveStockCreateCommand {
+  /**
+   * 主键 */
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}

src/main/java/cn/stock/market/dto/command/TwelveStockModifyCommand.java

@@ -0,0 +1,24 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockModifyCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockModifyCommand extends TwelveStockCreateCommand {
+  Integer id;
+}

src/main/java/cn/stock/market/dto/model/StockListVO.java

@@ -35,6 +35,11 @@ public class StockListVO {
     /*是否添加自选：1、添加自选，0、未添加自选*/
     private String isOption;
 
+    private String pricechange;
+
+
+    private String symbol;
+
     public void setCode(String code) {
         this.code = code;
     }
@@ -255,4 +260,20 @@ public class StockListVO {
     public void setIsOption(String isOption) {
         this.isOption = isOption;
     }
+
+    public String getPricechange() {
+        return pricechange;
+    }
+
+    public void setPricechange(String pricechange) {
+        this.pricechange = pricechange;
+    }
+
+    public String getSymbol() {
+        return symbol;
+    }
+
+    public void setSymbol(String symbol) {
+        this.symbol = symbol;
+    }
 }

src/main/java/cn/stock/market/infrastructure/api/GrowwInApis.java

@@ -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());
+    }
+}

src/main/java/cn/stock/market/infrastructure/api/TodayApis.java

@@ -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) {

src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java

@@ -153,7 +153,6 @@ public class InvestingApis {
 		"Time": "1698055197",
 		"Url": "/equities/aditya-birla",
 		"Volume": 3693615
-     * @param httpClient
      * @param currPage
      * @param pageSize
      * @return
@@ -252,6 +251,34 @@ public class InvestingApis {
 				.collect(Collectors.toList())
 				;
 	}
+	public List<JSONObject> kIndex(String code,String period, String interval,String type) throws IOException {
+		if(code == null) {
+			throw new RuntimeException("找不到股票信息");
+		}
+		Date nowDate = new Date();
+		JSONObject json = InvestingInvokerApis.of().__IndiaIndex(code, period,interval);
+		return json
+				.getJSONArray("data")
+				.stream()
+				.map(val -> {
+					JSONArray _ar = (JSONArray) val;
+					JSONObject item = new JSONObject();
+					item.put("date", _ar.get(0));
+					item.put("open", _ar.get(1));
+					item.put("high", _ar.get(2));
+					item.put("low", _ar.get(3));
+					item.put("close", _ar.get(4));
+					item.put("volume", _ar.get(5));
+					return item;
+				}).filter(val -> {
+					if("day".equalsIgnoreCase(type)) {
+						return DateUtil.isSameDay(nowDate, new Date(val.getLong("date")));
+					}
+					return true;
+				})
+				.collect(Collectors.toList())
+				;
+	}
 
 	public static InvestingApis of() {
 		return new InvestingApis();

src/main/java/cn/stock/market/infrastructure/api/investing/InvestingInvokerApis.java

@@ -202,6 +202,15 @@ public class InvestingInvokerApis {
 		return JSON.parseObject(body);
 	}
 
+	public JSONObject __IndiaIndex(String code,String period, String interval)throws IOException {
+		String tmpl = "https://api.investing.com/api/financialdata/{}/historical/chart/?period={}&interval={}&pointscount=160";
+		String url = StrFormatter.format(tmpl, code, period, interval);
+		Builder builder = builderGet(url);
+
+		String body = httpClient().newCall(builder.build()).execute().body().string();
+		return JSON.parseObject(body);
+	}
+	
 	public static InvestingInvokerApis of() {
 		return new InvestingInvokerApis();
 	}

src/main/java/cn/stock/market/infrastructure/db/po/BtodayStockPO.java

@@ -71,4 +71,10 @@ public class BtodayStockPO {
   /**
    * 上次更新时间 */
   Date lastUpdateTime;
+
+  /** 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /** 是否展示  0是  1否 */
+  Integer isShow;
 }

src/main/java/cn/stock/market/infrastructure/db/po/TwelveStockPO.java

@@ -0,0 +1,66 @@
+package cn.stock.market.infrastructure.db.po;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ * TwelveStockPO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+    name = "twelve_stock"
+)
+public class TwelveStockPO {
+  /**
+   * 主键 */
+  @Id
+  @GeneratedValue(
+      strategy = javax.persistence.GenerationType.IDENTITY
+  )
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}

src/main/java/cn/stock/market/infrastructure/db/repo/TwelveStockRepo.java

@@ -0,0 +1,15 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+
+/**
+ * TwelveStockRepo 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+public interface TwelveStockRepo extends GenericJpaRepository<TwelveStockPO, Integer> {
+}

src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java

@@ -107,15 +107,18 @@ 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 -> {
                 String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
                 String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_"));
-            String imgUrl = n.substring(n.indexOf("img src=") + 9, n.indexOf("?"));
+                String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?"));
                 String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
 
                 SiteNews siteNews = new SiteNews();
@@ -131,6 +134,10 @@ public class InvestingTask {
                     newsRepository.save(siteNews);
                 }
             });
+            log.info("英文股票新闻数据同步完成");
+        } catch (Exception e) {
+            log.info("新闻数据同步异常，异常信息{}。。。。",e.getMessage());
+        }
 
     }
 }

src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java

@@ -15,6 +15,7 @@ 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.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,6 +50,7 @@ public class MoneyScraper {
     private MoneyStockRepository moneyStockRepository;
 
     @GetMapping("testScraperGetMoneyControlStock")
+    //@Scheduled(cron = "0 0 2 */1 * ?")
     public void schedule(){
         List<String> letters = new ArrayList<>();
         for (char c = 'A'; c <= 'Z'; c++) {

src/main/java/cn/stock/market/infrastructure/job/Scraper.java

@@ -1,5 +1,6 @@
 package cn.stock.market.infrastructure.job;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.stock.market.domain.basic.entity.BtodayStock;
 import cn.stock.market.domain.basic.entity.StockIpo;
 import cn.stock.market.domain.basic.repository.BtodayStockRepository;
@@ -8,6 +9,7 @@ import cn.stock.market.dto.StockIpoDTO;
 import cn.stock.market.infrastructure.db.po.QStockIpoPO;
 import cn.stock.market.infrastructure.db.po.StockIpoPO;
 import cn.stock.market.infrastructure.db.repo.BtodayStockRepo;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -100,9 +103,10 @@ public class Scraper {
 
 
 
-    @Scheduled(cron = "0 0 5 * * ?")
+    @Scheduled(cron = "0 0 18 * * ?")
     @RequestMapping("/testScraperGetMoneyControllerNewIPO")
-    public  void schedule2() {
+    public  void getMoneyControllerNewIPOSchedule() {
+        log.info("定时任务执行获取新股ipo的方法开始执行");
         // 目标 URL
         String url = "https://www.moneycontrol.com/ipo/open-upcoming-ipos";
         // 创建 HttpClient 实例
@@ -130,7 +134,7 @@ public class Scraper {
 
                     // 将 JSON 字符串解析为 Java JSONObject
                     JSONObject jsonObject = JSONObject.parseObject(jsonDataStr);
-                    log.info(jsonObject.toJSONString());
+                    log.info("获取到新股的json信息:"+jsonObject.toJSONString());
 
                     JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
                     JSONObject ipoTableData = pageProps.getJSONObject("ipoTableData");
@@ -147,11 +151,18 @@ public class Scraper {
                         stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
                         stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
                         stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                        stockIpo.setTotalNumber(entry.getInteger("lot_size"));
+                        Integer totalNumber = 0;
+                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                            Integer issue_size = entry.getInteger("issue_size");
+                            BigDecimal issueSize = new BigDecimal(issue_size);
+                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                            totalNumber = totalNumberBigDecimal.intValue();
+                        }
+                        stockIpo.setTotalNumber(totalNumber);
                         stockIpo.setApply(entry.getString("total_subs"));
                         stockIpo.setCreateDate(new Date());
                         stockIpo.setUpdateDate(new Date());
-                        stockIpo.setSourceType("2");
+                        stockIpo.setSourceType("3");
                         listStockIpoList.add(stockIpo);
                     }
 
@@ -163,7 +174,14 @@ public class Scraper {
                         stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
                         stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
                         stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                        stockIpo.setTotalNumber(entry.getInteger("lot_size"));
+                        Integer totalNumber = 0;
+                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                            Integer issue_size = entry.getInteger("issue_size");
+                            BigDecimal issueSize = new BigDecimal(issue_size);
+                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                            totalNumber = totalNumberBigDecimal.intValue();
+                        }
+                        stockIpo.setTotalNumber(totalNumber);
                         stockIpo.setApply(entry.getString("total_subs"));
                         stockIpo.setCreateDate(new Date());
                         stockIpo.setUpdateDate(new Date());
@@ -173,17 +191,26 @@ public class Scraper {
 
                   //  stockIpoRepository.saveAll(listStockIpoList);
 
-                    List<String> nameList = Lists.transform(listStockIpoList, StockIpo::getStockName);
-                    List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockName.in(nameList));
-                    List<String> existingStockNames = existStockIpoList.stream()
-                            .map(StockIpo::getStockName)
+                    List<String> scIdList = Lists.transform(listStockIpoList, StockIpo::getStockCode);
+                    if(CollectionUtil.isNotEmpty(scIdList)){
+                        List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockCode.in(scIdList));
+                        List<String> existingStockScIds = existStockIpoList.stream()
+                                .map(StockIpo::getStockCode)
                                 .collect(Collectors.toList());
 
                         listStockIpoList = listStockIpoList.stream()
-                            .filter(stockIpos -> !existingStockNames.contains(stockIpos.getStockName()))
+                                .filter(stockIpos -> !existingStockScIds.contains(stockIpos.getStockCode())).filter(stockIpo -> StringUtils.isNotBlank(stockIpo.getStockName()))
                                 .collect(Collectors.toList());
+
                         //保存全部的新股
+                        if(CollectionUtil.isNotEmpty(listStockIpoList)){
                             stockIpoRepository.saveAll(listStockIpoList);
+                            log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
+                        }else {
+                            log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
+                        }
+                    }
+
 
                     // 输出整个 JSON 数据
                 } else {
@@ -195,6 +222,7 @@ public class Scraper {
         } catch (IOException e) {
             log.error("获取新股接口发生异常",e);
         }
+
     }
 
 
@@ -257,6 +285,8 @@ public class Scraper {
                         btodayStock.setSelfUrl(url);
                         btodayStock.setUrl(detailUrl);
                         btodayStock.setLastUpdateTime(new Date());
+                        btodayStock.setIsLock(0);
+                        btodayStock.setIsShow(0);
                         btodayStockRepo.save(btodayStock);
 
                       /*  if (webInfo != null) {

src/main/java/cn/stock/market/infrastructure/job/TwelvedataTask.java

@@ -0,0 +1,105 @@
+package cn.stock.market.infrastructure.job;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Lists;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.domain.basic.service.TwelveStockService;
+import cn.stock.market.dto.TwelveStockData;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.web.config.Config;
+
+@Slf4j
+@Component
+@RestController
+public class TwelvedataTask {
+	
+    @Autowired
+    private TwelveStockService twelveStockService;
+	
+    @GetMapping("/task/syncStockData")
+    @Scheduled(cron = "0 0 18 * * ?")
+    public void syncStockData() {
+        log.info("每天18点定时同步Twelvedata股票数据开始");
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        // 获取股票symbol列表
+        List<TwelveStockData> stockList = getStockList();
+        // 查询出数据库中所有股票
+        List<TwelveStock> allStocks = twelveStockService.repository().findAll();
+        List<String> savedSymbols = allStocks.stream().map(p-> p.getStockCode() + "#" + p.getStockType()).distinct().collect(Collectors.toList());
+        // 去除数据库中已经存在的股票
+        // 使用Iterator安全地移除元素
+        if(stockList!=null && stockList.size()>0) {
+	        Iterator<TwelveStockData> iterator = stockList.iterator();
+	        while (iterator.hasNext()) {
+	        	TwelveStockData stockData = iterator.next();
+	            if (savedSymbols.contains(stockData.getSymbol() + "#" + stockData.getExchange())) { // 根据条件移除元素
+	                iterator.remove();
+	            }
+	        }
+        }
+        //剩余数据入库
+        List<TwelveStock> addList = Lists.newArrayList();
+        if(stockList!=null && stockList.size()>0) {
+        	for(TwelveStockData stockData:stockList) {
+        		addList.add(cover(stockData));
+        	}
+        	twelveStockService.repository().saveAll(addList);
+        }
+        log.info("syncStockData执行, 受影响数{}, 耗时:{}毫秒", addList.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+    }
+    
+    private TwelveStock cover(TwelveStockData data) {
+  	  TwelveStock stock = new TwelveStock();
+  	  stock.setStockCode(data.getSymbol());
+  	  stock.setStockName(data.getName());
+  	  stock.setStockType(data.getExchange());
+  	  stock.setSaveTime(new Date());
+  	  return stock;
+    }
+    
+    private List<TwelveStockData> getStockList() {
+        try {
+        	String source = "docs";
+        	String country = "India";
+        	List<TwelveStockData> list = Lists.newArrayList();
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/stocks?source=%s&country=%s&apikey=%s",source,country,config.getTwelveApikey());
+			String result = HttpRequest.doTwelveGet(url);
+			log.info("getStockList：获取 {} {} 的股票全量列表结束，耗时: {} ms ",source,country,(System.currentTimeMillis()-start));
+			JSONObject jsonObject = JSONObject.parseObject(result);
+			if (jsonObject != null && !jsonObject.isEmpty()) {
+				JSONArray jsonArray = jsonObject.getJSONArray("data");
+				if(jsonArray!=null && jsonArray.size()>0) {
+			        for (int i = 0; i < jsonArray.size(); i++) {
+			            JSONObject item = jsonArray.getJSONObject(i);
+			            TwelveStockData stock = JSONObject.toJavaObject(item, TwelveStockData.class);
+			            list.add(stock);
+			        }
+				}
+			}
+			return list;
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			 log.error("getStockList同步twelvedata股票数据异常,Exception:{}", e);
+		}
+        return null;
+    }
+}

src/main/java/cn/stock/market/utils/HttpClientRequest.java

@@ -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);

src/main/java/cn/stock/market/utils/HttpRequest.java

@@ -2,6 +2,7 @@ package cn.stock.market.utils;
 
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ -142,6 +143,52 @@ public class HttpRequest {
         return text;
     }
 
+    public static String doTwelveGet(String url) throws Exception{
+    	int maxRetries = 3;
+        for (int retry = 1; retry <= maxRetries; retry++) {    	
+	    	BufferedReader reader = null;
+	    	StringBuilder response = new StringBuilder();
+	    	try {
+		        URL obj = new URL(url);
+		        HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+		        con.setRequestMethod("GET");
+		        con.setRequestProperty("Accept", "application/json");
+		        con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+		        //模拟postman请求，否则返回403
+		        con.setRequestProperty("User-Agent", "PostmanRuntime/7.26.8");
+		        
+		        int responseCode = con.getResponseCode();
+		        if (responseCode == HttpURLConnection.HTTP_OK) {
+		        	reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
+		            String inputLine;
+		            while ((inputLine = reader.readLine()) != null) {
+		                response.append(inputLine);
+		            }
+		            reader.close();
+		            return response.toString();
+		        } else {
+		            log.error("HTTP request failed with response code: " + responseCode);
+		        }
+	    	}catch(Exception e) {
+	    		log.error("请求twelvedata数据url:{},exception:{} ", url,e);
+	    	}finally {
+	    		 if (reader != null) {
+	                 reader.close();
+	             }
+	    	}
+            // 如果不是最后一次重试，则等待一段时间再进行下一次重试
+            if (retry < maxRetries) {
+                try {
+                    // 1秒钟
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+        return null;
+    }
+    
 
     public static void main(String[] args) {
         String url = "";

src/main/java/cn/stock/market/utils/RequestCacheUtils.java

@@ -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) -> {

src/main/java/cn/stock/market/web/ArticleApiController.java

@@ -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 {
 

src/main/java/cn/stock/market/web/BTodayStockController.java

@@ -2,6 +2,7 @@ package cn.stock.market.web;
 
 import cn.stock.market.domain.basic.entity.BtodayStock;
 import cn.stock.market.domain.basic.service.BtodayStockService;
+import cn.stock.market.web.annotations.EncryptFilter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -34,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"),
@@ -43,6 +44,8 @@ public class BTodayStockController {
             @ApiImplicitParam(name="durationtype",value = "D(1D的时候传D),D(5D的时候传D),M(3M的时候传M),Y(1Y的时候传Y),Y(5Y的时候传Y),Y(10Y的时候传Y)"),
             @ApiImplicitParam(name="duration",value = "1(1D的时候传1),5(5D的时候传5),3(3M的时候传3),1(1Y的时候传1),5(5Y的时候传5),10(10Y的时候传10)"),
     })
+    @EncryptFilter(decryptRequest = false)
+
     public JSONArray getPriceChartCompanyPullView(
             @RequestParam(value = "exchange") String exchange,
             @RequestParam(value = "co_code") String coCode,
@@ -137,7 +140,8 @@ 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,
             @RequestParam(value = "co_code") String coCode

src/main/java/cn/stock/market/web/InfoController.java

@@ -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));
 		}

src/main/java/cn/stock/market/web/MoneyApiController.java

@@ -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;
@@ -8,6 +9,7 @@ import cn.stock.market.dto.StockHistoryResponse;
 import cn.stock.market.infrastructure.db.po.QMoneyStockPO;
 import cn.stock.market.utils.RequestCacheUtils;
 import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.web.annotations.EncryptFilter;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -36,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;
 
 /**
@@ -165,11 +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("没有找到该股票");
         }*/
@@ -200,10 +209,13 @@ 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);
                 }
-
             } catch (Exception e) {
             }
             // 如果不是最后一次重试，则等待一段时间再进行下一次重试
@@ -280,18 +292,18 @@ public class MoneyApiController {
                     dto.setStockUrl(stockUrl);
                 }
 
-                String highPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(2)").first());
+                String highPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(3)").first());
                 dto.setHighPrice(highPrice);
 
-                String lowPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(3)").first());
+                String lowPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(4)").first());
                 dto.setLowPrice(lowPrice);
 
-                String lastPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(4)").first());
+                String lastPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(5)").first());
                 dto.setLastPrice(lastPrice);
 
-                String prevClosePrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(5)").first());
+             /*   String prevClosePrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(6)").first());
                 dto.setPrevClosePrice(prevClosePrice);
-
+*/
                 String changePercent = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(6)").first());
                 dto.setChangePercent(changePercent);
 
@@ -499,8 +511,10 @@ 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)
+
     public List<MoneyStockSuggestDTO> getTopGainer(@RequestParam String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
         // 尝试从缓存中获取结果
@@ -513,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)){
@@ -540,8 +556,10 @@ 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)
+
     public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
         moneyStockSuggestDTOS = loserStockSuggestCache.getIfPresent(stockType);
@@ -551,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());
@@ -588,8 +609,10 @@ 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)
+
     public List<MoneyStockSuggestDTO> getTopActive(@RequestParam String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
         moneyStockSuggestDTOS = activesStockSuggestCache.getIfPresent(stockType);
@@ -599,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());
@@ -628,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"),
@@ -639,6 +665,7 @@ public class MoneyApiController {
             @ApiImplicitParam(name = "currencyCode", value = "INR 不变", required = true, dataType = "String", paramType = "query")
     })
     @ResponseBody
+   @EncryptFilter(decryptRequest = false)
     public ResponseEntity<StockHistoryResponse> getStockHistory( @RequestParam String symbol,
                                                                  @RequestParam String resolution
                                                                ) {
@@ -650,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);
@@ -699,6 +726,7 @@ public class MoneyApiController {
         }
 
         if (response != null) {
+            setResponse(response,resolution);
             // API request successful, return the response
             return ResponseEntity.ok(response);
         } else {
@@ -709,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);
+        }
+    }
+
 
 
 
@@ -733,28 +805,31 @@ 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()
             .maximumSize(100) // 设置缓存的最大大小
-            .expireAfterWrite(1, TimeUnit.HOURS) // 设置缓存条目的过期时间
+            .expireAfterWrite(1, TimeUnit.MINUTES) // 设置缓存条目的过期时间
             .build();
 
     private Cache<String, List<MoneyStockSuggestDTO>> loserStockSuggestCache = CacheBuilder.newBuilder()
             .maximumSize(100) // 设置缓存的最大大小
-            .expireAfterWrite(1, TimeUnit.HOURS) // 设置缓存条目的过期时间
+            .expireAfterWrite(1, TimeUnit.MINUTES) // 设置缓存条目的过期时间
             .build();
 
     private Cache<String, List<MoneyStockSuggestDTO>> activesStockSuggestCache = CacheBuilder.newBuilder()
             .maximumSize(100) // 设置缓存的最大大小
-            .expireAfterWrite(30, TimeUnit.MINUTES) // 设置缓存条目的过期时间
+            .expireAfterWrite(1, TimeUnit.MINUTES) // 设置缓存条目的过期时间
             .build();
 
 }

src/main/java/cn/stock/market/web/MoneyProxyApiControl.java

@@ -0,0 +1,82 @@
+package cn.stock.market.web;
+
+import cn.stock.market.dto.model.StockListVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+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;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * @author gs
+ * @date 2024/2/15 下午9:18
+ */
+@Slf4j
+@RestController
+public class MoneyProxyApiControl {
+
+
+    @GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
+    public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
+        return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
+    }
+
+
+    public static JSONObject stockByMoneyIdAndExchangeTypeFromHttp(String scId, String exchangeType) {
+        try {
+            String url = "https://priceapi.moneycontrol.com/pricefeed/"+exchangeType+"/equitycash/" + scId ;
+            URL obj = new URL(url);
+            HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+            con.setRequestMethod("GET");
+
+            int responseCode = con.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+                String inputLine;
+                StringBuilder response = new StringBuilder();
+                while ((inputLine = in.readLine()) != null) {
+                    response.append(inputLine);
+                }
+                in.close();
+                // 解析JSON数据
+                log.info("stockByCodeAndExchangeType：获取 sc_id:{}, exchangeType: {} 的实时价格的结果：{} ",scId,exchangeType,response.toString());
+                return JSONObject.parseObject(response.toString());
+            } else {
+                log.error("HTTP request failed with response code: " + responseCode);
+            }
+        } catch (Exception e) {
+            log.error("stockByMoneyIdAndExchangeTypeFromHttp",e);
+        }
+        return new JSONObject();
+    }
+
+
+    private static StockListVO mapJsonToMoneyStockListVO(JSONObject jsonObject) {
+        StockListVO stockListVO = new StockListVO();
+        if (jsonObject != null) {
+            JSONObject data = jsonObject.getJSONObject("data");
+            if(data!=null&&!data.isEmpty()){
+                stockListVO.setName(data.getString("company"));
+                stockListVO.setCode(data.getString("code"));
+                stockListVO.setSpell(data.getString("company"));
+                stockListVO.setGid(data.getString("symbol"));
+                stockListVO.setNowPrice(data.getString("pricecurrent"));
+                stockListVO.setOpen_px(data.getString("OPN"));
+                stockListVO.setPreclose_px(data.getString("priceprevclose"));
+                stockListVO.setHcrate(new BigDecimal(data.getString("pricepercentchange")));
+                stockListVO.setSymbol(data.getString("symbol"));
+                stockListVO.setPricechange(data.getString("pricechange"));
+            }
+        }
+        return stockListVO;
+    }
+
+}

src/main/java/cn/stock/market/web/SiteNewsController.java

@@ -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);

src/main/java/cn/stock/market/web/StockApiController.java

@@ -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);
 
@@ -167,6 +167,34 @@ public class StockApiController {
 		return ServerResponse.createBySuccess(newsRepository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.id.desc()));
 	}
 
+	@RequestMapping({"test.do"})
+	@ResponseBody
+	public ServerResponse test(@RequestParam("url") String url, @RequestParam("pageNum") Integer pageNum) {
+		String news = stockService.getNews();
+		List<String> newsList = Arrays.asList(news.split("<a href="));
+		newsList = newsList.subList(1, newsList.size());
+		newsList.forEach( n -> {
+			String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
+			String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_"));
+			String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?"));
+			String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+
+			SiteNews siteNews = new SiteNews();
+			siteNews.setAddTime(new Date());
+			siteNews.setSourceId(id);
+			siteNews.setDescription(time);
+			siteNews.setImgurl(imgUrl);
+			List<String> newsInfo = stockService.getNewsInfo(contentUrl);
+			siteNews.setContent(newsInfo.get(0));
+			siteNews.setTitle(newsInfo.get(1));
+			List<SiteNews> list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id));
+			if (list.size() == 0) {
+				newsRepository.save(siteNews);
+			}
+		});
+		return ServerResponse.createBySuccess();
+	}
+
 	//印度股票时线-K线
 	@RequestMapping({"getINDTimeK.do"})
 	@ApiOperation(value = "印度股票K线", httpMethod = "GET")
@@ -205,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")

src/main/java/cn/stock/market/web/TodayApiController.java

@@ -2,6 +2,7 @@ package cn.stock.market.web;
 
 import cn.stock.market.infrastructure.api.TodayApis;
 import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.web.annotations.EncryptFilter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -11,12 +12,13 @@ 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"})
     @ApiOperation(value = "获取Top Gainers",notes = "exchange传nse或者bse", httpMethod = "GET")
     @ResponseBody
+    @EncryptFilter(decryptRequest = false)
     public ServerResponse getTopGainers(@RequestParam("exchange") String exchange) {
         return ServerResponse.createBySuccess(TodayApis.getTopGainers(exchange));
     }
@@ -24,6 +26,7 @@ public class TodayApiController {
     @RequestMapping({"getTopLosers.do"})
     @ApiOperation(value = "获取 Top Losers",notes = "exchange传nse或者bse", httpMethod = "GET")
     @ResponseBody
+    @EncryptFilter(decryptRequest = false)
     public ServerResponse getTopLosers(@RequestParam("exchange") String exchange) {
         return ServerResponse.createBySuccess(TodayApis.getTopLosers(exchange));
     }
@@ -31,6 +34,7 @@ public class TodayApiController {
     @RequestMapping({"getMostActiveVolume.do"})
     @ApiOperation(value = "获取 Most Active Volume",notes = "exchange传nse或者bse", httpMethod = "GET")
     @ResponseBody
+    @EncryptFilter(decryptRequest = false)
     public ServerResponse getMostActiveVolume(@RequestParam("exchange") String exchange) {
         return ServerResponse.createBySuccess(TodayApis.getMostActiveVolume(exchange));
     }
@@ -38,6 +42,7 @@ public class TodayApiController {
     @RequestMapping({"getMostActiveValue.do"})
     @ApiOperation(value = "获取 Most Active Value",notes = "exchange传nse或者bse",httpMethod = "GET")
     @ResponseBody
+    @EncryptFilter(decryptRequest = false)
     public ServerResponse getMostActiveValue(@RequestParam("exchange") String exchange) {
         return ServerResponse.createBySuccess(TodayApis.getMostActiveValue(exchange));
     }

src/main/java/cn/stock/market/web/TwelveApiController.java

@@ -0,0 +1,137 @@
+package cn.stock.market.web;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.StringUtil;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.dto.StockHistoryResponse;
+import cn.stock.market.dto.TwelveStockInfo;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.web.annotations.EncryptFilter;
+import cn.stock.market.web.config.Config;
+
+/**
+ * twelvedata数据源接口
+ * 
+ */
+@RestController
+@Api(value = "/TwelveApiController", tags = "twelvedata股票行情")
+@Slf4j
+@RequestMapping({"/api/market/twelvedata", "/api/hq/twelvedata"})
+public class TwelveApiController {
+    
+    @ApiOperation(value = "股票详情信息", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCode",value = "股票对应代码",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetail")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetail(String stockCode,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCode,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	TwelveStockInfo info = mapJsonToTwelveStock(data);
+            	log.info("getStockDetail：获取 {}, {} 的股票详情结束，耗时: {} ms ",stockCode,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", info);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCode,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+    private TwelveStockInfo mapJsonToTwelveStock(JSONObject jsonObject) {
+    	TwelveStockInfo info = new TwelveStockInfo();
+        if (jsonObject != null && !jsonObject.isEmpty()) {
+        	info.setStockCode(jsonObject.getString("symbol"));
+        	info.setSymbol(jsonObject.getString("symbol"));
+        	info.setStockName(jsonObject.getString("name"));
+        	info.setStockType(jsonObject.getString("exchange"));
+        	info.setLastPrice(jsonObject.getString("close"));
+        	info.setPerchg(jsonObject.getString("percent_change"));
+        	info.setChange(jsonObject.getString("change"));
+        	info.setOpenPrice(jsonObject.getString("open"));
+        	info.setPreviousPrice(jsonObject.getString("previous_close"));
+        	info.setVolume(jsonObject.getString("volume"));
+        	info.setHighPrice(jsonObject.getString("high"));
+        	info.setLowPrice(jsonObject.getString("low"));
+        	JSONObject json = jsonObject.getJSONObject("fifty_two_week");
+        	if(json!=null && !json.isEmpty()) {
+	        	info.setWeek52HighPrice(json.getString("high"));
+	        	info.setWeek52LowPrice(json.getString("low"));
+        	}
+        }
+        return info;
+    }
+    
+    @ApiOperation(value = "股票详情列表", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCodes",value = "股票对应代码, 多个时以英文逗号分隔",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetailList")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetailList(String stockCodes,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCodes,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	List<TwelveStockInfo> list = mapJsonToTwelveList(stockCodes,data);
+            	log.info("getStockDetailList：获取 {}, {} 的股票列表详情结束，耗时: {} ms ",stockCodes,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", list);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCodes,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+    
+    private List<TwelveStockInfo> mapJsonToTwelveList(String stockCodes,JSONObject jsonObject) {
+		if (jsonObject == null || jsonObject.isEmpty()) {
+			return new ArrayList<>();
+		}
+		List<TwelveStockInfo> list = new ArrayList<>();
+		String[] items = stockCodes.split(",");
+		if(items!=null && items.length>0) {
+			if(items.length == 1) {
+				TwelveStockInfo info = mapJsonToTwelveStock(jsonObject);
+				list.add(info);
+				return list;
+			}
+			for (String str : items) {
+				JSONObject json = jsonObject.getJSONObject(str);
+				TwelveStockInfo vo = mapJsonToTwelveStock(json);
+				list.add(vo);
+			}
+		}
+		return list;
+    }
+
+
+}

src/main/java/cn/stock/market/web/config/Config.java

@@ -39,4 +39,5 @@ public class Config {
 	String aliyunAccessKeyId;
 	String aliyunAccessKeySecret;
 	String aliyunAppCode;
+	String twelveApikey;
 }

src/main/resources/application-base-alpha.yml

@@ -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
@@ -42,6 +42,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
   type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云

src/main/resources/application-base-prod.yml

@@ -46,6 +46,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tCQRp7t158TVyoF2Yhe
 aliyunAccessKeySecret: glyzOno773Cv7HeWDliveu2H5gX486
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
   type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云

src/test/java/rp/lee/jpa/JpaDDDGen.java

@@ -31,9 +31,9 @@ public class JpaDDDGen {
 	 */
 	public static DataSource getMySQLDataSource() {
 		MysqlDataSource mysqlDS = new MysqlDataSource();
-		mysqlDS.setURL("jdbc:mysql://43.132.212.180:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
+		mysqlDS.setURL("jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
 		mysqlDS.setUser("root");
-		mysqlDS.setPassword("33BsUUcnXRYgwt");
+		mysqlDS.setPassword("33BsUUcnXRYgwtIND");
 		return mysqlDS;
 	}
 	
@@ -50,7 +50,7 @@ public class JpaDDDGen {
 		/**
 		 * cs_statistic - 要生成的数据库表
 		 */
-		Cons.tableNameToEntiyMapping.put("money_stock", null);
+		Cons.tableNameToEntiyMapping.put("twelve_stock", null);
 
 		ToolDDD.g(getMySQLDataSource().getConnection());
 	}