update

fix bug kline
Merge branch 'feature/optional-stock' into 'develop'
2024-10-10 10:50:01 +07:00 · 2024-10-09 17:18:26 +07:00 · 2024-10-01 07:07:59 +00:00 · 2024-10-01 14:06:24 +07:00 · 2024-09-26 09:57:06 +00:00 · 2024-09-26 16:51:41 +07:00
31 changed files with 1520 additions and 207 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 stages:
  # 构建
  - build
-  - webhook
+  - dockerize
+  - deploy

 build:
  image: maven:3.6.3-openjdk-8
@@ -37,16 +38,42 @@ build:
    - mvn clean install -Dmaven.test.skip=true
    - ls
    - echo ">>>>>>Finish Building<<<<<<"
-webhook:
-  stage: webhook
+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
+deploy-dev:
+  stage: deploy
  only:
    - develop
  script:
-    - echo ">>>>>>Start Deploy<<<<<<"
+    - echo "Deploying application..."
    - ls
    - apt-get update
    - apt-get install -y curl
-    - 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<<<<<<"
+    - |
+      curl -X POST \
+           -H "Content-Type: application/json" \
+           -d '{"namespace":"yddev", "deployment_name":"india-stock-market"}' \
+           https://updater-yddev.moneytj.com/restart-deployment
+    - echo "Application successfully deployed."


--- a/17
+++ b/17
@@ -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"]
--- a/docker-entrypoint.sh
+++ b/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
--- a/pom.xml
+++ b/pom.xml
@@ -185,6 +185,12 @@
 			<version>30.1-jre</version>
 		</dependency>

+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.13</version>
+		</dependency>
+
 	</dependencies>
 	
 	<build>
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QOptionalStockPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QOptionalStockPO.java
@@ -0,0 +1,41 @@
+package cn.stock.market.infrastructure.db.po;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QOptionalStockPO is a Querydsl query type for OptionalStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QOptionalStockPO extends EntityPathBase<OptionalStockPO> {
+
+    private static final long serialVersionUID = 1161631810L;
+
+    public static final QOptionalStockPO optionalStockPO = new QOptionalStockPO("optionalStockPO");
+
+    public final StringPath company = createString("company");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath symbol = createString("symbol");
+
+    public QOptionalStockPO(String variable) {
+        super(OptionalStockPO.class, forVariable(variable));
+    }
+
+    public QOptionalStockPO(Path<? extends OptionalStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QOptionalStockPO(PathMetadata metadata) {
+        super(OptionalStockPO.class, metadata);
+    }
+
+}
+
--- a/src/main/java/cn/stock/market/domain/basic/convert/OptionalStockConvert.java
+++ b/src/main/java/cn/stock/market/domain/basic/convert/OptionalStockConvert.java
@@ -0,0 +1,16 @@
+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.OptionalStock;
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+@Component
+@Lazy
+public class OptionalStockConvert extends SimpleEntityPOConvert<OptionalStock, OptionalStockPO> {
+    public static OptionalStockConvert of() {
+        return SpringUtils.getBean(OptionalStockConvert.class);
+    }
+}
--- a/src/main/java/cn/stock/market/domain/basic/entity/OptionalStock.java
+++ b/src/main/java/cn/stock/market/domain/basic/entity/OptionalStock.java
@@ -0,0 +1,16 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+        callSuper = false
+)
+public class OptionalStock extends OptionalStockPO {
+}
--- a/src/main/java/cn/stock/market/domain/basic/repository/OptionalStockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/OptionalStockRepository.java
@@ -0,0 +1,32 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
+import cn.stock.market.domain.basic.convert.OptionalStockConvert;
+import cn.stock.market.domain.basic.entity.OptionalStock;
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import cn.stock.market.infrastructure.db.repo.OptionalStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor(
+        onConstructor = @__(@Autowired)
+)
+public class OptionalStockRepository extends SimplePoConvertEntityRepository<OptionalStock, OptionalStockPO, Integer> {
+    final OptionalStockRepo repo;
+
+    final OptionalStockConvert convert;
+
+    @Override
+    public GenericJpaRepository<OptionalStockPO, Integer> repo() {
+        return repo;
+    }
+
+    @Override
+    public IEntityPOConvert<OptionalStock, OptionalStockPO> convert() {
+        return convert;
+    }
+}
--- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java
@@ -1,23 +1,18 @@
 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 javax.sound.midi.Soundbank;

-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;
@@ -30,18 +25,9 @@ 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.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.HttpClientUtils;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -70,11 +56,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;
@@ -273,7 +254,13 @@ 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=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">"),doc.html().lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">")+500);
+			Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
+			StringBuilder sb = new StringBuilder();
+			for (Element divElement : divElements) {
+				sb.append(divElement.outerHtml()).append("\n");
+			}
+			result = sb.toString();
 		} catch (Exception e) {
 			return e.toString();
 		}
