stock top list

update filter type stock top list

See merge request germany/ger-market-java!3

.gitlab-ci.yml

@@ -15,6 +15,7 @@ build:
   only:
     - main
     - develop
+    - develop_red
   before_script:
     - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -52,6 +53,7 @@ dockerize:
   only:
     - main
     - develop
+    - develop_red
   script:
     - echo ">>>>>>Start Building Docker Image<<<<<<"
     - pwd
@@ -72,17 +74,15 @@ dockerize:
 deploy-dev:
   stage: deploy
   only:
-    - develop
+    - develop_red
   script:
     - echo "Deploying application..."
     - ls
     - apk update
     - apk add curl
+    - apk add curl openssh sshpass
     - |
-      curl -X POST \
-           -H "Content-Type: application/json" \
-           -d '{"namespace":"dgdev", "deployment_name":"germany-stock-market"}' \
-           https://updater-dgdev.moneytj.com/restart-deployment
+      sshpass -p "$SSH_PASS" ssh -o StrictHostKeyChecking=no ubuntu@"$SSH_HOST" "./deploy_service.sh market $CI_PIPELINE_ID"
     - echo "Application successfully deployed."
 
 

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

@@ -0,0 +1,10 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RawStockApiResponse {
+    private List<StockDataDto> data;
+}

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

@@ -0,0 +1,13 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class StockDataDto {
+    private long time;
+    private double open;
+    private double close;
+    private double max;
+    private double min;
+    private long volume;
+}

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

@@ -0,0 +1,31 @@
+package cn.stock.market.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class StockQuoteData {
+    private String id;
+    private String symbol;
+    private String name;
+    private String exchange;
+    private String mic_code;
+    private String datetime;
+    private long timestamp;
+    private double open;
+    private double high;
+    private double low;
+    private double close;
+    private long volume;
+    private double previous_close;
+    private double change;
+    private double percent_change;
+    private double average_volume;
+    @JsonProperty("is_market_open")
+    private boolean market_open;
+    private Long market_cap;
+    private Object fifty_two_week;
+    private int icon;
+}

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

@@ -0,0 +1,13 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StockQuoteResponse {
+    private List<StockQuoteData> data;
+    private boolean success;
+    private String message;
+    private int status;
+}

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

@@ -0,0 +1,13 @@
+package cn.stock.market.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TradingViewData {
+    private String s; // symbol
+    private List<Object> d; // data array
+} 

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

@@ -0,0 +1,13 @@
+package cn.stock.market.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TradingViewResponse {
+    private int totalCount;
+    private List<TradingViewData> data;
+} 

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

@@ -1,6 +1,8 @@
 package cn.stock.market.infrastructure.api;
+import cn.qutaojing.common.utils.SpringUtils;
 import cn.stock.market.dto.model.ChartCandle;
 import cn.stock.market.dto.model.StockIndex;
