update crawl

update

See merge request india/india_market_java!46

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   # 构建
   - build
   - dockerize
-  - webhook
+  - deploy
 
 build:
   image: maven:3.6.3-openjdk-8
@@ -60,16 +60,20 @@ dockerize:
     - docker push juyoutech/india_stock_market:latest
     - docker push juyoutech/india_stock_market:$CI_PIPELINE_ID
     - docker push juyoutech/india_stock_market:$CI_COMMIT_BRANCH
-webhook:
+deploy-dev:
-  stage: webhook
+  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."
 
 

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>

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

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

@@ -1,49 +0,0 @@
-package cn.stock.market.infrastructure.db.po;
-
-import static com.querydsl.core.types.PathMetadataFactory.*;
-
-import com.querydsl.core.types.dsl.*;
-
-import com.querydsl.core.types.PathMetadata;
-import javax.annotation.Generated;
-import com.querydsl.core.types.Path;
-
-
-/**
- * QTwelveStockPO is a Querydsl query type for TwelveStockPO
- */
-@Generated("com.querydsl.codegen.EntitySerializer")
-public class QTwelveStockPO extends EntityPathBase<TwelveStockPO> {
-
-    private static final long serialVersionUID = -100071895L;
-
-    public static final QTwelveStockPO twelveStockPO = new QTwelveStockPO("twelveStockPO");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Integer> isLock = createNumber("isLock", Integer.class);
-
-    public final NumberPath<Integer> isShow = createNumber("isShow", Integer.class);
-
-    public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);
-
-    public final StringPath stockCode = createString("stockCode");
-
-    public final StringPath stockName = createString("stockName");
-
-    public final StringPath stockType = createString("stockType");
-
-    public QTwelveStockPO(String variable) {
-        super(TwelveStockPO.class, forVariable(variable));
-    }
-
-    public QTwelveStockPO(Path<? extends TwelveStockPO> path) {
-        super(path.getType(), path.getMetadata());
-    }
-
-    public QTwelveStockPO(PathMetadata metadata) {
-        super(TwelveStockPO.class, metadata);
-    }
-
-}
-

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

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

src/main/java/cn/stock/market/domain/basic/convert/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);
+    }
+}

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

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

src/main/java/cn/stock/market/domain/basic/entity/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 {
+}

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

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

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

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

src/main/java/cn/stock/market/domain/basic/repository/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;
+    }
+}

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

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

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

@@ -30,6 +30,8 @@ import org.apache.commons.lang3.StringUtils;
 import cn.stock.market.infrastructure.db.po.QStockPO;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpEntity;