@@ -995,7 +982,7 @@ public class StockService {
 			String exchange = "bse";
 			IndiaIndexVo vo1 = new IndiaIndexVo();
 			String coCode = "20558";
-			JSONObject object = TodayApis.getStockDetail(exchange, coCode);
+			JSONObject object = TodayApis.getStockDetail("in%3BSEN", coCode);
 			IndiaStockVO market = objToVo(object);
 			market.setName("BSESENSEX指数");
 			vo1.setIndexVo(market);
@@ -1008,14 +995,24 @@ public class StockService {
 			vo1.setKLine(kine);
 			indexVoList.add(vo1);
 		}catch (Exception e){
-			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+			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);
+			JSONObject object = TodayApis.getStockDetail("in%3BNSX", coCode);
 			IndiaStockVO market = objToVo(object);
 			market.setName("NIFTY50指数");
 			vo1.setIndexVo(market);
@@ -1028,30 +1025,40 @@ public class StockService {
 			vo1.setKLine(kine);
 			indexVoList.add(vo1);
 		}catch (Exception e){
-			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+			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("priceprevclose")){
+			market.setClose(object.getString("priceprevclose"));
 		}
-		if(object.containsKey("price")){
-			market.setNowPrice(object.getString("price"));
+		if(object.containsKey("pricecurrent")){
+			market.setNowPrice(object.getString("pricecurrent"));
 		}
-		if(object.containsKey("perchg")){
-			market.setRate(object.getString("perchg"));
+		if(object.containsKey("pricepercentchange")){
+			market.setRate(object.getString("pricepercentchange"));
 		}
-		if(object.containsKey("high_price")){
-			market.setHigh(object.getString("high_price"));
+		if(object.containsKey("HIGH")){
+			market.setHigh(object.getString("HIGH"));
 		}
-		if(object.containsKey("low_price")){
-			market.setLow(object.getString("low_price"));
+		if(object.containsKey("LOW")){
+			market.setLow(object.getString("LOW"));
 		}
-		if(object.containsKey("open_price")){
-			market.setOpen(object.getString("open_price"));
+		if(object.containsKey("OPEN")){
+			market.setOpen(object.getString("OPEN"));
 		}
 		return market;
 //		stockListVO.setName(jsonObject.getString("companyname"));
@@ -1069,4 +1076,48 @@ public class StockService {

 	}

+	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);
+	}
+
+
 }
--- a/src/main/java/cn/stock/market/dto/OptionalStockResponse.java
+++ b/src/main/java/cn/stock/market/dto/OptionalStockResponse.java
@@ -0,0 +1,18 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class OptionalStockResponse {
+    private String message;
+    private Integer code;
+    private DataResponse data = new DataResponse();
+
+    @Data
+    public static class DataResponse {
+        private String symbol;
+        private String company;
+        private Double pricecurrent;
+        private Float pricepercentchange;
+    }
+}
--- a/src/main/java/cn/stock/market/dto/query/StockChartDto.java
+++ b/src/main/java/cn/stock/market/dto/query/StockChartDto.java
@@ -0,0 +1,48 @@
+package cn.stock.market.dto.query;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class StockChartDto {
+    private Long timestamp;
+    private double open;
+    private double high;
+    private double low;
+    private double close;
+    private double volume;
+
+    public StockChartDto(Long date, double open, double high, double low, double close, double volume) {
+        this.timestamp = date;
+        this.open = open;
+        this.high = high;
+        this.low = low;
+        this.close = close;
+        this.volume = volume;
+    }
+
+    public double getVolume() {
+        return volume;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public double getOpen() {
+        return open;
+    }
+
+    public double getHigh() {
+        return high;
+    }
+
+    public double getLow() {
+        return low;
+    }
+
+    public double getClose() {
+        return close;
+    }
+}
--- a/src/main/java/cn/stock/market/infrastructure/api/EttechchartsApis.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/EttechchartsApis.java
--- a/src/main/java/cn/stock/market/infrastructure/api/GrowwInApis.java
+++ b/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());
+    }
+}
--- a/src/main/java/cn/stock/market/infrastructure/api/TodayApis.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/TodayApis.java
@@ -187,18 +187,17 @@ public class TodayApis {

    //获取详情
    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 url = String.format("https://priceapi.moneycontrol.com/pricefeed/notapplicable/inidicesindia/%s",exchange);
        String str = get(url);
        JSONObject object = JSON.parseObject(str);
        boolean bool = false;
-        if(object.containsKey("success")){
-            bool = object.getBoolean("success");
+        if(object.containsKey("code")){
+            bool = object.getInteger("code") == 200;
        }
        if(!bool){
            return new JSONObject();
        }
-        JSONArray jsonArray = JSON.parseArray(object.getString("data"));
-        JSONObject entity = JSON.parseObject(jsonArray.get(0).toString());
+        JSONObject entity = JSON.parseObject(object.getString("data"));
        return entity;

    }
--- a/src/main/java/cn/stock/market/infrastructure/db/po/MoneyStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/MoneyStockPO.java
@@ -56,6 +56,14 @@ public class MoneyStockPO {
   * 展示表示 */
  String selfDispId;

+  /**
+   * NSE India的id */
+  String nseIndiaId;
+
+  /**
+   * NSE India Chart的id */
+  String nseIndiaChartId;
+
  /**
   * 自有self_url */
  String selfUrl;
--- a/src/main/java/cn/stock/market/infrastructure/db/po/OptionalStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/OptionalStockPO.java
@@ -0,0 +1,35 @@
+package cn.stock.market.infrastructure.db.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+        name = "optional_stock"
+)
+public class OptionalStockPO {
+    @Id
+    @GeneratedValue(
+            strategy = javax.persistence.GenerationType.IDENTITY
+    )
+    Integer id;
+
+    String symbol;
+
+    String company;
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/repo/OptionalStockRepo.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/repo/OptionalStockRepo.java
@@ -0,0 +1,7 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.OptionalStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+
+public interface OptionalStockRepo extends GenericJpaRepository<OptionalStockPO, Integer> {
+}
--- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
@@ -7,6 +7,7 @@ import cn.stock.market.domain.basic.repository.StockRepository;
 import cn.stock.market.domain.basic.service.StockService;
 import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
+import cn.stock.market.utils.DateTimeUtil;
 import cn.stock.market.utils.Utils;
 import com.ag.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
@@ -25,6 +26,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

@Slf4j
@Component
@@ -118,8 +121,16 @@ public class InvestingTask {
            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);
+//                String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?"));
+                String imgUrl = extractImgSrc(n);
+//                String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+                // Extract the date and time using regex
+                Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
+                Matcher matcher = pattern.matcher(n);
+                String time = "";
+                if (matcher.find()) {
+                    time = DateTimeUtil.formatDateTimeFor24H(matcher.group(1).trim(),"dd MMM yyyy | hh:mm a");
+                }

                SiteNews siteNews = new SiteNews();
                siteNews.setAddTime(new Date());
@@ -140,4 +151,22 @@ public class InvestingTask {
        }

    }
+
+    public static String extractImgSrc(String htmlData) {
+        String searchString = "<noscript>";
+        int startPos = htmlData.indexOf(searchString);
+
+        if (startPos != -1) {
+            String startTag = "src=";
+            startPos = htmlData.indexOf(startTag, startPos) + startTag.length() + 1;
+
+            int endPos = htmlData.indexOf("?", startPos);
+
+            if (endPos != -1) {
+                return htmlData.substring(startPos, endPos);
+            }
+        }
+
+        return null;
+    }
 }
--- a/src/main/java/cn/stock/market/utils/DateTimeUtil.java
+++ b/src/main/java/cn/stock/market/utils/DateTimeUtil.java
@@ -5,6 +5,8 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Calendar;
+import java.util.Locale;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -186,6 +188,25 @@ public class DateTimeUtil {
    }


+    public static String formatDateTimeFor24H(String inputDateTime,String inputFormatStr){
+        String outputDateTime = "";
+        // 1. 解析日期时间
+        SimpleDateFormat inputFormat = new SimpleDateFormat(inputFormatStr, Locale.ENGLISH);
+        Date date = null;
+        try {
+            date = inputFormat.parse(inputDateTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (date != null) {
+            // 2. 转换为24小时制
+            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+             outputDateTime = outputFormat.format(date);
+        }
+        return outputDateTime;
+    }
+
    public static void main(String[] args) {
        parseToDateByMinute(10);
    }
--- a/src/main/java/cn/stock/market/utils/HttpClientRequest.java
+++ b/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);
--- a/src/main/java/cn/stock/market/utils/NseIndiaRequest.java
+++ b/src/main/java/cn/stock/market/utils/NseIndiaRequest.java
@@ -0,0 +1,181 @@
+package cn.stock.market.utils;
+
+import cn.stock.market.dto.StockHistoryRequest;
+import cn.stock.market.dto.StockHistoryResponse;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class NseIndiaRequest {
+    private static final String NSE_INDIA_URL = "https://www.nseindia.com";
+    private static final String NSE_INDIA_CHART_URL = "https://charting.nseindia.com";
+    private static final OkHttpClient client;
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    static {
+        client = new OkHttpClient.Builder()
+                .cookieJar(new CookieJar() {
+                    private final Map<String, List<Cookie>> cookieStore = new HashMap<>();
+
+                    @Override
+                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                        cookieStore.put(url.host(), cookies);
+                    }
+
+                    @Override
+                    public List<Cookie> loadForRequest(HttpUrl url) {
+                        List<Cookie> cookies = cookieStore.get(url.host());
+                        return cookies != null ? cookies : new ArrayList<Cookie>();
+                    }
+                })
+                .build();
+    }
+
+    private static Request createRequest(String url) {
+        Request request = new Request.Builder()
+                .url(url)
+                .header("accept", "application/json, text/plain, */*")
+                .header("accept-language", "en-US,en;q=0.9")
+                .header("cache-control", "no-cache")
+                .header("pragma", "no-cache")
+                .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36")
+                .build();
+
+        return request;
+    }
+
+    private static void initCookie(String url) {
+        Request request = createRequest(url);
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Failed to fetch initial cookies");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to initialize cookies", e);
+        }
+    }
+
+    private static Integer getCode(String symbol) {
+        Request request = createRequest(NSE_INDIA_CHART_URL + "//Charts/GetEQMasters").newBuilder()
+                .addHeader("referer", NSE_INDIA_CHART_URL)
+                .addHeader("origin", NSE_INDIA_CHART_URL)
+                .build();
+
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Failed to get EQ code");
+            }
+
+            String result = response.body().string();
+
+            String regex = "(\\d+)\\|" + symbol + "\\|.*";
+            Pattern pattern = Pattern.compile(regex);
+            Matcher matcher = pattern.matcher(result);
+
+            if (matcher.find()) {
+                return Integer.valueOf(matcher.group(1));
+            }
+            throw new IOException("No data found");
+
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get EQ code", e);
+        }
+    }
+
+    public static JSONObject stockByJYSFromHttp(String stockType, String symbol, String nseIndiaId) {
+        initCookie(NSE_INDIA_URL);
+
+        String url = NSE_INDIA_URL + "/api/quote-equity?symbol=" + nseIndiaId;
+        Request request = createRequest(url).newBuilder()
+                .addHeader("referer", NSE_INDIA_URL)
+                .addHeader("origin", NSE_INDIA_URL)
+                .build();
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Request failed with code: " + response.code());
+            }
+
+            JSONObject jsonData = JSONObject.parseObject(response.body().string());
+            JSONObject data =jsonData.getJSONObject("priceInfo");
+            JSONObject json = new JSONObject();
+
+            json.put("pricepercentchange",data.getString("pChange"));
+            json.put("stockType",stockType);
+            json.put("pricechange",data.getString("change"));
+            json.put("pricecurrent",data.getString("lastPrice"));
+            json.put("priceprevclose",data.getString("previousClose"));
+            json.put("PREVDATE","");
+            json.put("VOL",jsonData.getJSONObject("preOpenMarket").getString("totalTradedVolume"));
+            json.put("dataSourceType","3");
+            json.put("symbol",symbol);
+            json.put("BSEID",symbol);
+            json.put("NSEID",symbol);
+            json.put("LTH",data.getString("upperCP"));
+            json.put("LTL",data.getString("lowerCP"));
+            json.put("OPN",data.getString("open"));
+
+            return json;
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to fetch data", e);
+        }
+    }
+
+    public static StockHistoryResponse stockKLineFromHttp(StockHistoryRequest stockHistoryRequest, String resolution) {
+        initCookie(NSE_INDIA_CHART_URL);
+
+        Integer code = getCode(stockHistoryRequest.getSymbol());
+
+        int interval = 1;
+        if (StringUtils.equals("H", resolution)) {
+            resolution = "I";
+            interval = 60;
+        }
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("chartPeriod", resolution);
+        body.put("chartStart", 0);
+        body.put("exch", "N");
+        body.put("fromDate", 0);
+        body.put("instrType", "C");
+        body.put("scripCode", code);
+        body.put("timeInterval", interval);
+        body.put("toDate", stockHistoryRequest.getTo() + 18000);
+        body.put("ulToken", code);
+
+        String payload;
+        try {
+            payload = objectMapper.writeValueAsString(body);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to serialize body", e);
+        }
+
+        RequestBody requestBody = RequestBody.create(
+                MediaType.get("application/json; charset=utf-8"),
+                payload
+        );
+
+        Request request = createRequest(NSE_INDIA_CHART_URL + "//Charts/symbolhistoricaldata/").newBuilder()
+                .addHeader("referer", NSE_INDIA_CHART_URL)
+                .addHeader("origin", NSE_INDIA_CHART_URL)
+                .post(requestBody)
+                .build();
+
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Request failed with code: " + response.code());
+            }
+
+            StockHistoryResponse result = objectMapper.readValue(response.body().string(), StockHistoryResponse.class);
+
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to fetch data", e);
+        }
+    }
+}
--- a/src/main/java/cn/stock/market/utils/RequestCacheUtils.java
+++ b/src/main/java/cn/stock/market/utils/RequestCacheUtils.java
@@ -65,6 +65,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;
--- a/src/main/java/cn/stock/market/web/ArticleApiController.java
+++ b/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 {

--- a/src/main/java/cn/stock/market/web/BTodayStockController.java
+++ b/src/main/java/cn/stock/market/web/BTodayStockController.java
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;

 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Map;

@@ -35,7 +36,7 @@ public class BTodayStockController {
    @Autowired
    private BtodayStockService btodayStockService;

-    @GetMapping("/api/bToday/kLine")
+    @GetMapping({"/market/api/bToday/kLine","/api/bToday/kLine"})
    @ApiOperation(value = "股票详情K线图",httpMethod = "GET")
    @ApiImplicitParams({
            @ApiImplicitParam(name="exchange",value = "BSE或者NSE"),
@@ -140,7 +141,7 @@ public class BTodayStockController {
                    "fromredis: 标志是否来自 Redis 缓存，false 表示不是", response = JSONObject.class),

    })
-    @GetMapping("/api/bToday/stockDetail")
+    @GetMapping({"/market/api/bToday/stockDetail","/api/bToday/stockDetail"})
    @EncryptFilter(decryptRequest = false)
    public com.alibaba.fastjson.JSONObject getPriceChartCompanyPullView(
            @RequestParam(value = "exchange") String exchange,
@@ -159,6 +160,19 @@ public class BTodayStockController {

        String forObject = restTemplate.getForObject(apiUrl, String.class);
        JSONObject jsonObject = JSON.parseObject(forObject);
+        JSONArray arryData = jsonObject.getJSONArray("data");
+        if (arryData != null&&arryData.size()>0) {
+            try {
+                JSONObject jsonObject1 = arryData.getJSONObject(0);
+                String price = jsonObject1.getString("price");
+                double priceValue = Double.parseDouble(price);
+                DecimalFormat df = new DecimalFormat("0.00");
+                jsonObject1.put("price", df.format(priceValue));
+            } catch (NumberFormatException e) {
+                // Handle the case where price is not a valid double
+                e.printStackTrace();
+            }
+        }
        jsonObject.put("id",btodayStock.getId());
        return jsonObject;
    }
--- a/src/main/java/cn/stock/market/web/InfoController.java
+++ b/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));
 		}