+import cn.stock.market.web.config.Config;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -16,8 +18,9 @@ import java.util.List;
 
 public class HomeApiIndex {
     private static final OkHttpClient client = new OkHttpClient();
-    private static final String API_URL = "https://apinode-dgdev.moneytj.com/api/ger-market/stocks/query-list?symbols=XETR:DAX,XETR:MDAX,XETR:SDXP,XETR:HDAX";
-    private static final String BASE_URL = "https://apinode-dgdev.moneytj.com/api/ger-market/chart";
+    static Config config = SpringUtils.getBean(Config.class);
+    private static final String API_URL = config.getStockUrlPrefix() +  "/api/ger-market/stocks/query-list?symbols=DAX,MDAX,SDXP,HDAX";
+    private static final String BASE_URL = config.getStockUrlPrefix() + "/api/ger-market/chart";
 
     public static List<StockIndex> fetchStockIndices() throws Exception {
         List<StockIndex> result = new ArrayList<>();
@@ -44,7 +47,15 @@ public class HomeApiIndex {
 
             index.setId(obj.optString("id"));
             index.setSymbol(obj.optString("symbol"));
-            index.setName(obj.optString("name"));
+            if (index.getSymbol().equals("DAX")) {
+                index.setName("DAX Index");
+            }else if (index.getSymbol().equals("MDAX")) {
+                index.setName("MDAX Index");
+            }else if (index.getSymbol().equals("HDAX")) {
+                index.setName("HDAX PERFORMANCE-INDEX");
+            } else if (index.getSymbol().equals("SDXP")) {
+                index.setName("SDAX Index");
+            }
             index.setExchange(obj.optString("exchange"));
             index.setMicCode(obj.optString("mic_code"));
             index.setDatetime(obj.optString("datetime"));

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

@@ -16,27 +16,44 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+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.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @Slf4j
 @Component
+@RestController
+@RequestMapping("/api/market/investing")
 public class InvestingTask {
 
     @Autowired
     StockService stockService;
     @Autowired
     SiteNewsRepository newsRepository;
+    @Autowired
+    RestTemplate restTemplate;
 
 //    @Scheduled(cron = "0 0 6 * * ?")
     public void syncIndiaData(){
@@ -169,4 +186,220 @@ public class InvestingTask {
 
         return null;
     }
+
+    /*德国新闻接口*/
+//    @Scheduled(cron = "0 0 0/3 * * ?")
+    public void saveGerNews() {
+        log.info("德国股票新闻数据同步开始");
+        int savedCount = 0;
+        int totalCount = 0;
+        try {
+            // API URL for getting news list
+            String newsListUrl = "https://api.boerse-frankfurt.de/v1/data/category_news?newsType=ALL&lang=de&offset=0&limit=50";
+            
+            // Headers for the API request
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("accept", "application/json, text/plain, */*");
+            headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8,ug;q=0.7,fr;q=0.6");
+            headers.add("origin", "https://www.boerse-frankfurt.de");
+            headers.add("priority", "u=1, i");
+            headers.add("referer", "https://www.boerse-frankfurt.de/");
+            headers.add("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36");
+
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+            
+            // Get news list
+            ResponseEntity<String> response = restTemplate.exchange(
+                newsListUrl, 
+                HttpMethod.GET, 
+                entity, 
+                String.class
+            );
+
+            if (response.getStatusCode().value() == 200 && response.getBody() != null) {
+                JSONObject newsListResponse = JSON.parseObject(response.getBody());
+                JSONArray newsData = newsListResponse.getJSONArray("data");
+                
+                if (newsData != null && newsData.size() > 0) {
+                    totalCount = newsData.size();
+                    log.info("Found {} German news items to process", totalCount);
+                    
+                    for (int i = 0; i < newsData.size(); i++) {
+                        try {
+                            JSONObject newsItem = newsData.getJSONObject(i);
+                            String newsId = newsItem.getString("id");
+                            String headline = newsItem.getString("headline");
+                            String time = newsItem.getString("time");
+                            String source = newsItem.getString("source");
+                            String teaserText = newsItem.getString("teaserText");
+                            String teaserImageUrl = newsItem.getString("teaserImageUrl");
+                            
+                            // Check if news already exists
+                            List<SiteNews> existingNews = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(newsId));
+                            if (existingNews.size() == 0) {
+                                // Get news detail
+                                String newsDetailUrl = "https://api.boerse-frankfurt.de/v1/data/news?id=" + newsId + "&lang=de";
+                                HttpEntity<String> detailEntity = new HttpEntity<>(headers);
+                                
+                                ResponseEntity<String> detailResponse = restTemplate.exchange(
+                                    newsDetailUrl, 
+                                    HttpMethod.GET, 
+                                    detailEntity, 
+                                    String.class
+                                );
+                                
+                                if (detailResponse.getStatusCode().value() == 200 && detailResponse.getBody() != null) {
+                                    JSONObject newsDetail = JSON.parseObject(detailResponse.getBody());
+                                    String body = newsDetail.getString("body");
+                                    
+                                    // Create SiteNews entity
+                                    SiteNews siteNews = new SiteNews();
+                                    siteNews.setAddTime(new Date());
+                                    siteNews.setSourceId(newsId);
+                                    siteNews.setTitle(headline);
+                                    siteNews.setSourceName(source);
+                                    siteNews.setDescription(teaserText != null ? teaserText : "");
+                                    siteNews.setImgurl(teaserImageUrl);
+                                    siteNews.setContent(body != null ? body : "");
+                                    siteNews.setStatus(1);
+                                    siteNews.setType(1); // Set as financial news type
+                                    siteNews.setViews(0);
+                                    
+                                    // Parse and set show time
+                                    if (time != null && !time.isEmpty()) {
+                                        try {
+                                            // Parse ISO 8601 format: "2025-06-19T08:37:58+02:00"
+                                            // Remove timezone offset and convert to standard format
+                                            String timeStr = time.replace("+02:00", "").replace("T", " ");
+                                            siteNews.setShowTime(DateTimeUtil.strToDate(timeStr, "yyyy-MM-dd HH:mm:ss"));
+                                        } catch (Exception e) {
+                                            log.warn("Failed to parse time for news {}: {}", newsId, time);
+                                            siteNews.setShowTime(new Date());
+                                        }
+                                    } else {
+                                        siteNews.setShowTime(new Date());
+                                    }
+                                    
+                                    try {
+                                        newsRepository.save(siteNews);
+                                        savedCount++;
+                                        log.info("Saved German news [{}/{}]: {}", savedCount, totalCount, headline);
+                                    } catch (Exception e) {
+                                        log.warn("Failed to save German news {}: {}", newsId, e.getMessage());
+                                    }
+                                } else {
+                                    log.warn("Failed to get news detail for {}: HTTP {}", newsId, detailResponse.getStatusCode());
+                                }
+                            } else {
+                                log.debug("News {} already exists, skipping", newsId);
+                            }
+                        } catch (Exception e) {
+                            log.warn("Error processing news item {}: {}", i, e.getMessage());
+                        }
+                    }
+                } else {
+                    log.warn("No news data found in API response");
+                }
+            } else {
+                log.error("Failed to get news list: HTTP {}", response.getStatusCode());
+            }
+            log.info("德国股票新闻数据同步完成，处理了 {} 条新闻，保存了 {} 条新闻", totalCount, savedCount);
+        } catch (Exception e) {
+            log.error("德国新闻数据同步异常，异常信息: {}", e.getMessage(), e);
+        }
+    }
+
+    @Scheduled(cron = "0 0 0/3 * * ?")
+//    @PostConstruct
+    public void getBoerseNews(){
+        String url_request = "https://www.boerse-online.de";
+
+        try {
+            List<SiteNews> results = new ArrayList<>();
+
+            String listUrl = url_request + "/nachrichten/1";
+            Document doc = Jsoup.connect(listUrl)
+                    .userAgent("Mozilla/5.0")
+                    .get();
+
+            Elements articles = doc.select("article.article-list-item");
+
+            for (Element article : articles) {
+                Element aTag = article.selectFirst("h2 a");
+                String title = aTag != null ? aTag.text().trim() : null;
+                String link = aTag != null ? url_request + aTag.attr("href") : null;
+
+                Element imgTag = article.selectFirst("figure a picture img");
+                String image = imgTag != null ? imgTag.attr("src") : null;
+
+                Element timeTag = article.selectFirst("small.article-info time");
+                Date publishedDate = null;
+
+                if (timeTag != null) {
+                    String datetimeAttr = timeTag.attr("datetime");
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+                    LocalDateTime dateTime = LocalDateTime.parse(datetimeAttr, formatter);
+                    ZoneId berlinZone = ZoneId.of("Europe/Berlin");
+                    publishedDate = Date.from(dateTime.atZone(berlinZone).toInstant());
+                }
+
+                Element authorTag = article.selectFirst("small.article-info strong");
+                String author = authorTag != null ? authorTag.text().trim() : null;
+
+                // Fetch article detail page
+                String htmlContent = "";
+                if (link != null) {
+                    try {
+                        Document detailPage = Jsoup.connect(link)
+                                .userAgent("Mozilla/5.0")
+                                .get();
+
+                        Element body = detailPage.selectFirst("div.article-body");
+                        if (body != null) {
+                            htmlContent = body.html(); // ✅ inner HTML only
+                        }
+
+                    } catch (Exception e) {
+                        System.err.println("Error fetching article detail: " + link);
+                        e.printStackTrace();
+                    }
+                }
+                SiteNews siteNews = new SiteNews();
+                siteNews.setAddTime(new Date());
+                siteNews.setSourceId(link);
+                siteNews.setTitle(title);
+                siteNews.setSourceName("BOERSE");
+                siteNews.setDescription(title);
+                siteNews.setImgurl(image);
+                siteNews.setContent(htmlContent);
+                siteNews.setStatus(1);
+                siteNews.setType(1); // Set as financial news type
+                siteNews.setViews(0);
+                siteNews.setShowTime(publishedDate);
+                try {
+                    newsRepository.save(siteNews);
+                    log.info("Saved German news : {}", title);
+                } catch (Exception e) {
+                    log.warn("Failed to save German news {}: {}", link, e.getMessage());
+                }
+            }
+        }catch (Exception e){
+            log.error("Error fetching article detail: {}", e.getMessage());
+            e.printStackTrace();
+        }
+
+
+    }
+
+    /**
+     * Test method to manually trigger German news sync
+     * This can be called via REST API or scheduled task
+     */
+    @GetMapping("/test-ger-news")
+    public String testSaveGerNews() {
+        log.info("Testing German news sync...");
+        saveGerNews();
+        log.info("German news sync test completed");
+        return "German news sync test completed. Check logs for details.";
+    }
 }

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

@@ -31,82 +31,156 @@ public class StockNewTask {
 	private static final String BASE_URL = "https://symbol-search.tradingview.com/symbol_search/v3/";
 	private static final String PARAMS  = "?start={start}&hl=1&country=DE&lang=en&search_type=stocks&domain=production&sort_by_country=US&promo=true&exchange={exchange}";
 
+	private static final String US_URL =
+			"https://financialmodelingprep.com/api/v3/stock-screener";
+	private static final String US_API_KEY = "57ZI1xeAsqHY7ag0FBuMkwQzt6TQ60dG";
 	@Autowired
 	StockRepository stockRepository;
 
 
 //    @PostConstruct
-	@Scheduled(cron = "0 01 22 * * ?")
+//	@Scheduled(cron = "0 01 22 * * ?")
 	public void syncStock() throws Exception {
-
-		int limit = 20000;
-		List<String> exchanges = Arrays.asList("BER", "DUS", "HAM", "HAN", "MUN", "SWB", "FWB", "XETR");
-		Map<String, Stock> stockGidMap = stockRepository.cacheGidMap();
-		for (String exchange : exchanges) {
-			List<Stock> newStocks = new ArrayList<>();
-			int start = 0;
-			int symbolsRemaining;
-			do {
-				int finalStart = start;
-				if(start > 0){
-					finalStart = start + 1;
-				}
-				String url = BASE_URL + PARAMS.replace("{start}", String.valueOf(finalStart)).replace("{exchange}", exchange);
-				Request request = new Request.Builder()
-						.url(url)
-						.addHeader("Origin", "https://www.tradingview.com")
-						.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
-						.addHeader("Accept", "application/json, text/plain, */*")
-						.addHeader("Referer", "https://www.tradingview.com/")
-						.build();
-
-				Response response = client.newCall(request).execute();
-
-				if (!response.isSuccessful()) {
-					throw new RuntimeException("Unexpected response code: " + response.code());
-				}
-
-				String responseBody = response.body().string();
-				JSONObject json = new JSONObject(responseBody);
-				JSONArray symbols = json.getJSONArray("symbols");
-				symbolsRemaining = json.getInt("symbols_remaining");
-
-				for (int i = 0; i < symbols.length(); i++) {
-					JSONObject s = symbols.getJSONObject(i);
-					if (s.optString("type").equals("stock") && !stockGidMap.containsKey(s.optString("exchange") + ":" + s.getString("symbol"))) {
-						Stock stock = new Stock();
-						stock.setStockGid(s.optString("exchange") + ":" +s.getString("symbol"));
-						stock.setStockCode(stock.getStockGid());
-						stock.setStockSpell(s.optString("symbol"));
-						stock.setStockName(s.optString("description"));
-						stock.setStockSymbol(s.optString("symbol"));
-						stock.setStockType(s.optString("exchange"));
-						stock.setIsLock(0);
-						stock.setIsShow(0);
-						stock.setAddTime(new Date());
-						stock.setStockState(0);
-						stock.setStockPlate("https://s3-symbol-logo.tradingview.com/" + s.optString("source_logoid") + "--big.svg");
-						newStocks.add(stock);
-						stockGidMap.put(s.optString("exchange") + ":" + s.getString("symbol"), stock);
+		try {
+			int limit = 20000;
+			List<String> exchanges = Arrays.asList("BER", "DUS", "HAM", "HAN", "MUN", "SWB", "FWB", "XETR");
+			Map<String, Stock> stockGidMap = stockRepository.cacheGidMap();
+			for (String exchange : exchanges) {
+				List<Stock> newStocks = new ArrayList<>();
+				int start = 0;
+				int symbolsRemaining;
+				do {
+					int finalStart = start;
+					if (start > 0) {
+						finalStart = start + 1;
 					}
-				}
-				Thread.sleep(500);
+					String url = BASE_URL + PARAMS.replace("{start}", String.valueOf(finalStart)).replace("{exchange}", exchange);
+					Request request = new Request.Builder()
+							.url(url)
+							.addHeader("Origin", "https://www.tradingview.com")
+							.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
+							.addHeader("Accept", "application/json, text/plain, */*")
+							.addHeader("Referer", "https://www.tradingview.com/")
+							.build();
 
-				start += symbols.length();
-				System.out.println("Fetched: " + symbols.length() + ", Remaining: " + symbolsRemaining);
-				try {
-					if (!newStocks.isEmpty()) {
-						stockRepository.saveAll(newStocks);
+					Response response = client.newCall(request).execute();
+
+					if (!response.isSuccessful()) {
+						throw new RuntimeException("Unexpected response code: " + response.code());
 					}
-				}catch (Exception e) {
-					log.error("Insert stock failed: {}", e.getMessage());
-				}
 
-				if (start >= limit) {
-					break;
-				}
+					String responseBody = response.body().string();
+					JSONObject json = new JSONObject(responseBody);
+					JSONArray symbols = json.getJSONArray("symbols");
+					symbolsRemaining = json.getInt("symbols_remaining");
 
-			} while (symbolsRemaining > 0);
+					for (int i = 0; i < symbols.length(); i++) {
+						JSONObject s = symbols.getJSONObject(i);
+						if (s.optString("type").equals("stock") && !stockGidMap.containsKey(s.optString("exchange") + ":" + s.getString("symbol"))) {
+							Stock stock = new Stock();
+							stock.setStockGid(s.optString("exchange") + ":" + s.getString("symbol"));
+							stock.setStockCode(stock.getStockGid());
+							stock.setStockSpell(s.optString("symbol"));
+							stock.setStockName(s.optString("description"));
+							stock.setStockSymbol(s.optString("symbol"));
+							stock.setStockType(s.optString("exchange"));
+							stock.setIsLock(0);
+							stock.setIsShow(0);
+							stock.setAddTime(new Date());
+							stock.setStockState(0);
+							stock.setStockPlate("https://s3-symbol-logo.tradingview.com/" + s.optString("source_logoid") + "--big.svg");
+							newStocks.add(stock);
+							stockGidMap.put(s.optString("exchange") + ":" + s.getString("symbol"), stock);
+						}
+					}
+					Thread.sleep(500);
+
+					start += symbols.length();
+					System.out.println("Fetched: " + symbols.length() + ", Remaining: " + symbolsRemaining);
+					try {
+						if (!newStocks.isEmpty()) {
+							stockRepository.saveAll(newStocks);
+						}
+					} catch (Exception e) {
+						log.error("Insert stock failed: {}", e.getMessage());
+					}
+
+					if (start >= limit) {
+						break;
+					}
+
+				} while (symbolsRemaining > 0);
+			}
+		}catch (Exception e) {
+			log.error("Insert stock failed: {}", e.getMessage());
+			e.printStackTrace();
 		}
 	}
+
+	@Scheduled(cron = "0 0 8 * * *")
+//    @PostConstruct
+	public void fetchListStock() {
+		try {
+			List<Stock> nasdaqStocks = fetchStocksByExchange("NASDAQ");
+			List<Stock> nyseStocks = fetchStocksByExchange("NYSE");
+
+			List<Stock> allActiveStocks = new ArrayList<>();
+			allActiveStocks.addAll(nasdaqStocks);
+			allActiveStocks.addAll(nyseStocks);
+
+			try {
+				if (!allActiveStocks.isEmpty()) {
+					stockRepository.saveAll(allActiveStocks);
+				}
+			} catch (Exception e) {
+				log.error("Insert stock failed: {}", e.getMessage());
+			}
+		} catch (Exception e) {
+			log.error("Error fetchListStock every day: {}", e.getMessage());
+		}
+	}
+
+	private static List<Stock> fetchStocksByExchange(String exchange) throws Exception {
+		List<Stock> result = new ArrayList<>();
+
+		String url = US_URL + "?exchange=" + exchange + "&apikey=" + US_API_KEY;
+
+		Request request = new Request.Builder()
+				.url(url)
+				.addHeader("accept", "application/json")
+				.addHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
+				.build();
+
+		Response response = client.newCall(request).execute();
+
+		if (!response.isSuccessful()) {
+			throw new RuntimeException("HTTP error code: " + response.code());
+		}
+
+		String body = response.body().string();
+		JSONArray array = new JSONArray(body);
+
+		for (int i = 0; i < array.length(); i++) {
+			JSONObject obj = array.getJSONObject(i);
+			if (!obj.optBoolean("isActivelyTrading", false) && obj.optBoolean("isEtf", false)) {
+				continue;
+			}
+
+			Stock stock = new Stock();
+
+			String stockCodeNew = obj.getString("symbol") + ":" + obj.getString("exchangeShortName");
+
+			stock.setStockName(obj.getString("companyName"));
+			stock.setStockCode(stockCodeNew);
+			stock.setStockSpell(obj.getString("symbol"));
+			stock.setStockType(obj.getString("exchangeShortName"));
+			stock.setStockGid(stockCodeNew);
+			stock.setStockSymbol(obj.getString("symbol"));
+
+			result.add(stock);
+		}
+
+		System.out.println("Fetched " + result.size() + " stocks for exchange: " + exchange);
+		return result;
+	}
 }

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

@@ -1,18 +1,24 @@
 package cn.stock.market.web;
 
 import cn.hutool.core.date.DateUtil;
+import cn.qutaojing.common.jpa.ConditionBuilder;
 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.entity.Stock;
 import cn.stock.market.domain.basic.repository.MoneyStockRepository;
 import cn.stock.market.domain.basic.repository.OptionalStockRepository;
+import cn.stock.market.domain.basic.repository.StockRepository;
+import cn.stock.market.domain.basic.service.StockService;
 import cn.stock.market.dto.*;
 import cn.stock.market.dto.query.StockChartDto;
 import cn.stock.market.infrastructure.db.po.QMoneyStockPO;
+import cn.stock.market.infrastructure.db.po.QStockPO;
 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 cn.stock.market.web.service.MoneyApiService;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -87,8 +93,14 @@ public class MoneyApiController {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @Autowired
+    private MoneyApiService moneyApiService;
+
     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/";
+    @Autowired
+    private StockRepository stockRepository;
+
 
     @ApiOperation(value = "股票详情信息", httpMethod = "GET")
     @ApiImplicitParams({
@@ -197,136 +209,13 @@ public class MoneyApiController {
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
     public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol) {
-        MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
-                        .and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
-                        .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                        .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
-                .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);
+        Stock stock = stockRepository.findStockByCode(symbol);
+        if (stock == null) {
+            return ServerResponse.createByErrorMsg("Stock is not exist!");
         }
-
-        String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", stockType.toLowerCase(), symbol);
-        int maxRetries = 3;
-        if (moneyStock.getUseFromBseindia()) {
-            String bseUrl = "https://api.bseindia.com/BseIndiaAPI/api/getScripHeaderData/w?Debtflag=&scripcode=" + moneyStock.getNseIndiaId() + "&seriesid=";
-            HttpHeaders headers = new HttpHeaders();
-            headers.add("accept", "application/json, text/plain, */*");
-            headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
-            headers.add("origin", "https://www.bseindia.com");
-            headers.add("referer", "https://www.bseindia.com/");
-            headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
-            headers.add("sec-ch-ua-mobile", "?0");
-            headers.add("sec-ch-ua-platform", "\"Windows\"");
-            headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
-
-            HttpEntity<String> entity = new HttpEntity<>(headers);
-
-            try {
-                ResponseEntity<String> responseEntity = restTemplate.exchange(bseUrl, HttpMethod.GET, entity, String.class);
-                if (responseEntity.getStatusCode().value() == 200 && responseEntity.getBody() != null) {
-                    JSONObject bseData = JSONObject.parseObject(responseEntity.getBody());
-                    JSONObject json1 = new JSONObject();
-                    json1.put("company", bseData.getJSONObject("Cmpname").getString("FullN"));
-                    json1.put("pricepercentchange", bseData.getJSONObject("CurrRate").getString("PcChg"));
-                    json1.put("stockType", stockType);
-                    json1.put("pricechange", bseData.getJSONObject("CurrRate").getString("Chg"));
-                    json1.put("pricecurrent", bseData.getJSONObject("CurrRate").getString("LTP"));
-                    json1.put("priceprevclose", bseData.getJSONObject("Header").getString("PrevClose"));
-                    json1.put("PREVDATE", "");
-
-                    json1.put("dataSourceType", "3");
-                    json1.put("symbol", symbol);
-                    json1.put("BSEID", moneyStock.getNseIndiaId());
-                    json1.put("NSEID", moneyStock.getNseIndiaId());
-                    json1.put("LTH", bseData.getJSONObject("Header").getString("High"));
-                    json1.put("LTL", bseData.getJSONObject("Header").getString("Low"));
-                    json1.put("OPN", bseData.getJSONObject("Header").getString("Open"));
-
-
-                    if (moneyStock != null) {
-                        json1.put("id", moneyStock.getId());
-                    }
-
-                    json1.put("VOL", this.getVolume(moneyStock.getNseIndiaId()));
-                    return ServerResponse.createBySuccess(json1);
-                }
-            } catch (Exception e) {
-                System.err.println("Error fetching data from BSE India: " + e.getMessage());
-            }
-        }
-
-        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) {
-                    JSONObject data = JSONObject.parseObject(responseEntity.getBody()).getJSONObject("data");
-                    if (data != null) {
-                        json1.put("company", data.getString("SC_FULLNM"));
-                        json1.put("pricepercentchange", data.getString("pricepercentchange"));
-                        json1.put("stockType", stockType);
-                        json1.put("pricechange", data.getString("pricechange"));
-                        json1.put("pricecurrent", data.getString("pricecurrent"));
-                        json1.put("priceprevclose", data.getString("priceprevclose"));
-                        json1.put("PREVDATE", data.getString("PREVDATE"));
-                        json1.put("VOL", data.getString("VOL"));
-                        json1.put("dataSourceType", "3");
-                        json1.put("symbol", data.getString("symbol"));
-                        json1.put("BSEID", data.getString("BSEID"));
-                        json1.put("NSEID", data.getString("NSEID"));
-                        json1.put("LTH", data.getString("HP"));
-                        json1.put("LTL", data.getString("LP"));
-                        json1.put("OPN", data.getString("OPN"));
-                        if (null != moneyStock) {
-                            json1.put("id", moneyStock.getId());
-                        }
-                        if (StringUtils.equals(data.getString("pricecurrent"), "0.00")
-                                && (!StringUtils.equals(data.getString("priceprevclose"), "0.00"))) {
-                            json1.put("pricecurrent", data.getString("priceprevclose"));
-                        }
-                    }
-                    if (json1.size() > 0)
-                        return ServerResponse.createBySuccess(json1);
-                }
-            } catch (Exception e) {
-            }
-            // 如果不是最后一次重试，则等待一段时间再进行下一次重试
-            if (retry < maxRetries) {
-                try {
-                    // 1秒钟
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
-        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;
+        StockQuoteData data = moneyApiService.getSingleStockQuote(symbol);
+        data.setName(stock.getStockName());
+        return ServerResponse.createBySuccess(data);
     }
 
     private String getVolume(String scripcode) {
@@ -651,7 +540,7 @@ public class MoneyApiController {
 
     @ApiOperation(value = "股票推荐TopGainer", httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE或者germany"),
     })
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "" +
@@ -661,42 +550,41 @@ public class MoneyApiController {
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<MoneyStockSuggestDTO> getTopGainer(@RequestParam String stockType) {
+    public List<MoneyStockSuggestDTO> getTopGainer(@RequestParam(required = false, defaultValue = "germany") String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
         // 尝试从缓存中获取结果
-        moneyStockSuggestDTOS = gainerStockSuggestCache.getIfPresent(stockType);
+        // Use TradingView API for German stocks
+        List<StockQuoteData> stockQuoteDataList = moneyApiService.getTopGainersFromTradingView();
+        moneyStockSuggestDTOS = convertStockQuoteDataToMoneyStockSuggestDTO(stockQuoteDataList);
+
 
-        if (moneyStockSuggestDTOS == null) {
-            // 缓存未命中，执行业务查询
-            if (StringUtils.equals(stockType, "nse")) {
-                moneyStockSuggestDTOS = nseGainer();
-            } else if (StringUtils.equals(stockType, "bse")) {
-                moneyStockSuggestDTOS = bseGainer();
-            }
-            Map<Object, Boolean> map = new HashMap<>();
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
-                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
-                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
-                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
-                    }
-                }
-                gainerStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
-            }
-            // 将结果放入缓存
-        }
         return moneyStockSuggestDTOS;
     }
 
+    private List<MoneyStockSuggestDTO> convertStockQuoteDataToMoneyStockSuggestDTO(List<StockQuoteData> stockQuoteDataList) {
+        List<MoneyStockSuggestDTO> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(stockQuoteDataList)) {
+            for (StockQuoteData stockQuoteData : stockQuoteDataList) {
+                MoneyStockSuggestDTO dto = new MoneyStockSuggestDTO();
+                dto.setStockName(stockQuoteData.getName());
+                dto.setStockType("XETRA");
+                dto.setLastPrice(String.valueOf(stockQuoteData.getClose()));
+                dto.setChange(String.valueOf(stockQuoteData.getChange()));
+                dto.setChangePercent(String.valueOf(stockQuoteData.getPercent_change()));
+                dto.setHighPrice(String.valueOf(stockQuoteData.getHigh()));
+                dto.setLowPrice(String.valueOf(stockQuoteData.getLow()));
+                dto.setPrevClosePrice(String.valueOf(stockQuoteData.getPrevious_close()));
+                dto.setScId(String.valueOf(stockQuoteData.getSymbol()));
+                dto.setDispId(String.valueOf(stockQuoteData.getSymbol()));
+                result.add(dto);
+            }
+        }
+        return result;
+    }
 
     @ApiOperation(value = "股票推荐TopLoser", httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE"),
+            @ApiImplicitParam(name = "stockType", value = "BSE或者NSE或者germany"),
     })
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "" +
@@ -706,41 +594,11 @@ public class MoneyApiController {
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam String stockType) {
+    public List<MoneyStockSuggestDTO> getTopLoser(@RequestParam(required = false) String stockType) {
         List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
-        moneyStockSuggestDTOS = loserStockSuggestCache.getIfPresent(stockType);
-        if (null == moneyStockSuggestDTOS) {
-            if (StringUtils.equals(stockType, "nse")) {
-                moneyStockSuggestDTOS = nseTopLoser();
-            } else if (StringUtils.equals(stockType, "bse")) {
-                moneyStockSuggestDTOS = bseTopLoser();
-            }
-            Map<Object, Boolean> map = new HashMap<>();
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
-                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f -> f.setDispId(extractLastSegment(f.getStockUrl())));
-                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
-                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
-                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
-                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(noScIdList)) {
-                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
-                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
-                        }
-                    }
-                }
-                loserStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
-            }
-        }
+        List<StockQuoteData> stockQuoteDataList = moneyApiService.getTopLosersFromTradingView();
+        moneyStockSuggestDTOS = convertStockQuoteDataToMoneyStockSuggestDTO(stockQuoteDataList);
+
         return moneyStockSuggestDTOS;
     }
 
@@ -757,43 +615,30 @@ public class MoneyApiController {
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
 
-    public List<MoneyStockSuggestDTO> getTopActive(@RequestParam String stockType) {
-        List<MoneyStockSuggestDTO> moneyStockSuggestDTOS = null;
-        moneyStockSuggestDTOS = activesStockSuggestCache.getIfPresent(stockType);
-        if (moneyStockSuggestDTOS == null) {
-            if (StringUtils.equals(stockType, "nse")) {
-                moneyStockSuggestDTOS = nseActives();
-            } else if (StringUtils.equals(stockType, "bse")) {
-                moneyStockSuggestDTOS = bseActives();
-            }
-            Map<Object, Boolean> map = new HashMap<>();
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
-                    .filter(f -> StringUtils.isNotBlank(f.getStockName()))
-                    .filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)) {
-                moneyStockSuggestDTOS.stream().forEach(f -> f.setDispId(extractLastSegment(f.getStockUrl())));
-                List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
-                if (CollectionUtils.isNotEmpty(selfUlrList)) {
-                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.in(selfUlrList));
-                    if (CollectionUtils.isNotEmpty(all)) {
-                        moneyStockSuggestDTOS.stream().filter(f -> all.stream().anyMatch(s -> s.getStockName().equals(f.getStockName())))
-                                .forEach(f -> f.setScId(all.stream().filter(s -> s.getStockName().equals(f.getStockName())).findFirst().orElse(null).getMoneyScId()));
-                    }
-                    List<MoneyStockSuggestDTO> noScIdList = moneyStockSuggestDTOS.stream().filter(f -> StringUtils.isBlank(f.getScId())).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(noScIdList)) {
-                        List<String> dispIdList = noScIdList.stream().map(MoneyStockSuggestDTO::getDispId).collect(Collectors.toList());
-                        List<MoneyStock> all1 = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.selfDispId.in(dispIdList));
-                        if (CollectionUtils.isNotEmpty(all1)) {
-                            moneyStockSuggestDTOS.stream().filter(f -> all1.stream().anyMatch(s -> s.getSelfDispId().equals(f.getDispId())))
-                                    .forEach(f -> f.setScId(all.stream().filter(s -> s.getSelfDispId().equals(f.getDispId())).findFirst().orElse(null).getMoneyScId()));
-                        }
-                    }
-                }
-                activesStockSuggestCache.put(stockType, moneyStockSuggestDTOS);
+    public List<StockQuoteData> getTopActive(@RequestParam(value = "stockType", required = false) String stockType, @RequestParam(value = "type", required = false) String type) {
+        List<String> topActiveCode = Arrays.asList("AAPL:NASDAQ","MSFT:NASDAQ","GOOGL:NASDAQ","AMZN:NASDAQ","META:NASDAQ","TSLA:NASDAQ","NVDA:NASDAQ","BRK.B:NYSE","JPM:NYSE",
+                                                    "UNH:NYSE", "V:NYSE", "MA:NYSE","JNJ:NYSE","XOM:NYSE","PG:NYSE","HD:NYSE","LLY:NYSE","KO:NYSE", "PEP:NASDAQ", "NFLX:NASDAQ",
+                "SAP:XETR", "SIE:XETR", "DTE:XETR", "ALV:XETR", "BAS:XETR", "BMW:XETR", "VOW3:XETR", "ADS:XETR", "BAYN:XETR", "RWE:XETR",
+                "DBK:XETR", "MUV2:XETR", "FME:XETR", "FRE:XETR", "HEI:XETR", "HEN3:XETR", "LIN:XETR", "IFX:XETR", "CON:XETR", "ZAL:XETR");
+        QStockPO q = QStockPO.stockPO;
+        ConditionBuilder builder = ConditionBuilder.builder();
+        builder.and(q.stockCode.in(topActiveCode));
+        if(type != null && !type.trim().isEmpty()) {
+            if (type.equals("us")) {
+                builder.and(q.stockType.in("NASDAQ", "NYSE"));
+            } else if (type.equals("dg")) {
+                builder.and(q.stockType.in("XETR"));
             }
         }
-
-        return moneyStockSuggestDTOS;
+        List<Stock> stocks = stockRepository.findAll(builder.build());
+        List<StockQuoteData> stockQuoteDatas = moneyApiService.getStocksQuote(stocks);
+        for (StockQuoteData stockQuoteData : stockQuoteDatas) {
+            Stock name = stocks.stream().filter(e->e.getStockCode().equals(stockQuoteData.getSymbol())).findFirst().orElse(null);
+            if (name != null) {
+                stockQuoteData.setName(name.getStockName());
+            }
+        }
+        return stockQuoteDatas;
     }
 
     private static void addToListDouble(List<Double> list, String value) {
@@ -834,343 +679,15 @@ 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({
-            @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"),
-            @ApiImplicitParam(name = "from", value = "Start timestamp", required = true, dataType = "long", paramType = "query"),
-            @ApiImplicitParam(name = "to", value = "End timestamp", required = true, dataType = "long", paramType = "query"),
-            @ApiImplicitParam(name = "countback", value = "开始时间和结束时间区间的计划展示的数量", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "currencyCode", value = "INR 不变", required = true, dataType = "String", paramType = "query")
-    })
     @ResponseBody
     @EncryptFilter(decryptRequest = false)
-    public ResponseEntity<StockHistoryResponse> getStockHistory(@RequestParam String symbol,
-                                                                @RequestParam String resolution
+    public ResponseEntity<StockHistoryResponse> getStockChart(@RequestParam String symbol,
+                                                              @RequestParam String interval,
+                                                              @RequestParam(required = false) Integer amount
     ) {
-        MoneyStock moneyStock1 = moneyStockRepository.findOne(
-                        QMoneyStockPO.moneyStockPO.nseIndiaId.eq(symbol)
-                        .and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
-                        .and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
-                .orElse(null);
-
-        if (moneyStock1 != null && moneyStock1.getUseFromBseindia()) {
-
-            String json = this.getChartData(moneyStock1.getNseIndiaId(), resolution);
-
-            Gson gson = new Gson();
-
-            JsonObject outerJson = gson.fromJson(json, JsonObject.class);
-
-            String innerJsonString;
-
-            if (resolution.equals("H")) {
-                innerJsonString = outerJson.get("getDatIResult").getAsString();
-            } else {
-                innerJsonString = outerJson.get("getDatResult").getAsString();
-            }
-
-            JsonObject innerJson = gson.fromJson(innerJsonString, JsonObject.class);
-
-            JsonArray dataInputValues = innerJson.getAsJsonArray("DataInputValues");
-
-            List<Double> openList = new ArrayList<>();
-            List<Double> highList = new ArrayList<>();
-            List<Double> lowList = new ArrayList<>();
-            List<Double> closeList = new ArrayList<>();
-            List<Long> volumeList = new ArrayList<>();
-            List<Long> dateList = new ArrayList<>();
-
-            Map<String, JsonObject> latestDataMap = new LinkedHashMap<>();
-
-            if (dataInputValues.size() > 0) {
-                JsonObject dataObject = dataInputValues.get(0).getAsJsonObject();
-
-                JsonArray openArray = dataObject.getAsJsonArray("OpenData");
-                JsonArray highArray = dataObject.getAsJsonArray("HighData");
-                JsonArray lowArray = dataObject.getAsJsonArray("LowData");
-                JsonArray closeArray = dataObject.getAsJsonArray("CloseData");
-                JsonArray volumeArray = dataObject.getAsJsonArray("VolumeData");
-                JsonArray dateArray = dataObject.getAsJsonArray("DateData");
-
-                if (resolution.equals("H")) {
-                    openArray.forEach(o -> addToListDouble(openList, o.getAsJsonObject().get("Open").getAsString()));
-                    highArray.forEach(h -> addToListDouble(highList, h.getAsJsonObject().get("High").getAsString()));
-                    lowArray.forEach(l -> addToListDouble(lowList, l.getAsJsonObject().get("Low").getAsString()));
-                    closeArray.forEach(c -> addToListDouble(closeList, c.getAsJsonObject().get("Close").getAsString()));
-                    volumeArray.forEach(v -> addToList(volumeList, v.getAsJsonObject().get("Volume").getAsString()));
-                    dateArray.forEach(d -> addDatesToList(dateList, d.getAsJsonObject().get("Date").getAsString()));
-                } else {
-                    for (int i = 0; i < openArray.size(); i++) {
-                        String open = openArray.get(i).getAsJsonObject().get("Open").getAsString();
-                        String high = highArray.get(i).getAsJsonObject().get("High").getAsString();
-                        String low = lowArray.get(i).getAsJsonObject().get("Low").getAsString();
-                        String close = closeArray.get(i).getAsJsonObject().get("Close").getAsString();
-                        String volume = volumeArray.get(i).getAsJsonObject().get("Volume").getAsString();
-                        String dateStr = dateArray.get(i).getAsJsonObject().get("Date").getAsString();
-
-                        Long timestamp = convertToTimestamp(dateStr);
-
-                        String dateTimeKey = dateStr;
-
-                        JsonObject dataJson = new JsonObject();
-                        dataJson.addProperty("Open", open);
-                        dataJson.addProperty("High", high);
-                        dataJson.addProperty("Low", low);
-                        dataJson.addProperty("Close", close);
-                        dataJson.addProperty("Volume", volume);
-                        dataJson.addProperty("Date", dateStr);
-
-                        latestDataMap.put(dateTimeKey, dataJson);
-                    }
-
-                    latestDataMap.forEach((key, value) -> {
-                        // Lấy giá trị các trường Open, High, Low, Close, Volume, Date từ dữ liệu
-                        String openData = value.get("Open").getAsString();
-                        String highData = value.get("High").getAsString();
-                        String lowData = value.get("Low").getAsString();
-                        String closeData = value.get("Close").getAsString();
-                        String volumeData = value.get("Volume").getAsString();
-                        String dateData = value.get("Date").getAsString();
-
-                        // Tách các giá trị trong chuỗi bằng dấu phẩy
-                        String[] openValues = openData.split(",");
-                        String[] highValues = highData.split(",");
-                        String[] lowValues = lowData.split(",");
-                        String[] closeValues = closeData.split(",");
-                        String[] volumeValues = volumeData.split(",");
-                        String[] dateValues = dateData.split(",");
-
-                        for (int i = 0; i < openValues.length; i++) {
-                            double open = Double.parseDouble(openValues[i]);
-                            double high = Double.parseDouble(highValues[i]);
-                            double low = Double.parseDouble(lowValues[i]);
-                            double close = Double.parseDouble(closeValues[i]);
-                            long volume = Math.round(Double.parseDouble(volumeValues[i]));
-                            long timestamp = convertToTimestamp(dateValues[i]);
-
-                            int index = dateList.indexOf(timestamp);
-                            if (index == -1) {
-                                dateList.add(timestamp);
-                                openList.add(open);
-                                highList.add(high);
-                                lowList.add(low);
-                                closeList.add(close);
-                                volumeList.add(volume);
-                            } else {
-                                openList.set(index, open);
-                                highList.set(index, high);
-                                lowList.set(index, low);
-                                closeList.set(index, close);
-                                volumeList.set(index, volume);
-                            }
-                        }
-                    });
-                }
-
-                StockHistoryResponse response = new StockHistoryResponse();
-                response.setS("ok");
-                response.setT(dateList);
-                response.setO(openList);
-                response.setH(highList);
-                response.setL(lowList);
-                response.setC(closeList);
-                response.setV(volumeList);
-
-//                if (resolution.equals("H")) {
-//                    Set<String> desiredTimes = new HashSet<>(Arrays.asList("09:30", "10:30", "11:30", "12:30", "13:30", "14:30"));
-//
-//                    // Filter data based on timestamps
-//                    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-//                    List<Integer> indicesToKeep = new ArrayList<>();
-//                    for (int i = 0; i < dateList.size(); i++) {
-//                        String time = sdf.format(new Date(dateList.get(i) * 1000));
-//                        if (desiredTimes.contains(time)) {
-//                            indicesToKeep.add(i);
-//                        }
-//                    }
-//
-//                    // Filter corresponding data
-//                    List<Long> filteredT = indicesToKeep.stream().map(dateList::get).collect(Collectors.toList());
-//                    List<Double> filteredO = indicesToKeep.stream().map(openList::get).collect(Collectors.toList());
-//                    List<Double> filteredH = indicesToKeep.stream().map(highList::get).collect(Collectors.toList());
-//                    List<Double> filteredL = indicesToKeep.stream().map(lowList::get).collect(Collectors.toList());
-//                    List<Double> filteredC = indicesToKeep.stream().map(closeList::get).collect(Collectors.toList());
-//                    List<Long> filteredV = indicesToKeep.stream().map(volumeList::get).collect(Collectors.toList());
-//                    response.setT(filteredT);
-//                    response.setO(filteredO);
-//                    response.setH(filteredH);
-//                    response.setL(filteredL);
-//                    response.setC(filteredC);
-//                    response.setV(filteredV);
-//                }
-                return ResponseEntity.ok(response);
-            }
-        }
-
-        // 向外部API发起请求，并获取响应
-        StockHistoryRequest request = new StockHistoryRequest();
-        request.setSymbol(symbol);
-        Long to = null;
-        Long from = null;
-        int countback = 5;
-        if(StringUtils.equals("H",resolution)){
-            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (10 * 60 * 60 );
-            countback = 328;
-            request.setResolution("60");
-        }else if(StringUtils.equals("D",resolution)){
-            to  = (long) (System.currentTimeMillis() / 1000);
-            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 = 730;
-            request.setResolution("1W");
-        } else if (StringUtils.equals("M", resolution)) {
-            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (15 * 30 * 24 * 60 * 60);
-            countback = 730;
-            request.setResolution("1D");
-        }
-
-        request.setFrom(from);
-        request.setTo(to);
-        request.setCountback(countback);
-        request.setCurrencyCode("INR");
-        String apiUrl = buildApiUrl(request);
-        log.info("request url:" + apiUrl);
-        StockHistoryResponse response = null;
-        int maxRetries = 3;
-        int retryCount = 0;
-
-        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);
-
-                // Increment the retry count
-                retryCount++;
-                // Add some delay before the next retry (you can adjust this as needed)
-                try {
-                    Thread.sleep(300); // 1 second delay
-                } catch (InterruptedException ex) {
-                    Thread.currentThread().interrupt();
-                }
-            } catch (ClientProtocolException e) {
-                throw new RuntimeException(e);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        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();
-        }
-        // 返回响应
+        return ResponseEntity.ok(moneyApiService.getStockHistory(symbol, interval, amount));
     }
 
     @GetMapping({"/market/api/market/stock/optional", "/api/market/stock/optional"})

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

@@ -167,7 +167,7 @@ public class StockApiController {
 	@ApiOperation(value = "印度新闻列表", httpMethod = "GET")
 	@ResponseBody
 	public ServerResponse getINDNews(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) {
-		return ServerResponse.createBySuccess(newsRepository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.id.desc()));
+		return ServerResponse.createBySuccess(newsRepository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.showTime.desc()));
 	}
 
 	@RequestMapping({"test.do"})

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

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

src/main/java/cn/stock/market/web/service/MoneyApiService.java

@@ -0,0 +1,264 @@
+package cn.stock.market.web.service;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.Stock;
+import cn.stock.market.domain.basic.repository.StockRepository;
+import cn.stock.market.dto.*;
+import cn.stock.market.infrastructure.db.po.QStockPO;
+import cn.stock.market.web.config.Config;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class MoneyApiService {
+    @Autowired
+    private ObjectMapper objectMapper;
+    @Autowired
+    private StockRepository stockRepository;
+
+    public StockHistoryResponse getStockHistory(String symbol, String interval, Integer amount) {
+        Stock stock = stockRepository.findStockByCode(symbol);
+        if (stock != null) {
+            RawStockApiResponse rawData = fetchChartData(symbol, interval, amount);
+            return convertToHistoryResponse(rawData);
+        } else {
+            StockHistoryResponse stockHistoryResponse = new StockHistoryResponse();
+            stockHistoryResponse.setS("fail!");
+            return stockHistoryResponse;
+        }
+    }
+
+    private RawStockApiResponse fetchChartData(String symbol, String interval, Integer amount) {
+        Config config = SpringUtils.getBean(Config.class);
+        String url = config.getStockUrlPrefix() + "/api/ger-market/chart?symbol=" + symbol + "&interval=" + interval;
+        if (amount != null) {
+            url += "&amount=" + amount;
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("accept", "application/json, text/plain, */*");
+        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
+        headers.add("origin", "https://moneytj.com");
+        headers.add("referer", "https://moneytj.com/");
+        headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
+        headers.add("sec-ch-ua-mobile", "?0");
+        headers.add("sec-ch-ua-platform", "\"Windows\"");
+        headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+            ObjectMapper mapper = new ObjectMapper();
+            return mapper.readValue(response.getBody(), RawStockApiResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new RawStockApiResponse();
+        }
+    }
+
+    public StockQuoteData getSingleStockQuote(String symbol) {
+        Config config = SpringUtils.getBean(Config.class);
+        String url = config.getStockUrlPrefix() + "/api/ger-market/stocks/query-list?symbols=" + symbol;
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("accept", "application/json, text/plain, */*");
+        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
+        headers.add("origin", "https://moneytj.com");
+        headers.add("referer", "https://moneytj.com/");
+        headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
+        headers.add("sec-ch-ua-mobile", "?0");
+        headers.add("sec-ch-ua-platform", "\"Windows\"");
+        headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+            ObjectMapper mapper = new ObjectMapper();
+            StockQuoteResponse quoteResponse = mapper.readValue(response.getBody(), StockQuoteResponse.class);
+            if (quoteResponse != null && quoteResponse.getData() != null && !quoteResponse.getData().isEmpty()) {
+                return quoteResponse.getData().get(0);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public List<StockQuoteData> getStocksQuote(List<Stock> stocks) {
+        Config config = SpringUtils.getBean(Config.class);
+        String codes = stocks.stream().map(e->e.getStockCode()).collect(Collectors.joining(","));
+
+        String url = config.getStockUrlPrefix() + "/api/ger-market/stocks/query-list?symbols=" + codes;
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("accept", "application/json, text/plain, */*");
+        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8");
+        headers.add("origin", "https://moneytj.com");
+        headers.add("referer", "https://moneytj.com/");
+        headers.add("sec-ch-ua", "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"");
+        headers.add("sec-ch-ua-mobile", "?0");
+        headers.add("sec-ch-ua-platform", "\"Windows\"");
+        headers.add("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36");
+
+        HttpEntity<String> entity = new HttpEntity<>(headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+            ObjectMapper mapper = new ObjectMapper();
+            StockQuoteResponse quoteResponse = mapper.readValue(response.getBody(), StockQuoteResponse.class);
+            if (quoteResponse != null && quoteResponse.getData() != null && !quoteResponse.getData().isEmpty()) {
+                return quoteResponse.getData();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private StockHistoryResponse convertToHistoryResponse(RawStockApiResponse apiResponse) {
+        StockHistoryResponse response = new StockHistoryResponse();
+        response.setS("ok");
+        response.setT(new ArrayList<>());
+        response.setO(new ArrayList<>());
+        response.setH(new ArrayList<>());
+        response.setL(new ArrayList<>());
+        response.setC(new ArrayList<>());
+        response.setV(new ArrayList<>());
+
+        List<StockDataDto> data = apiResponse.getData();
+        for (int i = data.size() - 1; i >= 0; i--) {
+            StockDataDto item = data.get(i);
+            response.getT().add(item.getTime());
+            response.getO().add(item.getOpen());
+            response.getH().add(item.getMax());
+            response.getL().add(item.getMin());
+            response.getC().add(item.getClose());
+            response.getV().add(item.getVolume());
+        }
+
+        return response;
+    }
+
+    public List<StockQuoteData> getTopGainersFromTradingView() {
+        List<StockQuoteData> result = getTopStocksFromTradingView("desc");
+        // Sort by percent_change in descending order for gainers
+        return result.stream()
+                .sorted((a, b) -> Double.compare(b.getPercent_change(), a.getPercent_change()))
+                .collect(Collectors.toList());
+    }
+
+    public List<StockQuoteData> getTopLosersFromTradingView() {
+        List<StockQuoteData> result = getTopStocksFromTradingView("asc");
+        // Sort by percent_change in ascending order for losers
+        return result.stream()
+                .sorted((a, b) -> Double.compare(a.getPercent_change(), b.getPercent_change()))
+                .collect(Collectors.toList());
+    }
+
+    public List<StockQuoteData> getTopStocksFromTradingView(String sortOrder) {
+        String url = "https://scanner.tradingview.com/germany/scan";
+        
+        // Determine preset based on sort order
+        String preset = "desc".equals(sortOrder) ? "gainers" : "losers";
+        
+        // Prepare request body
+        String requestBody = "{\n" +
+                "    \"columns\": [\n" +
+                "        \"name\",\n" +
+                "        \"description\",\n" +
+                "        \"logoid\",\n" +
+                "        \"update_mode\",\n" +
+                "        \"type\",\n" +
+                "        \"currency\",\n" +
+                "        \"change\",\n" +
+                "        \"volume\",\n" +
+                "        \"exchange\"\n" +
+                "    ],\n" +
+                "    \"filter\": [\n" +
+                "        {\n" +
+                "            \"left\": \"is_primary\",\n" +
+                "            \"operation\": \"equal\",\n" +
+                "            \"right\": true\n" +
+                "        }\n" +
+                "    ],\n" +
+                "    \"options\": {\n" +
+                "        \"lang\": \"en\"\n" +
+                "    },\n" +
+                "    \"preset\": \"" + preset + "\",\n" +
+                "    \"range\": [\n" +
+                "        0,\n" +
+                "        30\n" +
+                "    ],\n" +
+                "    \"sort\": {\n" +
+                "        \"sortBy\": \"change\",\n" +
+                "        \"sortOrder\": \"" + sortOrder + "\"\n" +
+                "    },\n" +
+                "    \"markets\": [\n" +
+                "        \"germany\"\n" +
+                "    ]\n" +
+                "}";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("accept", "application/json");
+        headers.add("accept-language", "en-US,en;q=0.9,vi;q=0.8,ug;q=0.7,fr;q=0.6");
+        headers.add("origin", "https://www.tradingview.com");
+        headers.add("referer", "https://www.tradingview.com/");
+        headers.add("user-agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36");
+        headers.add("Content-Type", "application/json");
+
+        HttpEntity<String> entity = new HttpEntity<>(requestBody, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        try {
+            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+            ObjectMapper mapper = new ObjectMapper();
+            TradingViewResponse tradingViewResponse = mapper.readValue(response.getBody(), TradingViewResponse.class);
+            
+            if (tradingViewResponse != null && tradingViewResponse.getData() != null) {
+                // Extract symbols from TradingView response
+                List<String> symbols = tradingViewResponse.getData().stream()
+                    .filter(item -> item.getS() != null && item.getS().startsWith("XETR:"))
+                    .map(item -> item.getS().substring(5)) // Remove "XETR:" prefix
+                    .limit(30)
+                    .collect(Collectors.toList());
+                
+                if (!symbols.isEmpty()) {
+                    // Find stocks in database
+                    List<Stock> stocks = stockRepository.findAll(QStockPO.stockPO.stockCode.in(symbols));
+                    
+                    if (!stocks.isEmpty()) {
+                        List<StockQuoteData> stockQuoteDatas = getStocksQuote(stocks);
+                        for (StockQuoteData stockQuoteData : stockQuoteDatas) {
+                            Stock name = stocks.stream().filter(e->e.getStockCode().equals(stockQuoteData.getSymbol())).findFirst().orElse(null);
+                            if (name != null) {
+                                stockQuoteData.setName(name.getStockName());
+                            }
+                        }
+                        return stockQuoteDatas;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return new ArrayList<>();
+    }
+}

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

@@ -3,9 +3,9 @@ spring:
     show-sql: true
   # Redis配置
   redis:
-    host: 43.153.142.41
-    password: a5v8b86P4mVzFlUqJV
-    port: 30041
+    host: 43.160.197.177
+    password: redispass123
+    port: 6379
     database: 1
     lettuce:
       pool:
@@ -17,9 +17,9 @@ spring:
   datasource:
     stock-market:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://43.153.142.41:30040/germany_stock?useUnicode=true&characterEncoding=utf-8
+      url: jdbc:mysql://43.160.197.177:3306/germany_stock?useUnicode=true&characterEncoding=utf-8
       username: root
-      password: uNejHIFQGJOUtYTmE
+      password: mysqlpass123
       maxActive: 500
       testWhileIdle: true
       validationQuery: SELECT 1
@@ -28,7 +28,7 @@ spring:
     stock:
       driver-class-name: com.mysql.cj.jdbc.Driver
       #url: jdbc:mysql://129.226.172.67:3306/vip_huananyong_c?useUnicode=true&characterEncoding=utf-8&useSSL=true&verifyServerCertificate=true&requireSSL=true&clientCertificateKeyStoreUrl=classpath:keystoremysql&clientCertificateKeyStorePassword=abs1234567890&trustCertificateKeyStoreUrl=classpath:truststoremysql&trustCertificateKeyStorePassword=abs1234567890
-      url: jdbc:mysql://124.156.133.209:33306/vip_huananyong_c?useUnicode=true&characterEncoding=utf-8&useSSL=true
+      url: jdbc:mysql://43.153.142.41:33306/vip_huananyong_c?useUnicode=true&characterEncoding=utf-8&useSSL=true
       username: root
       password: 33BsUUcnXRYgwt
       maxActive: 500
@@ -42,6 +42,8 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+
+stockUrlPrefix: https://apinode-dgdev.moneytj.com
 # 具体看类:CloudStorageConfig
 oss:
   type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云