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:
-  stage: webhook
+deploy-dev:
+  stage: deploy
   only:
     - develop
   script:
-    - echo ">>>>>>Start Deploy<<<<<<"
+    - echo "Deploying application..."
     - ls
     - apt-get update
     - apt-get install -y curl
-    - curl --max-time 30 http://149.88.86.7:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
-    - echo ">>>>>>Start Deploy Finish<<<<<<"
+    - |
+      curl -X POST \
+           -H "Content-Type: application/json" \
+           -d '{"namespace":"yddev", "deployment_name":"india-stock-market"}' \
+           https://updater-yddev.moneytj.com/restart-deployment
+    - echo "Application successfully deployed."
 
 

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/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/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/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/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")
-					.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/")
+//			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("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")
-					.header("Referer", "https://www.business-standard.com/")
+					.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("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")){
-			market.setClose(object.getString("prev_close"));
+		if(object.containsKey("priceprevclose")){
+			market.setClose(object.getString("priceprevclose"));
 		}
-		if(object.containsKey("price")){
-			market.setNowPrice(object.getString("price"));
+		if(object.containsKey("pricecurrent")){
+			market.setNowPrice(object.getString("pricecurrent"));
 		}
-		if(object.containsKey("perchg")){
-			market.setRate(object.getString("perchg"));
+		if(object.containsKey("pricepercentchange")){
+			market.setRate(object.getString("pricepercentchange"));
 		}
-		if(object.containsKey("high_price")){
-			market.setHigh(object.getString("high_price"));
+		if(object.containsKey("HIGH")){
+			market.setHigh(object.getString("HIGH"));
 		}
-		if(object.containsKey("low_price")){
-			market.setLow(object.getString("low_price"));
+		if(object.containsKey("LOW")){
+			market.setLow(object.getString("LOW"));
 		}
-		if(object.containsKey("open_price")){
-			market.setOpen(object.getString("open_price"));
+		if(object.containsKey("OPEN")){
+			market.setOpen(object.getString("OPEN"));
 		}
 		return market;
 //		stockListVO.setName(jsonObject.getString("companyname"));

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

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/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/job/InvestingTask.java

@@ -7,6 +7,7 @@ import cn.stock.market.domain.basic.repository.StockRepository;
 import cn.stock.market.domain.basic.service.StockService;
 import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
+import cn.stock.market.utils.DateTimeUtil;
 import cn.stock.market.utils.Utils;
 import com.ag.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
@@ -25,6 +26,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Slf4j
 @Component
@@ -118,8 +121,16 @@ public class InvestingTask {
             newsList.forEach( n -> {
                 String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
                 String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_"));
-                String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?"));
-                String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+//                String imgUrl = n.substring(n.indexOf("img loading=\"lazy\" src=") + 24, n.indexOf("?"));
+                String imgUrl = extractImgSrc(n);
+//                String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+                // Extract the date and time using regex
+                Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
+                Matcher matcher = pattern.matcher(n);
+                String time = "";
+                if (matcher.find()) {
+                    time = DateTimeUtil.formatDateTimeFor24H(matcher.group(1).trim(),"dd MMM yyyy | hh:mm a");
+                }
 
                 SiteNews siteNews = new SiteNews();
                 siteNews.setAddTime(new Date());
@@ -140,4 +151,22 @@ public class InvestingTask {
         }
 
     }
+
+    public static String extractImgSrc(String htmlData) {
+        String searchString = "<noscript>";
+        int startPos = htmlData.indexOf(searchString);
+
+        if (startPos != -1) {
+            String startTag = "src=";
+            startPos = htmlData.indexOf(startTag, startPos) + startTag.length() + 1;
+
+            int endPos = htmlData.indexOf("?", startPos);
+
+            if (endPos != -1) {
+                return htmlData.substring(startPos, endPos);
+            }
+        }
+
+        return null;
+    }
 }

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/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,9 +79,14 @@ 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")
     @ApiImplicitParams({
@@ -173,7 +196,6 @@ public class MoneyApiController {
     @EncryptFilter(decryptRequest = false)
 
     public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
-        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s",stockType,symbol);
         MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
                         .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
                         .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
@@ -183,6 +205,20 @@ public class MoneyApiController {
             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 {
@@ -191,7 +227,7 @@ public class MoneyApiController {
                 if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null) {
                     JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
                     if (data != null) {
-                        json1.put("company",data.getString("company"));
+                        json1.put("company", data.getString("SC_FULLNM"));
                         json1.put("pricepercentchange", data.getString("pricepercentchange"));
                         json1.put("stockType", stockType);
                         json1.put("pricechange", data.getString("pricechange"));
@@ -214,6 +250,7 @@ public class MoneyApiController {
                             json1.put("pricecurrent", data.getString("priceprevclose"));
                         }
                     }
+                    if (json1.size() > 0)
                         return ServerResponse.createBySuccess(json1);
                 }
             } catch (Exception e) {
@@ -228,9 +265,20 @@ 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() {
@@ -501,8 +549,6 @@ public class MoneyApiController {
     }
 
 
-
-
     @ApiOperation(value = "股票推荐TopGainer", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
@@ -599,8 +645,6 @@ public class MoneyApiController {
     }
 
 
-
-
     @ApiOperation(value = "股票推荐TopActive", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
@@ -653,7 +697,6 @@ public class MoneyApiController {
     }
 
 
-
     @GetMapping({"/market/api/market/money/history/kLine", "/api/market/money/history/kLine"})
     @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源", response = StockHistoryResponse.class)
     @ApiImplicitParams({
@@ -677,24 +720,24 @@ public class MoneyApiController {
         int countback = 5;
         if(StringUtils.equals("H",resolution)){
             to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - ( 60 * 60 );
-            countback = 60;
-            request.setResolution("1");
+            from = to - (10 * 60 * 60 );
+            countback = 328;
+            request.setResolution("60");
         }else if(StringUtils.equals("D",resolution)){
             to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (24 * 60 * 60 );
-            countback = 390;
-            request.setResolution("1");
+            from = to - (2 * 30 * 24 * 60 * 60 );
+            countback = 730;
+            request.setResolution("1D");
         } else if (StringUtils.equals("W", resolution)) {
             to = (long) (System.currentTimeMillis() / 1000);
             from = to - (7 * 24 * 60 * 60);
-            countback = 471;
-            request.setResolution("5");
+            countback = 730;
+            request.setResolution("1W");
         } else if (StringUtils.equals("M", resolution)) {
             to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (35 * 24 * 60 * 60 );
-            countback = 328;
-            request.setResolution("30");
+            from = to - (15 * 30 * 24 * 60 * 60);
+            countback = 730;
+            request.setResolution("1D");
         }
 
         request.setFrom(from);
@@ -709,7 +752,81 @@ public class MoneyApiController {
 
         while (response == null && retryCount < maxRetries) {
             try {
+                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) {
-            setResponse(response,resolution);
+        if (response != null && !response.getS().equals("error")) {
+//            setResponse(response, resolution);
             // API request successful, return the response
             return ResponseEntity.ok(response);
         } else {
+            try {
+                MoneyStock moneyStock = moneyStockRepository.findOne((QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
+                                .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
+                                .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
+                        .orElse(null);
+
+                if (moneyStock != null && moneyStock.getNseIndiaChartId() != null && !moneyStock.getNseIndiaChartId().isEmpty()) {
+                    request.setSymbol(moneyStock.getNseIndiaChartId());
+                    response = NseIndiaRequest.stockKLineFromHttp(request, resolution);
+                    return ResponseEntity.ok(response);
+                }
+            } catch (Exception e) {
+                log.error("Failed to get data from nseindia.", e.getMessage());
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+            }
+
             // All retries failed, return an error response
             log.error("Failed to get a successful response after {} retries.", maxRetries);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
@@ -737,6 +874,33 @@ public class MoneyApiController {
         // 返回响应
     }
 
+    @GetMapping({"/market/api/market/stock/optional", "/api/market/stock/optional"})
+    @ResponseBody
+    @EncryptFilter(decryptRequest = false)
+    public ResponseEntity<List<Object>> getOptionalStock() {
+        List<OptionalStock> optionalStocks = optionalStockRepository.findAll();
+        List<Object> data = optionalStocks.stream().map(stock -> {
+            try {
+                String responseStr = HttpRequest.doGrabGet(OPTIONAL_STOCK_MONEYCONTROL_URL + URLEncoder.encode(stock.getSymbol(), "UTF-8"));
+                OptionalStockResponse response = objectMapper.readValue(responseStr, OptionalStockResponse.class);
+                if (response != null && response.getCode().equals(200)) {
+                    return response.getData();
+                }
+            }
+            catch (Exception e) {
+                log.error("Failed to get optional stock from moneycontrol for " + stock.getSymbol(), e);
+            }
+
+            OptionalStockResponse response = new OptionalStockResponse();
+            response.getData().setSymbol(stock.getSymbol());
+            response.getData().setSymbol(stock.getCompany());
+
+            return response.getData();
+        }).collect(Collectors.toList());
+
+        return ResponseEntity.ok(data);
+    }
+
     private void setResponse(StockHistoryResponse response, String resolution) {
         if (!"ok".equals(response.getS())) {
             return;
@@ -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) {

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 time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+			String imgUrl = InvestingTask.extractImgSrc(n);
+//			String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9);
+			// Extract the date and time using regex
+			Pattern pattern = Pattern.compile("Updated On :<!-- --> <!-- -->(.*?)<!-- -->");
+			Matcher matcher = pattern.matcher(n);
+			String time = "";
+			if (matcher.find()) {
+				time = matcher.group(1).trim();
+			}
 
 			SiteNews siteNews = new SiteNews();
 			siteNews.setAddTime(new Date());
@@ -238,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/resources/application-base-alpha.yml

@@ -3,9 +3,9 @@ spring:
     show-sql: true
   # Redis配置
   redis:
-    host: 43.132.212.180
-    password: ruTZ9J3gaDhknJ
-    port: 36379
+    host: lb-b6sze686-7db6hgvsx05ef8nz.clb.sg-tencentclb.net
+    password: a5v8b86P4mVzFlUqJV
+    port: 56379
     database: 1
     lettuce:
       pool:
@@ -17,9 +17,9 @@ spring:
   datasource:
     stock-market:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8
+      url: jdbc:mysql://lb-1ju43bvw-p0ecnv4by9ju8six.clb.ap-singapore.tencentclb.com:53306/india_stock?useUnicode=true&characterEncoding=utf-8
       username: root
-      password: 33BsUUcnXRYgwtIND
+      password: uNejHIFQGJOUtYTmE
       maxActive: 500
       testWhileIdle: true
       validationQuery: SELECT 1