--- a/src/main/java/cn/stock/market/web/MoneyApiController.java
+++ b/src/main/java/cn/stock/market/web/MoneyApiController.java
@@ -1,15 +1,23 @@
 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.entity.OptionalStock;
 import cn.stock.market.domain.basic.repository.MoneyStockRepository;
+import cn.stock.market.domain.basic.repository.OptionalStockRepository;
+import cn.stock.market.dto.OptionalStockResponse;
 import cn.stock.market.dto.StockHistoryRequest;
 import cn.stock.market.dto.StockHistoryResponse;
+import cn.stock.market.dto.query.StockChartDto;
 import cn.stock.market.infrastructure.db.po.QMoneyStockPO;
-import cn.stock.market.utils.RequestCacheUtils;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.utils.NseIndiaRequest;
 import cn.stock.market.utils.ServerResponse;
 import cn.stock.market.web.annotations.EncryptFilter;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
@@ -22,6 +30,12 @@ import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+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 org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -35,11 +49,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.UriUtils;

 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

@@ -59,15 +79,20 @@ public class MoneyApiController {
    @Autowired
    private MoneyStockRepository moneyStockRepository;

+    @Autowired
+    private OptionalStockRepository optionalStockRepository;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
    private static final String EXTERNAL_API_URL = "https://priceapi.moneycontrol.com/techCharts/indianMarket/stock/history";
+    private static final String OPTIONAL_STOCK_MONEYCONTROL_URL = "https://priceapi.moneycontrol.com/pricefeed/notapplicable/inidicesindia/";

-
-
-    @ApiOperation(value = "股票详情信息",httpMethod = "GET")
+    @ApiOperation(value = "股票详情信息", httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
-            @ApiImplicitParam(name="symbol",value = "scId值"),
-            @ApiImplicitParam(name="id",value = "id值"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "symbol", value = "scId值"),
+            @ApiImplicitParam(name = "id", value = "id值"),
    })
    @ApiResponses(value = {
            @ApiResponse(code = 200, message = "" +
@@ -166,53 +191,67 @@ 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);
+    public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
        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)))