@@ -247,12 +249,25 @@ public class StockService {
 		String result = "";
 		try {
 			// 使用Jsoup连接到网页
-			Document doc = Jsoup.connect("https://www.business-standard.com/markets/news")
+//			Document doc = Jsoup.connect("https://www.business-standard.com/markets/news")
-					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+//					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
-					.header("Referer", "https://www.business-standard.com/")
+//					.header("Referer", "https://www.business-standard.com/")
+//					.header("Accept-Language", "en-US,en;q=0.9")
+//					.get();
+			String url = "https://www.business-standard.com/markets/news";
+			Document doc = Jsoup.connect(url)
+					.referrer("https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
+					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
+					.timeout(5000) // timeout 5 seconds
 					.get();
-			result = doc.html().substring(doc.html().indexOf("<div class=\"shortvideoimg\" style=\"position:relative\">"),doc.html().lastIndexOf("<div class=\"shortvideoimg\" style=\"position:relative\">")+1200);
+		//	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();
 		}
@@ -264,10 +279,16 @@ public class StockService {
 		List<String> list = new ArrayList<>();
 		try {
 			// 使用Jsoup连接到网页
+//			Document doc = Jsoup.connect(url)
+//					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+//					.header("Referer", "https://www.business-standard.com/")
+//					.header("Accept-Language", "en-US,en;q=0.9")
+//					.get();
 			Document doc = Jsoup.connect(url)
-					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+					.referrer("https://www.business-standard.com/")
-					.header("Referer", "https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
+					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
+					.timeout(5000) // timeout 5 seconds
 					.get();
 			result = doc.html().substring(doc.html().indexOf("articleBody") + 14, doc.html().indexOf(",\"author\":") - 1);
 			list.add(result);
@@ -974,7 +995,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);
@@ -1004,7 +1025,7 @@ public class StockService {
 			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);
@@ -1034,23 +1055,23 @@ public class StockService {
 	}
 	private IndiaStockVO objToVo(JSONObject object){
 		IndiaStockVO market = new IndiaStockVO();
-		if(object.containsKey("prev_close")){
+		if(object.containsKey("priceprevclose")){
-			market.setClose(object.getString("prev_close"));
+			market.setClose(object.getString("priceprevclose"));
 		}
-		if(object.containsKey("price")){
+		if(object.containsKey("pricecurrent")){
-			market.setNowPrice(object.getString("price"));
+			market.setNowPrice(object.getString("pricecurrent"));
 		}
-		if(object.containsKey("perchg")){
+		if(object.containsKey("pricepercentchange")){
-			market.setRate(object.getString("perchg"));
+			market.setRate(object.getString("pricepercentchange"));
 		}
-		if(object.containsKey("high_price")){
+		if(object.containsKey("HIGH")){
-			market.setHigh(object.getString("high_price"));
+			market.setHigh(object.getString("HIGH"));
 		}
-		if(object.containsKey("low_price")){
+		if(object.containsKey("LOW")){
-			market.setLow(object.getString("low_price"));
+			market.setLow(object.getString("LOW"));
 		}
-		if(object.containsKey("open_price")){
+		if(object.containsKey("OPEN")){
-			market.setOpen(object.getString("open_price"));
+			market.setOpen(object.getString("OPEN"));
 		}
 		return market;
 //		stockListVO.setName(jsonObject.getString("companyname"));

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

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

src/main/java/cn/stock/market/dto/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;
+    }
+}

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

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

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

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

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

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

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

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

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

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

src/main/java/cn/stock/market/dto/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;
+    }
+}

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")){
+        if(object.containsKey("code")){
-            bool = object.getBoolean("success");
+            bool = object.getInteger("code") == 200;
         }
         if(!bool){
             return new JSONObject();
         }
-        JSONArray jsonArray = JSON.parseArray(object.getString("data"));
+        JSONObject entity = JSON.parseObject(object.getString("data"));
-        JSONObject entity = JSON.parseObject(jsonArray.get(0).toString());
         return entity;
 
     }

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;

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

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

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

src/main/java/cn/stock/market/infrastructure/db/repo/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> {
+}

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

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

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

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

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

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

src/main/java/cn/stock/market/utils/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);
     }

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

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

src/main/java/cn/stock/market/utils/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);
+        }
+    }
+}

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

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

@@ -3,14 +3,21 @@ 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;
@@ -23,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;
@@ -36,13 +49,18 @@ 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.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.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -61,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 = "stockType", value = "BSE或者NSE"),
-            @ApiImplicitParam(name="symbol",value = "scId值"),
+            @ApiImplicitParam(name = "symbol", value = "scId值"),
-            @ApiImplicitParam(name="id",value = "id值"),
+            @ApiImplicitParam(name = "id", value = "id值"),
     })
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "" +
@@ -168,53 +191,67 @@ public class MoneyApiController {
                     "priceprevclose: 前一交易日的收盘价\n" +
                     "30DayAvg: 过去30天的平均", response = JSONObject.class),
     })
