Edit .gitlab-ci.yml

stock top list

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

.gitlab-ci.yml

@@ -15,6 +15,8 @@ build:
   only:
     - main
     - develop
+    - develop_red
+    - us-gold
   before_script:
     - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -52,6 +54,8 @@ dockerize:
   only:
     - main
     - develop
+    - develop_red
+    - us-gold
   script:
     - echo ">>>>>>Start Building Docker Image<<<<<<"
     - pwd
@@ -72,17 +76,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."
 
 

pom.xml

@@ -82,7 +82,10 @@
 			<artifactId>redisson-spring-boot-starter</artifactId>
 			<version>3.13.3</version>
 		</dependency>-->
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper</artifactId>

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

@@ -1,11 +1,30 @@
 package cn.stock.market.domain.basic.service;
 
-import java.util.List;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
+import cn.qutaojing.common.jpa.ConditionBuilder;
+import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.redis.core.RedisTemplate;
+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 com.github.pagehelper.PageHelper;
@@ -25,7 +44,8 @@ import cn.stock.market.utils.StringUtils;
 import cn.stock.market.utils.Utils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONObject;
+import org.springframework.web.client.RestTemplate;
+
 
 /**
  * SiteNewsService
@@ -40,6 +60,8 @@ import net.sf.json.JSONObject;
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class SiteNewsService {
 	final SiteNewsRepository repository;
+    private final RedisTemplate<String, String> redisTemplate;
+    private final RestTemplate restTemplate;
 	final SiteNewsFactory factory;
 	
 	 /*新闻资讯-查询列表*/
@@ -54,6 +76,92 @@ public class SiteNewsService {
         return ServerResponse.createBySuccess(Utils.toPageHelperInfo(page));
     }
 