+                        .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("没有找到该股票");
        }*/
        // 设置重试次数
+        if ("ANI".equals(symbol)) {
+            JSONObject json1 = new JSONObject();
+            json1.put("company", "Archit Nuwood Industries Ltd");
+            json1.put("pricepercentchange", "Archit Nuwood Industries Ltd");
+            json1.put("stockType", stockType);
+            json1.put("pricecurrent", "386");
+            json1.put("dataSourceType", "3");
+            json1.put("symbol", "ANI");
+            json1.put("BSEID", "ANI");
+            json1.put("NSEID", "ANI");
+            return ServerResponse.createBySuccess(json1);
+        }
+
+        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", stockType, symbol);
        int maxRetries = 3;
        for (int retry = 1; retry <= maxRetries; retry++) {
            try {
                ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.GET, null, String.class);
                JSONObject json1 = new JSONObject();
-                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null ) {
+                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null) {
                    JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
-                    if(data!=null){
-                        json1.put("company",data.getString("company"));
-                        json1.put("pricepercentchange",data.getString("pricepercentchange"));
-                        json1.put("stockType",stockType);
-                        json1.put("pricechange",data.getString("pricechange"));
-                        json1.put("pricecurrent",data.getString("pricecurrent"));
-                        json1.put("priceprevclose",data.getString("priceprevclose"));
-                        json1.put("PREVDATE",data.getString("PREVDATE"));
-                        json1.put("VOL",data.getString("VOL"));
-                        json1.put("dataSourceType","3");
-                        json1.put("symbol",data.getString("symbol"));
-                        json1.put("BSEID",data.getString("BSEID"));
-                        json1.put("NSEID",data.getString("NSEID"));
-                        json1.put("LTH",data.getString("HP"));
-                        json1.put("LTL",data.getString("LP"));
-                        json1.put("OPN",data.getString("OPN"));
-                        if(null!=moneyStock){
-                            json1.put("id",moneyStock.getId());
+                    if (data != null) {
+                        json1.put("company", data.getString("SC_FULLNM"));
+                        json1.put("pricepercentchange", data.getString("pricepercentchange"));
+                        json1.put("stockType", stockType);
+                        json1.put("pricechange", data.getString("pricechange"));
+                        json1.put("pricecurrent", data.getString("pricecurrent"));
+                        json1.put("priceprevclose", data.getString("priceprevclose"));
+                        json1.put("PREVDATE", data.getString("PREVDATE"));
+                        json1.put("VOL", data.getString("VOL"));
+                        json1.put("dataSourceType", "3");
+                        json1.put("symbol", data.getString("symbol"));
+                        json1.put("BSEID", data.getString("BSEID"));
+                        json1.put("NSEID", data.getString("NSEID"));
+                        json1.put("LTH", data.getString("HP"));
+                        json1.put("LTL", data.getString("LP"));
+                        json1.put("OPN", data.getString("OPN"));
+                        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"));
+                        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);
+                    if (json1.size() > 0)
+                        return ServerResponse.createBySuccess(json1);
                }
            } catch (Exception e) {
            }
@@ -226,20 +265,31 @@ public class MoneyApiController {
                }
            }
        }
+        if (moneyStock != null && moneyStock.getNseIndiaId() != null && !moneyStock.getNseIndiaId().isEmpty()) {
+            try {
+                // Get data from nseindia
+                JSONObject json = NseIndiaRequest.stockByJYSFromHttp(stockType, symbol, moneyStock.getNseIndiaId());
+                json.put("id", moneyStock.getId());
+                json.put("company",moneyStock.getStockName());
+                return ServerResponse.createBySuccess(json);
+
+            } catch (Exception e) {
+                return null;
+            }
+        }
        return null;
    }