-    @GetMapping({"/market/api/market/money/getStockDetail","/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 ) {
+    public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
-        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s",stockType,symbol);
         MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
-                .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
+                        .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
-                .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
+                        .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                .and(QMoneyStockPO.moneyStockPO.isShow.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){
+                    if (data != null) {
-                        json1.put("company",data.getString("company"));
+                        json1.put("company", data.getString("SC_FULLNM"));
-                        json1.put("pricepercentchange",data.getString("pricepercentchange"));
+                        json1.put("pricepercentchange", data.getString("pricepercentchange"));
-                        json1.put("stockType",stockType);
+                        json1.put("stockType", stockType);
-                        json1.put("pricechange",data.getString("pricechange"));
+                        json1.put("pricechange", data.getString("pricechange"));
-                        json1.put("pricecurrent",data.getString("pricecurrent"));
+                        json1.put("pricecurrent", data.getString("pricecurrent"));
-                        json1.put("priceprevclose",data.getString("priceprevclose"));
+                        json1.put("priceprevclose", data.getString("priceprevclose"));
-                        json1.put("PREVDATE",data.getString("PREVDATE"));
+                        json1.put("PREVDATE", data.getString("PREVDATE"));
-                        json1.put("VOL",data.getString("VOL"));
+                        json1.put("VOL", data.getString("VOL"));
-                        json1.put("dataSourceType","3");
+                        json1.put("dataSourceType", "3");
-                        json1.put("symbol",data.getString("symbol"));
+                        json1.put("symbol", data.getString("symbol"));
-                        json1.put("BSEID",data.getString("BSEID"));
+                        json1.put("BSEID", data.getString("BSEID"));
-                        json1.put("NSEID",data.getString("NSEID"));
+                        json1.put("NSEID", data.getString("NSEID"));
-                        json1.put("LTH",data.getString("HP"));
+                        json1.put("LTH", data.getString("HP"));
-                        json1.put("LTL",data.getString("LP"));
+                        json1.put("LTL", data.getString("LP"));
-                        json1.put("OPN",data.getString("OPN"));
+                        json1.put("OPN", data.getString("OPN"));
-                        if(null!=moneyStock){
+                        if (null != moneyStock) {
-                            json1.put("id",moneyStock.getId());
+                            json1.put("id", moneyStock.getId());
                         }
-                        if(StringUtils.equals(data.getString("pricecurrent"),"0.00")
+                        if (StringUtils.equals(data.getString("pricecurrent"), "0.00")
-                          && (!StringUtils.equals(data.getString("priceprevclose"),"0.00"))){
+                                && (!StringUtils.equals(data.getString("priceprevclose"), "0.00"))) {
-                            json1.put("pricecurrent",data.getString("priceprevclose"));
+                            json1.put("pricecurrent", data.getString("priceprevclose"));
                         }
                     }
-                    return ServerResponse.createBySuccess(json1);
+                    if (json1.size() > 0)
+                        return ServerResponse.createBySuccess(json1);
                 }
             } catch (Exception e) {
             }
@@ -228,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();
@@ -249,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());
@@ -274,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";
@@ -282,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();
@@ -313,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++){
+            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();
+                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");
@@ -369,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();
@@ -406,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);
                 }
 
@@ -446,7 +494,7 @@ public class MoneyApiController {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return  list;
+        return list;
     }
 
     private static List<MoneyStockSuggestDTO> bseTopLoser() {
@@ -456,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) {
@@ -501,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({"/market/api/market/money/getTopGainer","/api/market/money/getTopGainer"})
+    @GetMapping({"/market/api/market/money/getTopGainer", "/api/market/money/getTopGainer"})
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
@@ -529,15 +575,15 @@ public class MoneyApiController {
             }
             Map<Object, Boolean> map = new HashMap<>();
             moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
                     .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+            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)){
+                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
+                        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()));
+                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
                     }
                 }
                 gainerStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
@@ -548,47 +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({"/market/api/market/money/getTopLoser","/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 (null == moneyStockSuggestDTOS) {
-            if(StringUtils.equals(stockType,"nse")){
+            if (StringUtils.equals(stockType, "nse")) {
                 moneyStockSuggestDTOS = nseTopLoser();
-            }else if(StringUtils.equals(stockType,"bse")){
+            } else if (StringUtils.equals(stockType, "bse")) {
                 moneyStockSuggestDTOS = bseTopLoser();
             }
             Map<Object, Boolean> map = new HashMap<>();
             moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
                     .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
+                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)){
+                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
+                        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()));
+                                .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());
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if(CollectionUtils.isNotEmpty(noScIdList)){
+                    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)){
+                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
+                            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()));
+                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                         }
                     }
                 }
@@ -599,49 +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({"/market/api/market/money/getTopActives","/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 (moneyStockSuggestDTOS == null) {
-            if(StringUtils.equals(stockType,"nse")){
+            if (StringUtils.equals(stockType, "nse")) {
                 moneyStockSuggestDTOS = nseActives();
-            }else if(StringUtils.equals(stockType,"bse")){
+            } else if (StringUtils.equals(stockType, "bse")) {
                 moneyStockSuggestDTOS = bseActives();
             }
             Map<Object, Boolean> map = new HashMap<>();
             moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f->StringUtils.isNotBlank(f.getStockName()))
+                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
                     .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
+            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
+                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)){
+                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f->all.stream().anyMatch(s->s.getStockName().equals(f.getStockName())))
+                        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()));
+                                .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());
+                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if(CollectionUtils.isNotEmpty(noScIdList)){
+                    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)){
+                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f->all1.stream().anyMatch(s->s.getSelfDispId().equals(f.getDispId())))
+                            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()));
+                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
                         }
                     }
                 }
@@ -653,9 +697,8 @@ public class MoneyApiController {
     }
 
 
-
+    @GetMapping({"/market/api/market/money/history/kLine", "/api/market/money/history/kLine"})
-    @GetMapping({"/market/api/market/money/history/kLine","/api/market/money/history/kLine"})
+    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源", response = StockHistoryResponse.class)
-    @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"),
@@ -665,10 +708,10 @@ public class MoneyApiController {
             @ApiImplicitParam(name = "currencyCode", value = "INR 不变", required = true, dataType = "String", paramType = "query")
     })
     @ResponseBody