+    public ServerResponse getLatestStockNews(int pageNum) {
+        int pageSize = 20;
+        String redisKey = "fmp:stock:latest:news:page:" + pageNum;
+
+        try {
+            // Step 1: get from cache
+            String cached = redisTemplate.opsForValue().get(redisKey);
+            List<SiteNews> list;
+            if (cached!= null && !cached.isEmpty()) {
+                list = JSON.parseArray(cached, SiteNews.class);
+            } else {
+                // Step 2: call FMP API
+                String url = String.format("https://financialmodelingprep.com/stable/news/stock-latest?page=%d&limit=%d&apikey=57ZI1xeAsqHY7ag0FBuMkwQzt6TQ60dG", pageNum, pageSize);
+                HttpHeaders headers = new HttpHeaders();
+                headers.add("accept", "application/json");
+                HttpEntity<String> entity = new HttpEntity<>(headers);
+                ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+
+                if (response.getStatusCode().value() != 200 || response.getBody() == null) {
+                    return ServerResponse.createByErrorMsg("Failed to fetch news");
+                }
+
+                JSONArray newsArray = JSON.parseArray(response.getBody());
+                list = new ArrayList<>();
+                for (int i = 0; i < newsArray.size(); i++) {
+                    JSONObject obj = newsArray.getJSONObject(i);
+                    String sourceId = obj.getString("url");
+
+                    SiteNews news = new SiteNews();
+                    news.setSourceId(sourceId);
+                    news.setTitle(obj.getString("title"));
+                    news.setSourceName(obj.getString("publisher"));
+                    news.setDescription(obj.getString("text"));
+                    news.setContent(obj.getString("text"));
+                    news.setImgurl(obj.getString("image"));
+                    news.setStatus(1);
+                    news.setType(1);
+                    news.setViews(0);
+                    news.setAddTime(new Date());
+
+                    try {
+                        ZonedDateTime ny = ZonedDateTime.of(
+                                LocalDateTime.parse(obj.getString("publishedDate"), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
+                                ZoneId.of("America/New_York")
+                        );
+                        news.setShowTime(Date.from(ny.withZoneSameInstant(ZoneId.systemDefault()).toInstant()));
+                    } catch (Exception e) {
+                        news.setShowTime(new Date());
+                    }
+
+                    list.add(news);
+                }
+
+                redisTemplate.opsForValue().set(redisKey, JSON.toJSONString(list), Duration.ofMinutes(10));
+            }
+            int simulatedTotal = 100;
+
+            Page<SiteNews> page = buildPage(list, pageNum, pageSize, simulatedTotal);
+            return ServerResponse.createBySuccess(page);
+
+        } catch (Exception e) {
+            log.error("Error getting latest stock news page {}", pageNum, e);
+            try{
+                Page<SiteNews> page = repository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.showTime.desc());
+
+                return ServerResponse.createBySuccess(page);
+            }catch (Exception e1) {
+                return ServerResponse.createByErrorMsg("Internal error");
+            }
+        }
+    }
+
+    private Page<SiteNews> buildPage(List<SiteNews> allNews, int pageNum, int pageSize, int totalCount) {
+        int offset = pageNum * pageSize;
+
+        // Defensive bounds check
+        int toIndex = Math.min(offset + pageSize, allNews.size());
+
+        List<SiteNews> pagedList = offset >= allNews.size() ? allNews : allNews.subList(offset, toIndex);
+
+        Pageable pageable = PageRequest.of(pageNum, pageSize);
+
+        // You can pass total = 100 to simulate full dataset
+        return new PageImpl<>(pagedList, pageable, totalCount);
+    }
+
     /*新闻资讯-查询详情*/
 	public ServerResponse getDetail(int id) {
         return ServerResponse.createBySuccess(repository.find(id));
@@ -76,89 +184,8 @@ public class SiteNewsService {
         return ServerResponse.createBySuccess(pageInfo);
     }
     
-	/*新闻资讯-抓取*/
-    public int grabNews() {
-        int ret = 0;
-        //新闻类型：1、财经要闻，2、经济数据，3、全球股市，4、7*24全球，5、商品资讯，6、上市公司，7、全球央行
-        ret = addNews(1, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetImportantNewsList");
-        log.info("财经要闻-抓取条数：" + ret);
 
-        ret = addNews(2, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=125&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("经济数据-抓取条数：" + ret);
 
-        ret = addNews(3, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=105&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("全球股市-抓取条数：" + ret);
-
-        ret = addNews(4, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=100&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("7*24全球-抓取条数：" + ret);
-
-        ret = addNews(5, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=106&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("商品资讯-抓取条数：" + ret);
-
-        ret = addNews(6, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=103&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("上市公司-抓取条数：" + ret);
-
-        ret = addNews(7, PropertiesUtil.getProperty("news.main.url") + "/pc_news/FastNews/GetInfoList?code=118&pageNumber=1&pagesize=20&condition=&r=");
-        log.info("全球央行-抓取条数：" + ret);
-
-        return ret;
-    }
-
-    /*
-    *抓取新闻专用
-    * type：新闻类型：1、财经要闻，2、经济数据，3、全球股市，4、7*24全球，5、商品资讯，6、上市公司，7、全球央行
-    * */
-    private int addNews(Integer type, String url){
-        int k = 0;
-        try {
-            String newlist = HttpRequest.doGrabGet(url);
-            JSONObject json = JSONObject.fromObject(newlist);
-            if(json != null && json.getJSONArray("items") != null && json.getJSONArray("items").size() > 0){
-                for (int i = 0; i < json.getJSONArray("items").size(); i++){
-                    JSONObject model = JSONObject.fromObject(json.getJSONArray("items").getString(i));
-                    String newsId = model.getString("code");
-                    String imgUrl = null;
-                    if(model.has("imgUrl")){
-                        imgUrl = model.getString("imgUrl");
-                    }
-                    //新闻不存在则添加
-                    if(repository.getNewsBySourceIdCount(newsId) == 0){
-                        //获取新闻详情
-                        String newdata = HttpRequest.doGrabGet(PropertiesUtil.getProperty("news.main.url") + "/PC_News/Detail/GetDetailContent?id="+ newsId +"&type=1");
-                        newdata = newdata.substring(1,newdata.length()-1).replace("\\\\\\\"","\"");
-                        newdata = newdata.replace("\\\"","\"");
-                        newdata = StringUtils.UnicodeToCN(newdata);
-                        newdata = StringUtils.delHTMLTag(newdata);
-
-                        JSONObject jsonnew = JSONObject.fromObject(newdata);
-                        if(jsonnew != null && jsonnew.get("data") != null){
-                            JSONObject news = JSONObject.fromObject(jsonnew.get("data"));
-                            SiteNews siteNews = new SiteNews();
-                            siteNews.setSourceId(newsId);
-                            siteNews.setSourceName(news.getString("source"));
-                            siteNews.setTitle(news.getString("title"));
-                            String showTime = news.getString("showTime");
-                            siteNews.setShowTime(DateTimeUtil.strToDate(showTime));
-                            siteNews.setImgurl(imgUrl);
-                            siteNews.setDescription(news.getString("description"));
-                            siteNews.setContent(news.getString("content"));
-                            siteNews.setStatus(1);
-                            siteNews.setType(type);
-                            try {
-                            	repository.saveAndFlush(siteNews);
-                            } catch(Exception e) {
-                            	log.warn("siteNewsMapper insert error: {}", e.getLocalizedMessage());
-                            }
-                            k++;
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return k;
-    }
 	
 	public SiteNewsRepository repository() {
 		return repository;

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=^DJI:NASDAQ,^GSPC:NASDAQ,^IXIC:NASDAQ,^NDX:NASDAQ,^RUI:NASDAQ";
+    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,9 @@ public class HomeApiIndex {
 
             index.setId(obj.optString("id"));
             index.setSymbol(obj.optString("symbol"));
+
             index.setName(obj.optString("name"));
+
             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,46 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+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.ZonedDateTime;
+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 +188,185 @@ public class InvestingTask {
 
         return null;
     }
+
+    /*德国新闻接口*/
+    @Scheduled(cron = "0 0 0/3 * * ?")
+//    @PostConstruct
+    public void saveGerNews() {
+        log.info("FMP 股票新闻数据同步开始");
+        int savedCount = 0;
+        int totalCount = 0;
+
+        try {
+            String newsListUrl = "https://financialmodelingprep.com/stable/news/stock-latest?page=0&limit=30&apikey=57ZI1xeAsqHY7ag0FBuMkwQzt6TQ60dG";
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("accept", "application/json");
+
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+            ResponseEntity<String> response = restTemplate.exchange(
+                    newsListUrl,
+                    HttpMethod.GET,
+                    entity,
+                    String.class
+            );
+
+            if (response.getStatusCode().value() == 200 && response.getBody() != null) {
+                JSONArray newsArray = JSON.parseArray(response.getBody());
+                totalCount = newsArray.size();
+                log.info("Found {} news items to process", totalCount);
+
+                for (int i = 0; i < newsArray.size(); i++) {
+                    try {
+                        JSONObject newsItem = newsArray.getJSONObject(i);
+                        String sourceId = newsItem.getString("url");
+
+                        // Check existence
+                        List<SiteNews> existingNews = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(sourceId));
+                        if (!existingNews.isEmpty()) {
+                            log.debug("News {} already exists, skipping", sourceId);
+                            continue;
+                        }
+
+                        // Create and populate SiteNews entity
+                        SiteNews siteNews = new SiteNews();
+                        siteNews.setAddTime(new Date());
+                        siteNews.setSourceId(sourceId);
+                        siteNews.setTitle(newsItem.getString("title"));
+                        siteNews.setSourceName(newsItem.getString("publisher"));
+                        siteNews.setDescription(newsItem.getString("symbol"));
+                        siteNews.setImgurl(newsItem.getString("image"));
+                        siteNews.setContent(newsItem.getString("text"));
+                        siteNews.setStatus(1);
+                        siteNews.setType(1);
+                        siteNews.setViews(0);
+
+                        // Parse publishedDate
+                        String publishedDate = newsItem.getString("publishedDate");
+                        try {
+                            ZonedDateTime nyTime = ZonedDateTime.of(
+                                    LocalDateTime.parse(publishedDate, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
+                                    ZoneId.of("America/New_York")
+                            );
+
+                            ZonedDateTime localTime = nyTime.withZoneSameInstant(ZoneId.systemDefault());
+                            siteNews.setShowTime(Date.from(localTime.toInstant()));
+                        } catch (Exception e) {
+                            log.warn("Failed to parse publishedDate with timezone for {}: {}", sourceId, publishedDate);
+                            siteNews.setShowTime(new Date());
+                        }
+
+                        // Save news
+                        newsRepository.save(siteNews);
+                        savedCount++;
+                        log.info("Saved news [{}/{}]: {}", savedCount, totalCount, siteNews.getTitle());
+
+                    } catch (Exception e) {
+                        log.warn("Error processing news item {}: {}", i, e.getMessage());
+                    }
+                }
+
+            } else {
+                log.error("Failed to fetch news: HTTP {}", response.getStatusCode());
+            }
+
+            log.info("FMP 股票新闻数据同步完成，总数 {}，已保存 {}", totalCount, savedCount);
+        } catch (Exception e) {
+            log.error("FMP 新闻同步异常: {}", 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/JobBoot.java

@@ -57,11 +57,11 @@ public class JobBoot {
     /*
      * 新闻资讯抓取
      * */
-     @Scheduled(cron = "0 0/30 9-20 * * ?")
-     public void newsInfoTask() {
-    	 MdcUtil.setTraceIdIfAbsent();
-    	 Stopwatch stopwatch = Stopwatch.createStarted();
-         int count = SiteNewsService.of().grabNews();
-         log.info("newsInfoTask执行, 受影响数{}, 耗时:{}毫秒", count, stopwatch.elapsed(TimeUnit.MILLISECONDS));
-     }
+//     @Scheduled(cron = "0 0/30 9-20 * * ?")
+//     public void newsInfoTask() {
+//    	 MdcUtil.setTraceIdIfAbsent();
+//    	 Stopwatch stopwatch = Stopwatch.createStarted();
+//         int count = SiteNewsService.of().grabNews();
+//         log.info("newsInfoTask执行, 受影响数{}, 耗时:{}毫秒", count, stopwatch.elapsed(TimeUnit.MILLISECONDS));
+//     }
 }

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/infrastructure/redis/config/RedisConfig.java

@@ -1,70 +1,53 @@
-//package cn.stock.market.infrastructure.redis.config;
-//
-//import java.time.Duration;
-//
-//import org.redisson.api.RedissonClient;
-//import org.springframework.cache.CacheManager;
-//import org.springframework.cache.annotation.EnableCaching;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.cache.RedisCacheConfiguration;
-//import org.springframework.data.redis.cache.RedisCacheManager;
-//import org.springframework.data.redis.connection.RedisConnectionFactory;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-//import org.springframework.data.redis.serializer.RedisSerializationContext;
-//import org.springframework.data.redis.serializer.StringRedisSerializer;
-//
-//import cn.qutaojing.common.aop.distributedlock.DistributedLockTemplate;
-//import cn.stock.market.infrastructure.redis.SingleDistributedLockTemplate;
-//
-///**
-// * 
-// * @author xlfd
-// * @email xlfd@gmail.com
-// * @version 1.0  
-// * @created Jun 3, 2021 4:56:28 PM
-// */
-//@Configuration
-//@EnableCaching
-//public class RedisConfig {
-//
-//	@Bean
-//	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-//		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-//		redisTemplate.setConnectionFactory(redisConnectionFactory);
-//		redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-//		redisTemplate.setKeySerializer(new StringRedisSerializer());
-//		
-//		redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-//		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-//		
-//		return redisTemplate;
-//	}
-//
-//	@Bean
-//	public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
-//		// 配置序列化
-//		RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
-//		config.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()));
-//		config.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new Jackson2JsonRedisSerializer<>(Object.class)));
-//
-//		// 设置缓存的默认过期时间 ,30分钟
-//		config.entryTtl(Duration.ofMinutes(30));
-//		// 不缓存空值
-//		config.disableCachingNullValues();
-//		RedisCacheManager cacheManager = RedisCacheManager.builder(redisConnectionFactory).cacheDefaults(config)
-//				.build();
-//		return cacheManager;
-//	}
-//	
-//	/**
-//	 * 分布式锁实现 
-//	 * @param redissonClient
-//	 * @return
-//	 */
-//	@Bean
-//	public DistributedLockTemplate distributedLockTemplate(RedissonClient redissonClient) {
-//	    return new SingleDistributedLockTemplate(redissonClient);
-//	}
-//}
+package cn.stock.market.infrastructure.redis.config;
+
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisPassword;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+@EnableConfigurationProperties(RedisProperties.class)
+public class RedisConfig {
+
+    private RedisProperties redisProperties;
+
+    public RedisConfig(RedisProperties redisProperties) {
+        this.redisProperties = redisProperties;
+    }
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
+        config.setHostName(redisProperties.getHost());
+        config.setPort(redisProperties.getPort());
+        config.setDatabase(redisProperties.getDatabase());
+
+        if (redisProperties.getPassword() != null) {
+            config.setPassword(RedisPassword.of(redisProperties.getPassword()));
+        }
+
+        return new LettuceConnectionFactory(config);
+    }
+
+    @Bean
+    public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, String> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+
+        StringRedisSerializer serializer = new StringRedisSerializer();
+        template.setKeySerializer(serializer);
+        template.setValueSerializer(serializer);
+        template.setHashKeySerializer(serializer);
+        template.setHashValueSerializer(serializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -12,6 +13,7 @@ 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;
@@ -212,6 +214,7 @@ public class MoneyApiController {
             return ServerResponse.createByErrorMsg("Stock is not exist!");
         }
         StockQuoteData data = moneyApiService.getSingleStockQuote(symbol);
+        data.setName(stock.getStockName());
         return ServerResponse.createBySuccess(data);
     }
 
@@ -537,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 = "" +
@@ -547,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 = "" +
@@ -592,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;
     }
 
@@ -643,43 +615,35 @@ 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",
+                "ITX:BME", "AIR:BME", "SAN:BME", "IBE:BME", "BBVA:BME", "XPBR:BME", "XPBRA:BME", "CABK:BME", "XAMXB:BME", "CCEP:BME",
+                "XVALO:BME", "AENA:BME", "FER:BME", "AMS:BME", "ELE:BME", "TEF:BME", "NTGY:BME", "XBBDC:BME", "CLNX:BME", "XNOR:BME"
+        );
+        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"));
+            } else if (type.equals("es")) {
+                builder.and(q.stockType.in("BME"));
             }
         }
-
-        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) {

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

@@ -39,7 +39,7 @@ public class SiteNewsController {
                                       @RequestParam(value = "type", defaultValue = "0") Integer type,
                                       @RequestParam(value = "sort", defaultValue = "time1") String sort,
                                       @RequestParam(value = "keyword", required = false) String keyword, HttpServletRequest request) {
-        return this.iSiteNewsService.getList(pageNum, pageSize, type, sort, keyword, request);
+        return this.iSiteNewsService.getLatestStockNews(pageNum);
     }
 
     //新闻资讯-详情

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

@@ -13,6 +13,7 @@ import cn.qutaojing.common.PageParam;
 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.domain.basic.service.SiteNewsService;
 import cn.stock.market.infrastructure.db.po.QSiteNewsPO;
 import cn.stock.market.infrastructure.job.InvestingTask;
 import cn.stock.market.web.annotations.EncryptFilter;
@@ -72,6 +73,8 @@ public class StockApiController {
 	StockService stockService;
 	@Autowired
 	SiteNewsRepository newsRepository;
+	@Autowired
+	SiteNewsService siteNewsService;
 
 	@RequestMapping({"getRawSinaStock.do"})
 	@ResponseBody
@@ -167,7 +170,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 siteNewsService.getLatestStockNews(pageNum);
 	}
 
 	@RequestMapping({"test.do"})

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

@@ -4,7 +4,9 @@ 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.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -14,7 +16,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class MoneyApiService {
@@ -96,6 +99,39 @@ public class MoneyApiService {
         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");
@@ -106,7 +142,9 @@ public class MoneyApiService {
         response.setC(new ArrayList<>());
         response.setV(new ArrayList<>());
 
-        for (StockDataDto item : apiResponse.getData()) {
+        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());
@@ -117,4 +155,111 @@ public class MoneyApiService {
 
         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
+    host: 43.165.126.173
     password: a5v8b86P4mVzFlUqJV
-    port: 30041
+    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://use-cdb-45wol5su.sql.tencentcdb.com:22490/stock-api?useUnicode=true&characterEncoding=utf-8
       username: root
-      password: uNejHIFQGJOUtYTmE
+      password: 6QJXv8dA76klnqsWh6f
       maxActive: 500
       testWhileIdle: true
       validationQuery: SELECT 1