-
-    private static   List<MoneyStockSuggestDTO>  nseActives() {
+    private static List<MoneyStockSuggestDTO> nseActives() {
        List<MoneyStockSuggestDTO> list = new ArrayList<>();
        String url = "https://www.moneycontrol.com/stocks/marketstats/nse-mostactive-stocks/nifty-50-9/";
        try {
            Document doc = Jsoup.connect(url).get();
            int size = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr").size();
-            for (int i =1;i<=size;i++){
+            for (int i = 1; i <= size; i++) {
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child("+i+") > td.PR > span > a").first();
+                Element company_a = doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div > div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td.PR > span > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -247,7 +297,7 @@ 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.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.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(2)").first());
                dto.setHighPrice(highPrice);

                String lowPrice = getTextOrEmpty(doc.select("#mc_content > section > section > div.clearfix.stat_container > div.columnst.FR.wbg.brdwht > div >  div.bsr_table.hist_tbl_hm > table > tbody > tr:nth-child(" + i + ") > td:nth-child(3)").first());
@@ -272,7 +322,7 @@ public class MoneyApiController {
        return list;
    }

-    private static  List<MoneyStockSuggestDTO> bseActives() {
+    private static List<MoneyStockSuggestDTO> bseActives() {
        List<MoneyStockSuggestDTO> list = new ArrayList<>();

        String url = "https://www.moneycontrol.com/stocks/marketstats/bsemact1/index.php";
@@ -280,9 +330,9 @@ public class MoneyApiController {
            Document doc = Jsoup.connect(url).get();
            int size = 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").size();
            System.err.println(size);
-            for (int i =1;i<=size;i++){
+            for (int i = 1; i <= size; i++) {
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = 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.PR > span > a").first();
+                Element company_a = 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.PR > span > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -311,19 +361,19 @@ public class MoneyApiController {
            }

        } catch (IOException e) {
-            log.error("occur Exception",e);
+            log.error("occur Exception", e);
        }
        return list;
    }

-    private static  List<MoneyStockSuggestDTO> bseGainer() {
+    private static List<MoneyStockSuggestDTO> bseGainer() {
        String url = "https://www.moneycontrol.com/stocks/marketstats/bse-gainer/sensex_4/";
        List<MoneyStockSuggestDTO> list = Lists.newArrayList();
        try {
            Document doc = Jsoup.connect(url).get();
            int size = 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").size();
-            for (int i =1;i<=size;i++){
-                Element company_a = 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.PR > span > a").first();
+            for (int i = 1; i <= size; i++) {
+                Element company_a = 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.PR > span > a").first();
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
@@ -367,9 +417,9 @@ public class MoneyApiController {
        try {
            Document doc = Jsoup.connect(url).get();
            int size = 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").size();
-            for (int i =1;i<=size;i++){
+            for (int i = 1; i <= size; i++) {
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = 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.PR > span > h3 > a").first();
+                Element company_a = 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.PR > span > h3 > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
@@ -404,20 +454,20 @@ public class MoneyApiController {
        return list;
    }

-    private static  List<MoneyStockSuggestDTO>  nseTopLoser() {
+    private static List<MoneyStockSuggestDTO> nseTopLoser() {
        String url = "https://www.moneycontrol.com/stocks/marketstats/nseloser/index.php";
        List<MoneyStockSuggestDTO> list = Lists.newArrayList();

        try {
            Document doc = Jsoup.connect(url).get();
            int size = 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").size();
-            for (int i =1;i<=size;i++){
+            for (int i = 1; i <= size; i++) {
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
-                Element company_a = 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.PR > span > h3 > a").first();
+                Element company_a = 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.PR > span > h3 > a").first();
                if (company_a != null) {
                    String stockUrl = company_a.attr("href");
                    String stockName = company_a.text();
-                   dto.setStockUrl(stockUrl);
+                    dto.setStockUrl(stockUrl);
                    dto.setStockName(stockName);
                }

@@ -444,7 +494,7 @@ public class MoneyApiController {
        } catch (IOException e) {
            e.printStackTrace();
        }
-        return  list;
+        return list;
    }

    private static List<MoneyStockSuggestDTO> bseTopLoser() {
@@ -454,7 +504,7 @@ public class MoneyApiController {
        try {
            Document doc = Jsoup.connect(url).get();
            int size = 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").size();
-            for (int i =1;i<=size;i++){
+            for (int i = 1; i <= size; i++) {
                Element company_a = 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.PR > span > a").first();
                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
                if (company_a != null) {
@@ -499,17 +549,15 @@ public class MoneyApiController {
    }


-
-
-    @ApiOperation(value = "股票推荐TopGainer",httpMethod = "GET")
+    @ApiOperation(value = "股票推荐TopGainer", httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @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)

@@ -525,15 +573,17 @@ public class MoneyApiController {
            } else if (StringUtils.equals(stockType, "bse")) {
                moneyStockSuggestDTOS = bseGainer();
            }
-
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+            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)){
+                if (CollectionUtils.isNotEmpty(selfUlrList)) {
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if(CollectionUtils.isNotEmpty(all)){
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
-                                .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
+                    if (CollectionUtils.isNotEmpty(all)) {
+                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
+                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
                    }
                }
                gainerStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
@@ -544,44 +594,47 @@ public class MoneyApiController {
    }


-    @ApiOperation(value = "股票推荐TopLoser",httpMethod = "GET")
+    @ApiOperation(value = "股票推荐TopLoser", httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @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);
-        if(null==moneyStockSuggestDTOS){
-            if(StringUtils.equals(stockType,"nse")){
+        if (null == moneyStockSuggestDTOS) {
+            if (StringUtils.equals(stockType, "nse")) {
                moneyStockSuggestDTOS = nseTopLoser();
-            }else if(StringUtils.equals(stockType,"bse")){
+            } else if (StringUtils.equals(stockType, "bse")) {
                moneyStockSuggestDTOS = bseTopLoser();
            }
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
-                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
+            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());
-                if(CollectionUtils.isNotEmpty(selfUlrList)){
+                if (CollectionUtils.isNotEmpty(selfUlrList)) {
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if(CollectionUtils.isNotEmpty(all)){
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
-                                .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
+                    if (CollectionUtils.isNotEmpty(all)) {
+                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
+                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if(CollectionUtils.isNotEmpty(noScIdList)){
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(noScIdList)) {
                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if(CollectionUtils.isNotEmpty(all1)){
-                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f->f.setScId(all.stream().filter(s->s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
+                        if (CollectionUtils.isNotEmpty(all1)) {
+                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
+                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                        }
                    }
                }
@@ -592,46 +645,47 @@ public class MoneyApiController {
    }


-
-
-    @ApiOperation(value = "股票推荐TopActive",httpMethod = "GET")
+    @ApiOperation(value = "股票推荐TopActive", httpMethod = "GET")
    @ApiImplicitParams({
-            @ApiImplicitParam(name="stockType",value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
    })
    @ApiResponses(value = {
            @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);
-        if(moneyStockSuggestDTOS ==null){
-            if(StringUtils.equals(stockType,"nse")){
+        if (moneyStockSuggestDTOS == null) {
+            if (StringUtils.equals(stockType, "nse")) {
                moneyStockSuggestDTOS = nseActives();
-            }else if(StringUtils.equals(stockType,"bse")){
+            } else if (StringUtils.equals(stockType, "bse")) {
                moneyStockSuggestDTOS = bseActives();
            }
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
-                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
+            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());
-                if(CollectionUtils.isNotEmpty(selfUlrList)){
+                if (CollectionUtils.isNotEmpty(selfUlrList)) {
                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if(CollectionUtils.isNotEmpty(all)){
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
-                                .forEach(f->f.setScId(all.stream().filter(s->s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
+                    if (CollectionUtils.isNotEmpty(all)) {
+                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
+                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if(CollectionUtils.isNotEmpty(noScIdList)){
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(noScIdList)) {
                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if(CollectionUtils.isNotEmpty(all1)){
-                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f->f.setScId(all.stream().filter(s->s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
+                        if (CollectionUtils.isNotEmpty(all1)) {
+                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
+                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                        }
                    }
                }
@@ -643,9 +697,8 @@ public class MoneyApiController {
    }


-
-    @GetMapping("/api/market/money/history/kLine")
-    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源",response = StockHistoryResponse.class)
+    @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"),
            @ApiImplicitParam(name = "resolution", value = "单位:60 1D 1W 1D 对应H,D,W,Y", required = true, dataType = "String", paramType = "query"),
@@ -655,10 +708,10 @@ 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
-                                                               ) {
+    @EncryptFilter(decryptRequest = false)
+    public ResponseEntity<StockHistoryResponse> getStockHistory(@RequestParam String symbol,
+                                                                @RequestParam String resolution
+    ) {
        // 向外部API发起请求，并获取响应
        StockHistoryRequest request = new StockHistoryRequest();
        request.setSymbol(symbol);
@@ -667,23 +720,23 @@ public class MoneyApiController {
        int countback = 5;
        if(StringUtils.equals("H",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (1* 24 * 60 * 60 );
-            countback = 16;
+            from = to - (10 * 60 * 60 );
+            countback = 328;
            request.setResolution("60");
        }else if(StringUtils.equals("D",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (24 * 60 * 60 );
-            countback = 30;
-            request.setResolution("60");
-        }else if(StringUtils.equals("W",resolution)){
-            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (10 * 24 * 60 * 60 );
-            countback = 30;
+            from = to - (2 * 30 * 24 * 60 * 60 );
+            countback = 730;
            request.setResolution("1D");
-        }else if(StringUtils.equals("M",resolution)){
+        } else if (StringUtils.equals("W", resolution)) {
+            to = (long) (System.currentTimeMillis() / 1000);
+            from = to - (7 * 24 * 60 * 60);
+            countback = 730;
+            request.setResolution("1W");
+        } else if (StringUtils.equals("M", resolution)) {
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (35 * 24 * 60 * 60 );
-            countback = 30;
+            from = to - (15 * 30 * 24 * 60 * 60);
+            countback = 730;
            request.setResolution("1D");
        }

@@ -692,14 +745,88 @@ public class MoneyApiController {
        request.setCountback(countback);
        request.setCurrencyCode("INR");
        String apiUrl = buildApiUrl(request);
-        log.info("request url:"+apiUrl);
+        log.info("request url:" + apiUrl);
        StockHistoryResponse response = null;
        int maxRetries = 3;
        int retryCount = 0;

        while (response == null && retryCount < maxRetries) {
            try {
-                response = restTemplate.getForObject(apiUrl, StockHistoryResponse.class);
+                if (StringUtils.equals("M", resolution)) {
+                    CloseableHttpClient client = HttpClients.createDefault();
+                    HttpGet req = new HttpGet(apiUrl);
+                    HttpResponse resp = client.execute(req);
+                    String jsonResponse = EntityUtils.toString(resp.getEntity(), "UTF-8");
+                    ObjectMapper mapper = new ObjectMapper();
+                    JsonNode rootNode = mapper.readTree(jsonResponse);
+
+                    JsonNode timeNode = rootNode.get("t");
+                    JsonNode lowNode = rootNode.get("l");
+                    JsonNode highNode = rootNode.get("h");
+                    JsonNode openNode = rootNode.get("o");
+                    JsonNode closeNode = rootNode.get("c");
+                    JsonNode volumeNote = rootNode.get("v");
+
+                    List<StockChartDto> stocks = new ArrayList<>();
+                    for (int i = 0; i < timeNode.size(); i++) {
+                        long timestamp = timeNode.get(i).asLong();
+                        double closePrice = closeNode.get(i).asDouble();
+                        double openPrice = openNode.get(i).asDouble();
+                        double volume = volumeNote.get(i).asDouble();
+                        double low = lowNode.get(i).asDouble();
+                        double high = highNode.get(i).asDouble();
+
+                        stocks.add(new StockChartDto(timestamp, openPrice, high, low, closePrice, volume));
+                    }
+
+                    Map<String, List<StockChartDto>> groupedByMonth = stocks.stream()
+                            .collect(Collectors.groupingBy(
+                                    sp -> Instant.ofEpochSecond(sp.getTimestamp())
+                                            .atZone(ZoneId.systemDefault())
+                                            .toLocalDate()
+                                            .format(DateTimeFormatter.ofPattern("yyyy-MM")),
+                                    LinkedHashMap::new,
+                                    Collectors.toList()
+                            ));
+
+                    List<Long> timestamps = new ArrayList<>();
+                    List<Double> opens = new ArrayList<>();
+                    List<Double> closes = new ArrayList<>();
+                    List<Double> highs = new ArrayList<>();
+                    List<Double> lows = new ArrayList<>();
+                    List<Long> volumes = new ArrayList<>();
+
+                    response = new StockHistoryResponse();
+                    groupedByMonth.forEach((month, prices) -> {
+                        double open = prices.get(0).getOpen();
+                        double close = prices.get(prices.size() - 1).getClose();
+                        double high = prices.stream().mapToDouble(StockChartDto::getHigh).max().orElse(0);
+                        double low = prices.stream().mapToDouble(StockChartDto::getLow).min().orElse(0);
+                        double volume = prices.stream().mapToDouble(StockChartDto::getVolume).sum();
+
+                        long timestamp = YearMonth.parse(month, DateTimeFormatter.ofPattern("yyyy-MM")).atDay(1).atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli() / 1000;
+                        timestamps.add(timestamp);
+                        opens.add(open);
+                        closes.add(close);
+                        highs.add(high);
+                        lows.add(low);
+                        volumes.add((long) volume);
+
+                        System.out.println("Month: " + month);
+                        System.out.println("Open: " + open + ", Close: " + close + ", High: " + high + ", Low: " + low);
+                    });
+
+                    response.setS("ok");
+                    response.setT(timestamps);
+                    response.setL(lows);
+                    response.setH(highs);
+                    response.setO(opens);
+                    response.setC(closes);
+                    response.setV(volumes);
+
+                } else {
+                    response = restTemplate.getForObject(apiUrl, StockHistoryResponse.class);
+                }
            } catch (RestClientException e) {
                // Log the exception or perform any other error handling
                log.error("Error while making API request. Retrying... (Retry count: {})", retryCount + 1);
@@ -712,13 +839,34 @@ public class MoneyApiController {
                } catch (InterruptedException ex) {
                    Thread.currentThread().interrupt();
                }
+            } catch (ClientProtocolException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
            }
        }

-        if (response != null) {
+        if (response != null && !response.getS().equals("error")) {
+//            setResponse(response, resolution);
            // API request successful, return the response
            return ResponseEntity.ok(response);
        } else {
+            try {
+                MoneyStock moneyStock = moneyStockRepository.findOne((QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
+                                .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
+                                .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
+                        .orElse(null);
+
+                if (moneyStock != null && moneyStock.getNseIndiaChartId() != null && !moneyStock.getNseIndiaChartId().isEmpty()) {
+                    request.setSymbol(moneyStock.getNseIndiaChartId());
+                    response = NseIndiaRequest.stockKLineFromHttp(request, resolution);
+                    return ResponseEntity.ok(response);
+                }
+            } catch (Exception e) {
+                log.error("Failed to get data from nseindia.", e.getMessage());
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+            }
+
            // All retries failed, return an error response
            log.error("Failed to get a successful response after {} retries.", maxRetries);
            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
@@ -726,7 +874,76 @@ public class MoneyApiController {
        // 返回响应
    }

+    @GetMapping({"/market/api/market/stock/optional", "/api/market/stock/optional"})
+    @ResponseBody
+    @EncryptFilter(decryptRequest = false)
+    public ResponseEntity<List<Object>> getOptionalStock() {
+        List<OptionalStock> optionalStocks = optionalStockRepository.findAll();
+        List<Object> data = optionalStocks.stream().map(stock -> {
+            try {
+                String responseStr = HttpRequest.doGrabGet(OPTIONAL_STOCK_MONEYCONTROL_URL + URLEncoder.encode(stock.getSymbol(), "UTF-8"));
+                OptionalStockResponse response = objectMapper.readValue(responseStr, OptionalStockResponse.class);
+                if (response != null && response.getCode().equals(200)) {
+                    return response.getData();
+                }
+            }
+            catch (Exception e) {
+                log.error("Failed to get optional stock from moneycontrol for " + stock.getSymbol(), e);
+            }

+            OptionalStockResponse response = new OptionalStockResponse();
+            response.getData().setSymbol(stock.getSymbol());
+            response.getData().setSymbol(stock.getCompany());
+
+            return response.getData();
+        }).collect(Collectors.toList());
+
+        return ResponseEntity.ok(data);
+    }
+
+    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);
+        }
+    }


    private String buildApiUrl(StockHistoryRequest request) {
@@ -734,7 +951,9 @@ public class MoneyApiController {
        return String.format("%s?symbol=%s&resolution=%s&from=%d&to=%d&countback=%d&currencyCode=%s",
                EXTERNAL_API_URL, request.getSymbol(), request.getResolution(), request.getFrom(),
                request.getTo(), request.getCountback(), request.getCurrencyCode());
-    };
+    }
+
+    ;


    private static String extractLastSegment(String url) {
@@ -750,13 +969,16 @@ public class MoneyApiController {


    public static void main(String[] args) {
-        nseGainer();
-        nseActives();
-        nseTopLoser();
-
-        bseActives();
-        bseGainer();
-        bseTopLoser();
+//        nseGainer();
+////        nseActives();
+////        nseTopLoser();
+////
+////        bseActives();
+////        bseGainer();
+////        bseTopLoser();
+        System.out.println(new Date());
+        System.out.println(new Date(1713949200000L));
+        System.out.println(DateUtil.isSameDay(new Date(), new Date(1713949200000L)));
    }

    private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()
--- a/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
+++ b/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.GetMapping;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -23,7 +24,7 @@ import java.net.URL;
 public class MoneyProxyApiControl {


-    @RequestMapping(value = "/api/proxy/queryStockMoneyProxy",method = RequestMethod.GET)
+    @GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
    public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
        return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
    }
--- a/src/main/java/cn/stock/market/web/SiteNewsController.java
+++ b/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);
--- a/src/main/java/cn/stock/market/web/StockApiController.java
+++ b/src/main/java/cn/stock/market/web/StockApiController.java
@@ -3,6 +3,8 @@ package cn.stock.market.web;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import javax.servlet.http.HttpServletRequest;
@@ -12,6 +14,7 @@ import cn.qutaojing.common.jpa.ConditionBuilder;
 import cn.stock.market.domain.basic.entity.SiteNews;
 import cn.stock.market.domain.basic.repository.SiteNewsRepository;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
+import cn.stock.market.infrastructure.job.InvestingTask;
 import cn.stock.market.web.annotations.EncryptFilter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -56,7 +59,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);

@@ -169,15 +172,22 @@ public class StockApiController {

 	@RequestMapping({"test.do"})
 	@ResponseBody
-	public ServerResponse test(@RequestParam("url") String url, @RequestParam("pageNum") Integer pageNum) {
+	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);
+			String imgUrl = InvestingTask.extractImgSrc(n);
+//			String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+			// Extract the date and time using regex
+			Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
+			Matcher matcher = pattern.matcher(n);
+			String time = "";
+			if (matcher.find()) {
+				time = matcher.group(1).trim();
+			}

 			SiteNews siteNews = new SiteNews();
 			siteNews.setAddTime(new Date());
@@ -238,10 +248,19 @@ public class StockApiController {
 	@ResponseBody
 	public ServerResponse getIndiaIndexByToday() {
 		String INDEX_CODE = "TODAY_INDEX";
-		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE, (string) -> {
+		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,6000, (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"})
--- a/src/main/java/cn/stock/market/web/TodayApiController.java
+++ b/src/main/java/cn/stock/market/web/TodayApiController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;

@Controller
@Api(value = "/TodayApiController", tags = "today股票行情")
-@RequestMapping({"/api/market/today/"})
+@RequestMapping({"/market/api/market/today/","/api/market/today/"})
 public class TodayApiController {

    @RequestMapping({"getTopGainers.do"})
--- a/src/main/resources/application-base-alpha.yml
+++ b/src/main/resources/application-base-alpha.yml
@@ -3,9 +3,9 @@ spring:
    show-sql: true
  # Redis配置
  redis:
-    host: 43.132.212.180
-    password: ruTZ9J3gaDhknJ
-    port: 36379
+    host: lb-b6sze686-7db6hgvsx05ef8nz.clb.sg-tencentclb.net
+    password: a5v8b86P4mVzFlUqJV
+    port: 56379
    database: 1
    lettuce:
      pool:
@@ -17,9 +17,9 @@ spring:
  datasource:
    stock-market:
      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8
+      url: jdbc:mysql://lb-1ju43bvw-p0ecnv4by9ju8six.clb.ap-singapore.tencentclb.com:53306/india_stock?useUnicode=true&characterEncoding=utf-8
      username: root
-      password: 33BsUUcnXRYgwtIND
+      password: uNejHIFQGJOUtYTmE
      maxActive: 500
      testWhileIdle: true
      validationQuery: SELECT 1
Author	SHA1	Message	Date
vpckiet	c19277e390	update	2024-10-10 10:50:01 +07:00
vpckiet	4257541342	fix bug kline	2024-10-09 17:18:26 +07:00
quangnguyen202	441adac15a	Merge branch 'feature/optional-stock' into 'develop' Add api for optional stock See merge request india/india_market_java!44	2024-10-01 07:07:59 +00:00
quangnguyen202	ba29ab98c7	Add api for optional stock	2024-10-01 14:06:24 +07:00
Gavin g	94ec73874b	Merge branch 'feature/kline-alternate-source' into 'develop' Add alternate source See merge request india/india_market_java!43	2024-09-26 09:57:06 +00:00
quangnguyen202	549345719a	Add alternate source	2024-09-26 16:51:41 +07:00
gavin	3870400411	修改切换备用数据源的判断条件	2024-09-19 15:59:12 +08:00
Gavin g	94d2936ffb	Merge branch 'feature/stock-kline-nseindia' into 'develop' Add alternal source See merge request india/india_market_java!42	2024-09-19 07:37:45 +00:00
quangnguyen202	59e4aa9e1a	Add alternal source	2024-09-19 14:33:22 +07:00
gavin	bae645e3c6	修复官方查询时名称写死的问题	2024-09-12 14:15:31 +08:00
gavin	94d9aea2c8	指定股票更换详情测试代码	2024-09-10 13:11:01 +08:00
gavin	5ae9762d45	指定股票更换详情测试代码	2024-09-09 14:59:38 +08:00
quangnguyen202	ece52491dd	Merge branch 'refactor/optimization' into 'develop' Optimize See merge request india/india_market_java!38	2024-09-09 06:54:16 +00:00
quangnguyen202	6235d41711	Optimize	2024-09-06 11:17:41 +07:00
vpckiet	c865eccaf4	Merge branch 'refactor/optimization' into 'develop' Optimize code See merge request india/india_market_java!37	2024-09-06 01:53:33 +00:00
quangnguyen202	136020a497	Update	2024-09-05 16:30:46 +07:00
quangnguyen202	d7da59aca1	Optimize code	2024-09-05 15:59:13 +07:00
gavin	8427bed427	指定股票更换详情测试代码	2024-09-04 12:52:17 +08:00
gavin	269f02b79d	指定股票更换详情测试代码	2024-09-04 11:56:04 +08:00
gavin	7cc456bcd8	同步手动更新代码	2024-09-02 15:32:50 +08:00
vpckiet	be05d403af	Merge branch 'bug/craw_img_news' into 'develop' update crawl img news See merge request india/india_market_java!33	2024-09-02 06:47:52 +00:00
Congkiet4695	4a29bf6659	update crawl img news	2024-09-02 13:46:22 +07:00
gavin	5b2eb8519a	大盘缓存数据改为6秒	2024-07-26 15:04:56 +08:00
gavin	2e4449bd64	大盘数据更换moneycontrol 数据源	2024-07-26 14:53:50 +08:00
Thanh Nguyen	b321fd9d4e	Update automatic-deployment link	2024-07-23 09:39:48 +07:00
gavin	2f9e54bf4f	更改数据库连接更新新闻时间格式为24小时制	2024-07-12 15:33:25 +08:00
Weng JinPeng	3bb354bbc6	Merge remote-tracking branch 'origin/develop' into develop	2024-07-08 12:38:26 +08:00
Weng JinPeng	a403cba964	fix: 时间字段错乱	2024-07-08 12:38:13 +08:00
Achilles	99bde81670	Merge remote-tracking branch 'origin/develop' into develop	2024-06-28 17:00:04 +08:00
Achilles	bae941828e	代码优化和优化	2024-06-28 16:59:58 +08:00
gs	2f86571578	价格问题处理	2024-06-25 18:00:21 +08:00
gs	d491bef735	新闻时间处理	2024-06-25 17:45:15 +08:00
gs	74c64eb7d4	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # src/main/java/cn/stock/market/web/StockApiController.java	2024-06-20 16:55:50 +08:00
gs	f50b6b5519	新闻时间处理	2024-06-20 16:54:56 +08:00
Weng JinPeng	2446d89b30	fix: 时间字段错乱	2024-06-20 16:33:38 +08:00
gs	33a68eb7e8	新闻处理	2024-06-20 14:50:15 +08:00
gs	7b0a08150d	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # src/main/java/cn/stock/market/domain/basic/service/StockService.java	2024-06-20 14:47:53 +08:00
gs	146e9d9bc0	新闻处理	2024-06-20 14:47:04 +08:00
william	59a0480be0	Merge branch 'main' into 'develop' # Conflicts: # docker-entrypoint.sh	2024-05-06 12:33:09 +00:00
william	5fe3200ea1	fix bug	2024-05-06 12:31:40 +00:00
vercel	943c6c77e4	fix: 新闻抓取优化	2024-05-05 13:53:46 +08:00
william	b2e93f646c	1	2024-05-01 11:57:12 +08:00
william	9af156cd4a	1	2024-05-01 11:53:13 +08:00
william	8660354dc1	fix bug	2024-05-01 01:35:02 +08:00
william	ed924d85ae	Merge branch 'main' of gitlab.main99.com:india/india_market_java	2024-05-01 01:30:32 +08:00
william	b7f0793d88	修复错误	2024-05-01 01:30:27 +08:00
Administrator	4e9810e074	Merge branch 'develop' into 'main' Merge branch 'main' into 'develop' See merge request india/india_market_java!25	2024-04-30 16:37:43 +00:00
Administrator	d2e186cae6	Merge branch 'main' into 'develop' Main See merge request india/india_market_java!24	2024-04-30 16:19:23 +00:00
william	d8862710a1	兼容路径错误问题	2024-05-01 00:17:46 +08:00
william	efae848b4f	修复环境变量	2024-04-30 21:47:07 +08:00
william	0cec277282	修改命名	2024-04-29 23:35:09 +08:00
Administrator	f6cc52bb9c	更改docker镜像的名称	2024-04-29 10:23:45 +00:00
guoshuai	45fe49a398	Merge branch 'develop' into 'main' fix:优化money股票K线图1w和1m See merge request india/india_market_java!23	2024-04-29 07:16:55 +00:00
xiaoliuhu	e0007aa6cc	fix:优化money股票K线图1w和1m	2024-04-29 14:10:48 +08:00
william	3982de78be	1	2024-04-27 09:00:47 +08:00
william	d24ce12179	1	2024-04-27 08:58:06 +08:00
william	7524952c46	docker镜像构建	2024-04-27 08:46:05 +08:00
guoshuai	40555fcd64	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!22	2024-04-25 11:54:10 +00:00
xiaoliuhu	30d95acdcf	fix:优化money股票K线图	2024-04-25 10:09:59 +08:00
xiaoliuhu	c340bba073	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 22:21:04 +08:00
guoshuai	4a3b75e0c6	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!21	2024-04-24 14:14:25 +00:00
xiaoliuhu	33c83af353	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 22:11:49 +08:00
xiaoliuhu	11130a9eda	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:50:28 +08:00
xiaoliuhu	5a95d6be9a	优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:24:03 +08:00
xiaoliuhu	e680bee42b	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:18:39 +08:00
xiaoliuhu	fbc7815365	fix:修改economictimes获取指数详情bug	2024-04-20 21:32:52 +08:00
xiaoliuhu	37bb619e24	fix:修改economictimes获取指数详情bug	2024-04-20 21:28:18 +08:00
xiaoliuhu	a7e6cc0b05	fix:拓展可自定义时间缓存接口,app指数接口增加缓存1分钟	2024-04-20 19:20:05 +08:00
xiaoliuhu	ece782497f	fix:app指数接口增加economictimes数据源兜底	2024-04-20 19:11:47 +08:00
zhangjian	4b25467bd2	日志打印优化	2024-04-20 17:16:43 +08:00
zhangjian	5b3cc7e156	印度--获取指定指数信息接口getIndiaIndexByToday.do: BToday添加兜底数据源Growwin	2024-04-20 17:01:59 +08:00
zhangjian	55c9865845	money股票推荐getTopGainer和 getTopLoser接口根据股票名称去重	2024-04-20 14:26:15 +08:00
zhangjian	07d3b0623e	money股票推荐相关getTopActives接口根据股票名称去重	2024-04-20 10:33:50 +08:00
guoshuai	85fe98cc29	Merge branch 'develop' into 'main' hotfix: 脏数据情况下的一个股票处理 See merge request india/india_market_java!20	2024-03-26 11:21:53 +00:00
guoshuai	9d6413bc43	Merge branch 'develop' into 'main' hotfix:价格优化 See merge request india/india_market_java!19	2024-03-21 09:42:50 +00:00
guoshuai	8c472d2973	Merge branch 'develop' into 'main' 代码优化 See merge request india/india_market_java!18	2024-03-18 10:19:06 +00:00
rplees	1d945f126e	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!17	2024-03-15 06:07:14 +00:00
rplees	19cb36b33a	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!16	2024-02-23 09:52:23 +00:00
rplees	a977f7c5fe	Merge branch 'develop' into 'main' 新闻定时任务新增日志信息 See merge request india/india_market_java!15	2024-02-16 10:39:43 +00:00
rplees	f7bf2cb0eb	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!14	2024-02-16 10:13:14 +00:00
guoshuai	de44d54ece	Merge branch 'develop' into 'main' 代码返回参数优化 See merge request india/india_market_java!13	2024-02-15 15:47:04 +00:00
guoshuai	ff2896a0fd	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!12	2024-02-15 15:04:45 +00:00
rplees	877154c1cc	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!11	2024-02-12 14:11:14 +00:00
rplees	96c23943ab	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!10	2024-02-08 12:35:11 +00:00
rplees	930e1e79cf	Merge branch 'develop' into 'main' 新股修改的时间获取 See merge request india/india_market_java!9	2024-02-06 07:42:08 +00:00
rplees	6c429ba58f	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!8	2024-02-02 07:12:48 +00:00
rplees	277ee7dfe4	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!7	2024-01-24 06:27:47 +00:00
rplees	933dadca3c	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!6	2024-01-14 15:09:09 +00:00
li deng	a9704b62ae	Merge branch 'dengli2024/1/11' into 'main' 新闻定时任务 See merge request india/india_market_java!5	2024-01-11 10:16:49 +00:00
dengli	ef392a7fe7	新闻定时任务	2024-01-11 18:04:32 +08:00
rplees	e98b6d0463	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!4	2024-01-09 12:35:18 +00:00
rplees	0a0c969e28	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!3	2024-01-04 07:45:15 +00:00
rplees	2087d8914b	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!2	2024-01-03 12:00:31 +00:00
rplees	42a40b9ff8	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!1	2023-12-31 11:13:55 +00:00