-   @EncryptFilter(decryptRequest = false)
+    @EncryptFilter(decryptRequest = false)
-    public ResponseEntity<StockHistoryResponse> getStockHistory( @RequestParam String symbol,
+    public ResponseEntity<StockHistoryResponse> getStockHistory(@RequestParam String symbol,
-                                                                 @RequestParam String resolution
+                                                                @RequestParam String resolution
-                                                               ) {
+    ) {
         // 向外部API发起请求，并获取响应
         StockHistoryRequest request = new StockHistoryRequest();
         request.setSymbol(symbol);
@@ -677,24 +720,24 @@ public class MoneyApiController {
         int countback = 5;
         if(StringUtils.equals("H",resolution)){
             to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - ( 60 * 60 );
+            from = to - (10 * 60 * 60 );
-            countback = 60;
+            countback = 328;
-            request.setResolution("1");
+            request.setResolution("60");
         }else if(StringUtils.equals("D",resolution)){
             to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (24 * 60 * 60 );
+            from = to - (2 * 30 * 24 * 60 * 60 );
-            countback = 390;
+            countback = 730;
-            request.setResolution("1");
+            request.setResolution("1D");
-        }else if(StringUtils.equals("W",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 - (7 * 24 * 60 * 60 );
+            from = to - (15 * 30 * 24 * 60 * 60);
-            countback = 471;
+            countback = 730;
-            request.setResolution("5");
+            request.setResolution("1D");
-        }else if(StringUtils.equals("M",resolution)){
-            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (35 * 24 * 60 * 60 );
-            countback = 328;
-            request.setResolution("30");
         }
 
         request.setFrom(from);
@@ -702,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);
@@ -722,14 +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);
+//            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();
@@ -737,14 +874,41 @@ public class MoneyApiController {
         // 返回响应
     }
 
-    private void setResponse(StockHistoryResponse response,String resolution){
+    @GetMapping({"/market/api/market/stock/optional", "/api/market/stock/optional"})
-        if(!"ok".equals(response.getS())){
+    @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())){
+        if (Objects.isNull(response.getT())) {
             return;
         }
-        if(StringUtils.equals("H",resolution) || StringUtils.equals("D",resolution)) {
+        if (StringUtils.equals("H", resolution) || StringUtils.equals("D", resolution)) {
             List<Long> t = new ArrayList<>();
             List<Double> o = new ArrayList<>();
             List<Double> h = new ArrayList<>();
@@ -756,7 +920,7 @@ public class MoneyApiController {
             Date currentTime = new Date();
             //判断最后一条是不是当天的数据，如果不是，把最后一条的时间作为当天的时间
             long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
-            if(!DateUtil.isSameDay(currentTime, new Date(getTime))){
+            if (!DateUtil.isSameDay(currentTime, new Date(getTime))) {
                 currentTime = new Date(getTime);
             }
             int i = 0;
@@ -782,14 +946,14 @@ public class MoneyApiController {
     }
 
 
-
-
     private String buildApiUrl(StockHistoryRequest request) {
         // 构建外部API的URL
         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) {
@@ -814,7 +978,7 @@ public class MoneyApiController {
 ////        bseTopLoser();
         System.out.println(new Date());
         System.out.println(new Date(1713949200000L));
-        System.out.println(DateUtil.isSameDay(new Date(),new Date(1713949200000L)));
+        System.out.println(DateUtil.isSameDay(new Date(), new Date(1713949200000L)));
     }
 
     private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()

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;
@@ -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 imgUrl = InvestingTask.extractImgSrc(n);
-			String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+//			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,7 +248,7 @@ public class StockApiController {
 	@ResponseBody
 	public ServerResponse getIndiaIndexByToday() {
 		String INDEX_CODE = "TODAY_INDEX";
-		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,60000, (string) -> {
+		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,6000, (string) -> {
 			return this.stockService.getIndexByBtoday();
 		});
 	}

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

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

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

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

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

@@ -3,9 +3,9 @@ spring:
     show-sql: true
   # Redis配置
   redis:
-    host: 43.132.212.180
+    host: lb-b6sze686-7db6hgvsx05ef8nz.clb.sg-tencentclb.net
-    password: ruTZ9J3gaDhknJ
+    password: a5v8b86P4mVzFlUqJV
-    port: 36379
+    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
@@ -42,7 +42,6 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
-twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
   type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云

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

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

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

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