update orders index

Merge branch 'develop_red' of gitlab.main99.com:germany/ger-market-java into develop_red
update index
2025-08-11 18:44:47 +07:00 · 2025-08-11 18:36:23 +07:00 · 2025-08-11 18:32:16 +07:00 · 2025-08-11 07:29:26 +08:00 · 2025-08-11 00:36:45 +07:00 · 2025-08-05 15:51:59 +07:00
39 changed files with 1846 additions and 846 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,12 +4,18 @@ stages:
  - dockerize
  - deploy

+variables:  
+  company_name: juyoutech
+  project_name: germany_stock
+  service_name: market
+
 build:
  image: maven:3.6.3-openjdk-8
  stage: 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"
@@ -47,33 +53,36 @@ dockerize:
  only:
    - main
    - develop
+    - develop_red
  script:
-    - echo ">>>>>>Start Building Image<<<<<<"
-    - ls
-    - ls target
-    - echo $DOCKER_PASSWORD
-    - echo $CI_PIPELINE_ID
-    - docker build -t juyoutech/india_stock_market:latest .
-    - docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_PIPELINE_ID
-    - docker tag juyoutech/india_stock_market:latest juyoutech/india_stock_market:$CI_COMMIT_BRANCH
-    - docker login -u juyoutech -p dckr_pat_8rg23IBA2kZMOCX4IJKApb8m5l8
-    - docker push juyoutech/india_stock_market:latest
-    - docker push juyoutech/india_stock_market:$CI_PIPELINE_ID
-    - docker push juyoutech/india_stock_market:$CI_COMMIT_BRANCH
+    - echo ">>>>>>Start Building Docker Image<<<<<<"
+    - pwd
+    - ls -lah
+    - echo $DOCKER_PASSWORD | docker login -u ${company_name} --password-stdin
+    - docker build -t ${company_name}/${project_name}_${service_name} .
+
+    - docker push ${company_name}/${project_name}_${service_name}
+
+    - docker tag ${company_name}/${project_name}_${service_name} ${company_name}/${project_name}_${service_name}:$CI_PIPELINE_ID
+    - docker push ${company_name}/${project_name}_${service_name}:$CI_PIPELINE_ID
+
+    - docker tag ${company_name}/${project_name}_${service_name} ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
+    - docker push ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
+
+    - echo ${company_name}/${project_name}_${service_name}:$CI_COMMIT_BRANCH
+
 deploy-dev:
  stage: deploy
  only:
-    - develop
+    - develop_red
  script:
    - echo "Deploying application..."
    - ls
-    - apt-get update
-    - apt-get install -y curl
+    - apk update
+    - apk add curl
+    - apk add curl openssh sshpass
    - |
-      curl -X POST \
-           -H "Content-Type: application/json" \
-           -d '{"namespace":"yddev", "deployment_name":"india-stock-market"}' \
-           https://updater-yddev.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."


--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,12 @@
 			<version>4.1.0</version>
 		</dependency>

+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20240303</version>
+		</dependency>
+
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QMoneyStockPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QMoneyStockPO.java
@@ -29,6 +29,10 @@ public class QMoneyStockPO extends EntityPathBase<MoneyStockPO> {

    public final StringPath moneyScId = createString("moneyScId");

+    public final StringPath nseIndiaChartId = createString("nseIndiaChartId");
+
+    public final StringPath nseIndiaId = createString("nseIndiaId");
+
    public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);

    public final StringPath selfDispId = createString("selfDispId");
@@ -39,6 +43,8 @@ public class QMoneyStockPO extends EntityPathBase<MoneyStockPO> {

    public final StringPath stockType = createString("stockType");

+    public final BooleanPath useFromBseindia = createBoolean("useFromBseindia");
+
    public QMoneyStockPO(String variable) {
        super(MoneyStockPO.class, forVariable(variable));
    }
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QStockIpoPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QStockIpoPO.java
@@ -23,6 +23,8 @@ public class QStockIpoPO extends EntityPathBase<StockIpoPO> {

    public final DateTimePath<java.util.Date> createDate = createDateTime("createDate", java.util.Date.class);

+    public final StringPath exchangeType = createString("exchangeType");
+
    public final NumberPath<Integer> id = createNumber("id", Integer.class);

    public final NumberPath<Integer> isList = createNumber("isList", Integer.class);
@@ -38,7 +40,6 @@ public class QStockIpoPO extends EntityPathBase<StockIpoPO> {
    public final StringPath stockCode = createString("stockCode");

    public final StringPath stockName = createString("stockName");
-    public final StringPath exchangeType = createString("exchangeType");

    public final NumberPath<java.math.BigDecimal> stockPrice = createNumber("stockPrice", java.math.BigDecimal.class);

--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QStockTempPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QStockTempPO.java
@@ -0,0 +1,43 @@
+package cn.stock.market.infrastructure.db.po;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QStockTempPO is a Querydsl query type for StockTempPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QStockTempPO extends EntityPathBase<StockTempPO> {
+
+    private static final long serialVersionUID = 1973569078L;
+
+    public static final QStockTempPO stockTempPO = new QStockTempPO("stockTempPO");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath stockGid = createString("stockGid");
+
+    public final StringPath stockLogo = createString("stockLogo");
+
+    public final StringPath stockType = createString("stockType");
+
+    public QStockTempPO(String variable) {
+        super(StockTempPO.class, forVariable(variable));
+    }
+
+    public QStockTempPO(Path<? extends StockTempPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QStockTempPO(PathMetadata metadata) {
+        super(StockTempPO.class, metadata);
+    }
+
+}
+
--- a/src/main/java/cn/stock/market/StockMarketLaunch.java
+++ b/src/main/java/cn/stock/market/StockMarketLaunch.java
@@ -20,6 +20,12 @@ import cn.stock.market.domain.basic.entity.SiteSetting;
 import cn.stock.market.domain.basic.repository.SiteSettingRepository;
 import lombok.extern.slf4j.Slf4j;

+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.TimeZone;
+
@SpringBootApplication(exclude = { 
 		MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
 		RedisAutoConfiguration.class,
@@ -31,6 +37,11 @@ public class StockMarketLaunch implements CommandLineRunner {

 	public static void main(String[] args) {
 		HttpGlobalConfig.setTimeout(45000);
+		TimeZone.setDefault(TimeZone.getTimeZone("Europe/Madrid"));
+		log.info("JVM ZoneId: {}", ZoneId.systemDefault());
+		log.info("Sample: now={}, madrid={}",
+				new Date(),
+				ZonedDateTime.now(ZoneId.of("Europe/Madrid")));
 		SpringApplication.run(StockMarketLaunch.class, args);
 	}
 	
--- a/src/main/java/cn/stock/market/domain/basic/convert/StockTempConvert.java
+++ b/src/main/java/cn/stock/market/domain/basic/convert/StockTempConvert.java
@@ -0,0 +1,25 @@
+package cn.stock.market.domain.basic.convert;
+
+import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.Stock;
+import cn.stock.market.domain.basic.entity.StockTemp;
+import cn.stock.market.infrastructure.db.po.StockPO;
+import cn.stock.market.infrastructure.db.po.StockTempPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * StockConvert 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2023/06/17 
+ */
+@Component
+@Lazy
+public class StockTempConvert extends SimpleEntityPOConvert<StockTemp, StockTempPO> {
+  public static StockTempConvert of() {
+    return SpringUtils.getBean(StockTempConvert.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/entity/StockTemp.java
+++ b/src/main/java/cn/stock/market/domain/basic/entity/StockTemp.java
@@ -0,0 +1,26 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.stock.market.dto.command.StockCreateCommand;
+import cn.stock.market.infrastructure.db.po.StockPO;
+import cn.stock.market.infrastructure.db.po.StockTempPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * Stock 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2023/06/17 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class StockTemp extends StockTempPO {
+}
--- a/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/StockRepository.java
@@ -54,6 +54,11 @@ public class StockRepository extends LocalCacheRepository<Stock, StockPO, Intege
 		
 		return map;
 	}
+
+	public Map<String, Stock> cacheGidMap() {
+		Map<String, Stock> map = cacheList().stream().collect(Collectors.toMap(Stock::getStockGid, val -> val, (u, v) -> u));
+		return map;
+	}
 	
 	public Map<String, Stock> cacheNameMap() {
 		Map<String, Stock> map = cacheList()
--- a/src/main/java/cn/stock/market/domain/basic/repository/StockTempRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/StockTempRepository.java
@@ -0,0 +1,63 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.LocalCacheBean;
+import cn.qutaojing.common.domain.respostory.LocalCacheRepository;
+import cn.qutaojing.common.jpa.ConditionBuilder;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.convert.StockConvert;
+import cn.stock.market.domain.basic.convert.StockTempConvert;
+import cn.stock.market.domain.basic.entity.Stock;
+import cn.stock.market.domain.basic.entity.StockTemp;
+import cn.stock.market.infrastructure.db.po.QStockPO;
+import cn.stock.market.infrastructure.db.po.QStockTempPO;
+import cn.stock.market.infrastructure.db.po.StockPO;
+import cn.stock.market.infrastructure.db.po.StockTempPO;
+import cn.stock.market.infrastructure.db.repo.StockRepo;
+import cn.stock.market.infrastructure.db.repo.StockTempRepo;
+import com.google.common.cache.CacheBuilder;
+import com.rp.spring.jpa.GenericJpaRepository;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * StockRepository
+ *
+ * @author rplees
+ * @email rplees.i.ly@gmail.com
+ * @created 2023/06/17
+ */
+@Repository
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class StockTempRepository extends LocalCacheRepository<StockTemp, StockTempPO, Integer> {
+	final StockTempRepo repo;
+	final StockTempConvert convert;
+	final static QStockTempPO q = QStockTempPO.stockTempPO;
+
+	public List<StockTemp> findAllForCheck() {
+		return findAll();
+	}
+
+	@Override
+	public GenericJpaRepository<StockTempPO, Integer> repo() {
+		return repo;
+	}
+
+	@Override
+	public IEntityPOConvert<StockTemp, StockTempPO> convert() {
+		return convert;
+	}
+
+	public static StockTempRepository of() {
+		return SpringUtils.getBean(StockTempRepository.class);
+	}
+}
--- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java
@@ -13,11 +13,9 @@ import cn.hutool.core.text.StrFormatter;
 import cn.stock.market.dto.model.*;
 import cn.stock.market.infrastructure.api.EttechchartsApis;
 import cn.stock.market.infrastructure.api.GrowwInApis;
+import cn.stock.market.infrastructure.api.HomeApiIndex;
 import cn.stock.market.infrastructure.api.TodayApis;
-import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
-import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
-import cn.stock.market.infrastructure.api.investing.InvestingApis;
-import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis;
+import cn.stock.market.infrastructure.api.investing.*;
 import cn.stock.market.infrastructure.api.sina.vo.HotSearchVO;
 import cn.stock.market.utils.*;
 import com.ag.utils.CollectionUtils;
@@ -255,47 +253,106 @@ public class StockService {
 //					.header("Accept-Language", "en-US,en;q=0.9")
 //					.get();
 			String url = "https://www.business-standard.com/markets/news";
-			Document doc = Jsoup.connect(url)
-					.referrer("https://www.business-standard.com/")
-					.header("Accept-Language", "en-US,en;q=0.9")
-					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
-					.timeout(5000) // timeout 5 seconds
-					.get();
-		//	result = doc.html().substring(doc.html().indexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">"),doc.html().lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">")+500);
-			Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
-			StringBuilder sb = new StringBuilder();
-			for (Element divElement : divElements) {
-				sb.append(divElement.outerHtml()).append("\n");
-			}
-			result = sb.toString();
+//			Document doc = Jsoup.connect(url)
+//					.userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36")
+//					.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+//					.header("Accept-Language", "en-US,en;q=0.5")
+//					.header("Connection", "keep-alive")
+//					.referrer("https://www.google.com")
+//					.ignoreHttpErrors(true)
+//					.timeout(10000)
+//					.get();
+			String doGetNews = HttpClientRequest.doGetNews(url);
+//			result = doc.html().substring(doc.html().indexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">"),doc.html().lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">")+500);
+//			Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
+//			StringBuilder sb = new StringBuilder();
+//			for (Element divElement : divElements) {
+//				sb.append(divElement.outerHtml()).append("\n");
+//			}
+//			result = sb.toString();
+			result = extractNewsFromHtml(doGetNews);
 		} catch (Exception e) {
 			return e.toString();
 		}
 		return result;
 	}

+	private String extractNewsFromHtml(String rawHtml) {
+		Document doc = Jsoup.parse(rawHtml);
+
+		// Optional: extract raw block around <div class="listingstyle_shortvideoimg__0TWuX shortvideoimg">
+		int start = rawHtml.indexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">");
+		int end = rawHtml.lastIndexOf("<div class=\"listingstyle_shortvideoimg__0TWuX shortvideoimg\">") + 500;
+		String result = (start != -1 && end > start) ? rawHtml.substring(start, end) : "";
+
+		// Extract article list using CSS selector
+		Elements divElements = doc.select("div.listingstyle_cardlistlist__dfq57");
+		StringBuilder sb = new StringBuilder();
+		for (Element divElement : divElements) {
+			sb.append(divElement.outerHtml()).append("\n");
+		}
+
+		// If you only want the div content:
+		result = sb.toString();
+		return result;
+	}
+
 	public List<String> getNewsInfo(String url) {
+//		String result = "";
+//		List<String> list = new ArrayList<>();
+//		try {
+//			// 使用Jsoup连接到网页
+////			Document doc = Jsoup.connect(url)
+////					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
+////					.header("Referer", "https://www.business-standard.com/")
+////					.header("Accept-Language", "en-US,en;q=0.9")
+////					.get();
+//			Document doc = Jsoup.connect(url)
+//					.referrer("https://www.business-standard.com/")
+//					.header("Accept-Language", "en-US,en;q=0.9")
+//					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
+//					.timeout(5000) // timeout 5 seconds
+//					.get();
+//			result = doc.html().substring(doc.html().indexOf("articleBody") + 14, doc.html().indexOf(",\"author\":") - 1);
+//			list.add(result);
+//			list.add(doc.html().substring(doc.html().indexOf("og:title") + 19, doc.html().indexOf("<meta property=\"og:url") - 5));
+//		} catch (Exception e) {
+//			list.add(e.toString());
+//			return list;
+//		}
+//		return list;
 		String result = "";
 		List<String> list = new ArrayList<>();
 		try {
-			// 使用Jsoup连接到网页
-//			Document doc = Jsoup.connect(url)
-//					.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36")
-//					.header("Referer", "https://www.business-standard.com/")
-//					.header("Accept-Language", "en-US,en;q=0.9")
-//					.get();
-			Document doc = Jsoup.connect(url)
-					.referrer("https://www.business-standard.com/")
-					.header("Accept-Language", "en-US,en;q=0.9")
-					.userAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1")
-					.timeout(5000) // timeout 5 seconds
-					.get();
-			result = doc.html().substring(doc.html().indexOf("articleBody") + 14, doc.html().indexOf(",\"author\":") - 1);
+			// Step 1: Get raw HTML via HttpClient
+			String rawHtml = HttpClientRequest.doGetNews(url);
+
+			// Step 2: Parse HTML with Jsoup
+			Document doc = Jsoup.parse(rawHtml);
+
+			// Step 3: Extract content manually (like original)
+			int startIdx = rawHtml.indexOf("articleBody") + 14;
+			int endIdx = rawHtml.indexOf(",\"author\":") - 1;
+
+			if (startIdx > 0 && endIdx > startIdx) {
+				result = rawHtml.substring(startIdx, endIdx);
+			} else {
+				result = "[articleBody not found]";
+			}
 			list.add(result);
-			list.add(doc.html().substring(doc.html().indexOf("og:title") + 19, doc.html().indexOf("<meta property=\"og:url") - 5));
+
+			// Step 4: Extract og:title
+			int titleStart = rawHtml.indexOf("og:title") + 19;
+			int titleEnd = rawHtml.indexOf("<meta property=\"og:url") - 5;
+
+			if (titleStart > 0 && titleEnd > titleStart) {
+				list.add(rawHtml.substring(titleStart, titleEnd));
+			} else {
+				list.add("[title not found]");
+			}
+
 		} catch (Exception e) {
-			list.add(e.toString());
-			return list;
+			list.add("[Error] " + e.getMessage());
 		}
 		return list;
 	}
@@ -989,70 +1046,48 @@ public class StockService {
 		return ServerResponse.createBySuccess(indexVoList);
 	}

-	public ServerResponse getIndexByBtoday(){
-		List<IndiaIndexVo> indexVoList = new ArrayList<>();
-		try {
-			String exchange = "bse";
-			IndiaIndexVo vo1 = new IndiaIndexVo();
-			String coCode = "20558";
-			JSONObject object = TodayApis.getStockDetail("in%3BSEN", coCode);
-			IndiaStockVO market = objToVo(object);
-			market.setName("BSESENSEX指数");
+	public ServerResponse getIndexByBtoday() throws Exception {
+		List<StockIndex> list = HomeApiIndex.fetchStockIndices();
+
+		List<IndiaIndexNewVo> indexVoList = new ArrayList<>();
+
+		for (StockIndex stockIndex : list) {
+			IndiaIndexNewVo vo1 = new IndiaIndexNewVo();
+			IndiaStockVO market = new IndiaStockVO();
+			market.setClose(String.valueOf(stockIndex.getClose()));
+			market.setHigh(String.valueOf(stockIndex.getHigh()));
+			market.setLow(String.valueOf(stockIndex.getLow()));
+			market.setName(stockIndex.getName());
+			market.setNowPrice(String.valueOf(stockIndex.getClose()));
+			market.setOpen(String.valueOf(stockIndex.getOpen()));
+			market.setRate(String.valueOf(stockIndex.getPercentChange()));
 			vo1.setIndexVo(market);

-			//获取k线图  1D 当天的数据
-			String format = "S";
-			String durationType = "D";
-			String duration = "1";
-			List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
-			vo1.setKLine(kine);
+			// 只获取最近交易日的K线数据，智能跳过周末，优化性能和网络传输
+			List<ChartCandle> kLines = HomeApiIndex.fetchTodayAndYesterdayChartData(stockIndex.getId());
+			vo1.setKLine(kLines);
 			indexVoList.add(vo1);
-		}catch (Exception e){
-			log.error("BToday获取BSESENSEX指数数据异常，异常信息。。。。", e);
-			try {
-				GrowwInApis.requestSenSexData(indexVoList);
-			} catch (Exception e1) {
-				log.error("GrowwIn获取BSESENSEX指数数据异常，异常信息。。。。", e1);
-				try{
-					EttechchartsApis.requestSensexData(indexVoList);
-				} catch (Exception e2) {
-					log.error("Ettechcharts获取BSESENSEX指数数据异常，异常信息。。。。", e2);
-				}
+			List<String> order = Arrays.asList(
+					"IBEX 35 Index",
+					"DAX Index",
+					"Dow Jones Industrial Average",
+					"S&P 500 Index"
+
+			);
+
+
+			Map<String, Integer> orderMap = new HashMap<>();
+			for (int i = 0; i < order.size(); i++) {
+				orderMap.put(order.get(i), i);
 			}
+
+			indexVoList.sort(Comparator.comparingInt(o -> orderMap.getOrDefault(o.getIndexVo().getName(), Integer.MAX_VALUE)));
 		}

-		try {
-			String exchange = "nse";
-			IndiaIndexVo vo1 = new IndiaIndexVo();
-			String coCode = "20559";
-			JSONObject object = TodayApis.getStockDetail("in%3BNSX", coCode);
-			IndiaStockVO market = objToVo(object);
-			market.setName("NIFTY50指数");
-			vo1.setIndexVo(market);
-
-			//获取k线图  1D 当天的数据
-			String format = "S";
-			String durationType = "D";
-			String duration = "1";
-			List kine = TodayApis.getStockKline(exchange,coCode,format,durationType,duration);
-			vo1.setKLine(kine);
-			indexVoList.add(vo1);
-		}catch (Exception e){
-			log.error("BToday获取NIFTY50指数数据异常，异常信息。。。。", e);
-			try {
-				GrowwInApis.requestNifty50Data(indexVoList);
-			} catch (Exception e1) {
-				log.error("GrowwIn获取NIFTY50指数数据异常，异常信息。。。。", e1);
-				try{
-					EttechchartsApis.requestNifty50Data(indexVoList);
-				} catch (Exception e2) {
-					log.error("Ettechcharts获取NIFTY50指数数据异常，异常信息。。。。", e2);
-				}
-			}
-		}
 		return ServerResponse.createBySuccess(indexVoList);

 	}
+
 	private IndiaStockVO objToVo(JSONObject object){
 		IndiaStockVO market = new IndiaStockVO();
 		if(object.containsKey("priceprevclose")){
--- a/src/main/java/cn/stock/market/dto/RawStockApiResponse.java
+++ b/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;
+}
--- a/src/main/java/cn/stock/market/dto/StockDataDto.java
+++ b/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;
+}
--- a/src/main/java/cn/stock/market/dto/StockQuoteData.java
+++ b/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;
+}
--- a/src/main/java/cn/stock/market/dto/StockQuoteResponse.java
+++ b/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;
+}
--- a/src/main/java/cn/stock/market/dto/TradingViewData.java
+++ b/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
+} 
--- a/src/main/java/cn/stock/market/dto/TradingViewResponse.java
+++ b/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;
+} 
--- a/src/main/java/cn/stock/market/dto/model/ChartCandle.java
+++ b/src/main/java/cn/stock/market/dto/model/ChartCandle.java
@@ -0,0 +1,11 @@
+package cn.stock.market.dto.model;
+
+import lombok.Data;
+
+@Data
+public class ChartCandle {
+    private String upd_date;
+    private Double price;
+
+    // Getters & Setters (hoặc @Data nếu dùng Lombok)
+}
--- a/src/main/java/cn/stock/market/dto/model/StockIndex.java
+++ b/src/main/java/cn/stock/market/dto/model/StockIndex.java
@@ -0,0 +1,31 @@
+package cn.stock.market.dto.model;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class StockIndex {
+    private String id;
+    private String symbol;
+    private String name;
+    private String exchange;
+    private String micCode;
+    private String datetime;
+    private long timestamp;
+    private Double open;
+    private Double high;
+    private Double low;
+    private Double close;
+    private Long volume;
+    private Double previousClose;
+    private Double change;
+    private Double percentChange;
+    private Long averageVolume;
+    private Boolean isMarketOpen;
+    private Long marketCap;
+    private String fiftyTwoWeek;
+    private Integer icon;
+
+    // Getters & setters (hoặc dùng @Data nếu có Lombok)
+}
--- a/src/main/java/cn/stock/market/dto/model/Symbol.java
+++ b/src/main/java/cn/stock/market/dto/model/Symbol.java
@@ -0,0 +1,28 @@
+package cn.stock.market.dto.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Symbol {
+    private String symbol;
+    private String description;
+    private String stockGid;
+    private String type;
+    private String exchange;
+    private String currencyCode;
+    private String currencyLogoid;
+    private String logoid;
+    private String providerId;
+    private String sourceLogoid;
+    private String sourceId;
+    private String country;
+    private boolean isPrimaryListing;
+    private List<String> typespecs;
+
+    // Getters and setters
+    // Bạn có thể dùng Lombok nếu muốn ngắn gọn hơn
+    // Hoặc generate getter/setter trong IDE
+
+}
--- a/src/main/java/cn/stock/market/infrastructure/api/HomeApiIndex.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/HomeApiIndex.java
@@ -0,0 +1,228 @@
+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;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.time.DayOfWeek;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class HomeApiIndex {
+    private static final OkHttpClient client = new OkHttpClient();
+    static Config config = SpringUtils.getBean(Config.class);
+    private static final String API_URL = config.getStockUrlPrefix() +  "/api/ger-market/stocks/query-list?symbols=IBC:BME,DAX,^DJI:NASDAQ,^SPX: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<>();
+
+        Request request = new Request.Builder()
+                .url(API_URL)
+                .addHeader("User-Agent", "Mozilla/5.0")
+                .addHeader("Accept", "application/json")
+                .build();
+
+        Response response = client.newCall(request).execute();
+
+        if (!response.isSuccessful()) {
+            throw new RuntimeException("HTTP error code: " + response.code());
+        }
+
+        String body = response.body().string();
+        JSONObject json = new JSONObject(body);
+        JSONArray data = json.getJSONArray("data");
+
+        for (int i = 0; i < data.length(); i++) {
+            JSONObject obj = data.getJSONObject(i);
+            StockIndex index = new StockIndex();
+
+            index.setId(obj.optString("id"));
+            index.setSymbol(obj.optString("symbol"));
+            if (index.getSymbol().equals("DAX")) {
+                index.setName("DAX Index");
+            }else if (index.getSymbol().equals("MDAX")) {
+                index.setName("MDAX Index");
+            }else if (index.getSymbol().equals("IBC:BME")) {
+                index.setName("IBEX 35 Index");
+            } else if (index.getSymbol().equals("SDXP")) {
+                index.setName("SDAX Index");
+            }else {
+                index.setName(obj.optString("name"));
+            }
+            index.setExchange(obj.optString("exchange"));
+            index.setMicCode(obj.optString("mic_code"));
+            index.setDatetime(obj.optString("datetime"));
+            index.setTimestamp(obj.optLong("timestamp"));
+            index.setOpen(getDoubleOrNull(obj, "open"));
+            index.setHigh(getDoubleOrNull(obj, "high"));
+            index.setLow(getDoubleOrNull(obj, "low"));
+            index.setClose(getDoubleOrNull(obj, "close"));
+            index.setVolume(getLongOrNull(obj, "volume"));
+            index.setPreviousClose(getDoubleOrNull(obj, "previous_close"));
+            index.setChange(getDoubleOrNull(obj, "change"));
+            index.setPercentChange(getDoubleOrNull(obj, "percent_change"));
+            index.setAverageVolume(getLongOrNull(obj, "average_volume"));
+            index.setIsMarketOpen(obj.optBoolean("is_market_open"));
+            index.setMarketCap(getLongOrNull(obj, "market_cap"));
+            index.setFiftyTwoWeek(obj.optString("fifty_two_week", null));
+            index.setIcon(obj.optInt("icon", 0));
+
+            result.add(index);
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取图表数据（原方法，保持向后兼容）
+     */
+    public static List<ChartCandle> fetchChartData(String symbol, int amount) throws Exception {
+        return fetchChartDataWithDateFilter(symbol, amount, false);
+    }
+
+    /**
+     * 获取最近的交易日K线数据（支持跨周末）
+     * @param symbol 股票代码
+     * @return 最近交易日的K线数据
+     */
+    public static List<ChartCandle> fetchTodayAndYesterdayChartData(String symbol) throws Exception {
+        return fetchChartDataWithDateFilter(symbol, 168, true); // 获取7天数据，确保包含交易日
+    }
+
+    /**
+     * 获取图表数据，支持日期过滤
+     * @param symbol 股票代码
+     * @param amount 数据量
+     * @param filterRecentDays 是否只返回最近交易日的数据
+     */
+    private static List<ChartCandle> fetchChartDataWithDateFilter(String symbol, int amount, boolean filterRecentDays) throws Exception {
+        List<ChartCandle> result = new ArrayList<>();
+
+        String url = BASE_URL + "?symbol=" + symbol + "&interval=H&amount=" + amount;
+
+        Request request = new Request.Builder()
+                .url(url)
+                .addHeader("User-Agent", "Mozilla/5.0")
+                .addHeader("Accept", "application/json")
+                .build();
+
+        Response response = client.newCall(request).execute();
+
+        if (!response.isSuccessful()) {
+            throw new RuntimeException("HTTP error code: " + response.code());
+        }
+
+        String body = response.body().string();
+        JSONObject json = new JSONObject(body);
+        JSONArray data = json.getJSONArray("data");
+
+        if (filterRecentDays) {
+            // 获取最近的交易日期
+            Set<LocalDate> recentTradingDays = getRecentTradingDays();
+            
+            for (int i = 0; i < data.length(); i++) {
+                JSONObject obj = data.getJSONObject(i);
+                
+                long ts = obj.optLong("time");
+                ZonedDateTime zonedDateTime = Instant.ofEpochSecond(ts).atZone(ZoneId.of("Europe/Berlin"));
+                LocalDate dataDate = zonedDateTime.toLocalDate();
+                
+                // 只保留最近交易日的数据
+                if (recentTradingDays.contains(dataDate)) {
+                    ChartCandle candle = new ChartCandle();
+                    String formattedTime = convertToGermanTime(ts);
+                    candle.setUpd_date(formattedTime);
+                    candle.setPrice(getDoubleOrNull(obj, "close"));
+                    result.add(candle);
+                }
+            }
+        } else {
+            // 不过滤，返回所有数据
+            for (int i = 0; i < data.length(); i++) {
+                JSONObject obj = data.getJSONObject(i);
+                
+                long ts = obj.optLong("time");
+                String formattedTime = convertToGermanTime(ts);
+                
+                ChartCandle candle = new ChartCandle();
+                candle.setUpd_date(formattedTime);
+                candle.setPrice(getDoubleOrNull(obj, "close"));
+                result.add(candle);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取最近的交易日期（排除周末）
+     * @return 最近两个交易日的日期集合
+     */
+    public static Set<LocalDate> getRecentTradingDays() {
+        Set<LocalDate> tradingDays = new HashSet<>();
+        ZoneId germanyZone = ZoneId.of("Europe/Berlin");
+        LocalDate current = LocalDate.now(germanyZone);
+        
+        int foundDays = 0;
+        int daysBack = 0;
+        
+        // 向前查找最近的两个交易日
+        while (foundDays < 2 && daysBack < 10) { // 最多向前查找10天
+            LocalDate checkDate = current.minusDays(daysBack);
+            
+            // 排除周末（周六=6, 周日=7）
+            if (checkDate.getDayOfWeek() != DayOfWeek.SATURDAY && 
+                checkDate.getDayOfWeek() != DayOfWeek.SUNDAY) {
+                tradingDays.add(checkDate);
+                foundDays++;
+            }
+            daysBack++;
+        }
+        
+        return tradingDays;
+    }
+
+//    public static List<JSONObject> convertToJsonList(List<ChartCandle> candles) {
+//        List<JSONObject> result = new ArrayList<>();
+//
+//        for (ChartCandle c : candles) {
+//            JSONObject obj = new JSONObject();
+//            String formattedTime = convertToGermanTime(c.getTime());
+//            obj.put("upd_date", formattedTime);
+//            obj.put("price", c.getClose());
+//            result.add(obj);
+//        }
+//
+//        return result;
+//    }
+
+    public static String convertToGermanTime(long epochSeconds) {
+        ZoneId germanyZone = ZoneId.of("Europe/Berlin");
+        Instant instant = Instant.ofEpochSecond(epochSeconds);
+        ZonedDateTime zonedDateTime = instant.atZone(germanyZone);
+        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+        return formatter.format(zonedDateTime);
+    }
+
+    // Helper to safely parse nullable numbers
+    private static Double getDoubleOrNull(JSONObject obj, String key) {
+        return obj.isNull(key) ? null : obj.optDouble(key);
+    }
+
+    private static Long getLongOrNull(JSONObject obj, String key) {
+        return obj.isNull(key) ? null : obj.optLong(key);
+    }
+}
--- a/src/main/java/cn/stock/market/infrastructure/api/investing/IndiaIndexNewVo.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/investing/IndiaIndexNewVo.java
@@ -0,0 +1,18 @@
+package cn.stock.market.infrastructure.api.investing;
+
+import cn.stock.market.dto.model.ChartCandle;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "指数信息")
+public class IndiaIndexNewVo {
+    @ApiModelProperty(value = "指数详情")
+    private IndiaStockVO indexVo;
+    @ApiModelProperty(value = "指数k线")
+    private List<ChartCandle> kLine;
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/po/SiteNewsPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/SiteNewsPO.java
@@ -8,6 +8,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -75,6 +76,7 @@ public class SiteNewsPO {
  /**
   * 显示时间 */
  @ApiModelProperty("显示时间")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Europe/Madrid")
  Date showTime;

  /**
--- a/src/main/java/cn/stock/market/infrastructure/db/po/StockIpoPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/StockIpoPO.java
@@ -61,11 +61,11 @@ public class StockIpoPO {

  /**
   * 是否显示【1 显示，2 不显示】 */
-  Integer isShow;
+  Integer isShow = 1;

  /**
   * 是否上市【1 未上市，2 已上市】 */
-  Integer isList;
+  Integer isList = 1;

  Date createDate;

--- a/src/main/java/cn/stock/market/infrastructure/db/po/StockTempPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/StockTempPO.java
@@ -0,0 +1,39 @@
+package cn.stock.market.infrastructure.db.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * StockPO
+ *
+ * @author rplees
+ * @email rplees.i.ly@gmail.com
+ * @created 2023/06/17
+ */
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "stockTemp")
+public class StockTempPO {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	Integer id;
+
+	String stockType;
+
+	String stockGid;
+
+	String stockLogo;
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/repo/StockTempRepo.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/repo/StockTempRepo.java
@@ -0,0 +1,15 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.StockPO;
+import cn.stock.market.infrastructure.db.po.StockTempPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+
+/**
+ * StockRepo 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2023/06/17 
+ */
+public interface StockTempRepo extends GenericJpaRepository<StockTempPO, Integer> {
+}
--- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
@@ -16,27 +16,45 @@ 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.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(){
@@ -110,7 +128,7 @@ public class InvestingTask {
    }

    /*新闻接口*/
-    @Scheduled(cron = "0 0 0/3 * * ?")
+//    @Scheduled(cron = "0 0 0/3 * * ?")
    public void saveStockNews() {
        log.info("英文股票新闻数据同步开始");
        try {
@@ -169,4 +187,233 @@ 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 getCincoDiasNews() {
+        String baseUrl = "https://cincodias.elpais.com";
+
+        try {
+            List<SiteNews> results = new ArrayList<>();
+            String listUrl = baseUrl + "/ultimas-noticias/";
+            Document doc = Jsoup.connect(listUrl)
+                    .userAgent("Mozilla/5.0")
+                    .get();
+
+            Elements articles = doc.select("article.c");
+
+            for (Element article : articles) {
+                // Title and Link
+                Element aTag = article.selectFirst("h2.c_t a");
+                String title = aTag != null ? aTag.text().trim() : null;
+                String link = aTag != null ? aTag.absUrl("href") : null;
+
+                // Author
+                Element authorTag = article.selectFirst("a.c_a_a");
+                String author = authorTag != null ? authorTag.text().trim() : null;
+
+                Element figure = article.selectFirst("figure.c_m a img");
+
+                String imageUrl = null;
+                if (figure != null) {
+                    imageUrl = figure.attr("src");
+                }
+                // Date
+                Date publishedDate = null;
+                try {
+                    Element timeTag = article.selectFirst("time");
+                    if (timeTag != null) {
+                        String datetimeAttr = timeTag.attr("datetime");
+                        DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+                        ZonedDateTime zonedDateTime = ZonedDateTime.parse(datetimeAttr, formatter);
+                        publishedDate = Date.from(zonedDateTime.toInstant());
+                    }
+                } catch (Exception e) {
+                    log.warn("Failed to parse published date for article: {}", link);
+                }
+
+                // Summary
+                String summary = article.selectFirst("p.c_d") != null ? article.selectFirst("p.c_d").text() : null;
+
+                // Optional: Get full content from article detail page
+                String htmlContent = "";
+                if (link != null) {
+                    try {
+                        Document detailDoc = Jsoup.connect(link)
+                                .userAgent("Mozilla/5.0")
+                                .get();
+
+                        // ✅ Extract article main content
+                        Element body = detailDoc.selectFirst("div.a_c.clearfix[data-dtm-region=articulo_cuerpo]");
+                        if (body != null) {
+                            htmlContent = body.html();
+                        }
+
+                    } catch (Exception e) {
+                        log.warn("Error fetching detail page: {}", link);
+                        e.printStackTrace();
+                    }
+                }
+
+                // Build SiteNews object
+                SiteNews siteNews = new SiteNews();
+                siteNews.setAddTime(new Date());
+                siteNews.setSourceId(link);
+                siteNews.setTitle(title);
+                siteNews.setSourceName("CINCO_DIAS");
+                siteNews.setDescription(summary != null ? summary : title);
+                siteNews.setImgurl(imageUrl);
+                siteNews.setContent(htmlContent);
+                siteNews.setStatus(1);
+                siteNews.setType(1);
+                siteNews.setViews(0);
+                siteNews.setShowTime(publishedDate);
+
+                try {
+                    newsRepository.save(siteNews);
+                    log.info("Saved Spanish news: {}", title);
+                } catch (Exception e) {
+                    log.warn("Failed to save Spanish news {}: {}", link, e.getMessage());
+                }
+            }
+
+        } catch (Exception e) {
+            log.error("Error fetching Spanish news: {}", 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.";
+    }
 }
--- a/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/MoneyScraper.java
@@ -115,15 +115,15 @@ public class MoneyScraper {
                if (ulElement != null) {
                    for (Element aElement : ulElement.select("a")) {
                        String exchangeValue = aElement.text().trim();
-                        if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) {
+                        if ("BSE".equals(exchangeValue.toUpperCase()) || "NSE".equals(exchangeValue.toUpperCase())) {
                            log.info(Thread.currentThread().getName() + ",the stock url: " + url +
                                    ", the exchange Value: " + exchangeValue);
-                            MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toLowerCase(Locale.ROOT))
+                            MoneyStock build = MoneyStock.builder().stockName(name).stockType(exchangeValue.toUpperCase(Locale.ROOT))
                                    .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId))
                                    .selfUrl(url)
                                    .selfDispId(extractDispId(url))
                                    .moneyScId(companyCodeId).saveTime(new Date()).build();
-                            List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT)));
+                            List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(name), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT)));
                            if (CollectionUtil.isEmpty(all)) {
                                moneyStockRepository.save(build);
                            }
@@ -264,15 +264,15 @@ public class MoneyScraper {
                            for (Element aElement : ulElement.select("a")) {
                                String exchangeValue = aElement.text().trim();

-                                if ("BSE".equals(exchangeValue) || "NSE".equals(exchangeValue)) {
+                                if ("BSE".equals(exchangeValue.toUpperCase(Locale.ROOT)) || "NSE".equals(exchangeValue.toUpperCase(Locale.ROOT))) {
                                    log.info(Thread.currentThread().getName()+",stockName: " + textContent + ", self_link: " + linkAttribute +
                                            ", the exchange Value: " + exchangeValue);
-                                    MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toLowerCase(Locale.ROOT))
+                                    MoneyStock build = MoneyStock.builder().stockName(textContent).stockType(exchangeValue.toUpperCase(Locale.ROOT))
                                            .detailUrl(String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s", exchangeValue.toLowerCase(), companyCodeId))
                                            .selfUrl(linkAttribute)
                                            .selfDispId(extractDispId(linkAttribute))
                                            .moneyScId(companyCodeId).saveTime(new Date()).build();
-                                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.eq(exchangeValue.toLowerCase(Locale.ROOT)));
+                                    List<MoneyStock> all = moneyStockRepository.findAll(QMoneyStockPO.moneyStockPO.stockName.eq(textContent), QMoneyStockPO.moneyStockPO.stockType.upper().eq(exchangeValue.toUpperCase(Locale.ROOT)));
                                    if(CollectionUtil.isEmpty(all)){
                                        moneyStockRepository.save(build);
                                    }
--- a/src/main/java/cn/stock/market/infrastructure/job/RealTimeTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/RealTimeTask.java
@@ -16,7 +16,7 @@ public class RealTimeTask {

    /*每天9点定时删除股票k线数据*/
    @Transactional
-    @Scheduled(cron = "0 00 9 * * MON-FRI")
+//    @Scheduled(cron = "0 00 9 * * MON-FRI")
    public void deleteStockCode() {
        log.info("每天9点定时删除股票k线数据");
        repo.deleteStockCode();
@@ -24,7 +24,7 @@ public class RealTimeTask {

    /*每天0点定时删除期货k线数据*/
    @Transactional
-    @Scheduled(cron = "0 00 0 * * MON-FRI")
+//    @Scheduled(cron = "0 00 0 * * MON-FRI")
    public void deleteStockFuturesCode() {
        log.info("每天0点定时删除期货k线数据");
        repo.deleteStockFuturesCode();
--- a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java
@@ -63,7 +63,7 @@ public class Scraper {
    private boolean times = false;


-    @Scheduled(cron = "0 0 1 */2 * ?")
+//    @Scheduled(cron = "0 0 1 */2 * ?")
    @RequestMapping("/testScraperGetBusinessToday")
    public  void schedule() {
        String BASE_URL = "https://akm-img-a-in.tosshub.com/businesstoday/resource/market-widgets/prod/company-master-23-01-2023.json";
@@ -110,178 +110,200 @@ public class Scraper {



-    @Scheduled(cron = "0 0 18 * * ?")
+//    @Scheduled(cron = "0 0 18 * * ?")
 //    @PostConstruct
    @RequestMapping("/testScraperGetMoneyControllerNewIPO")
    public  void getMoneyControllerNewIPOSchedule() {
        log.info("定时任务执行获取新股ipo的方法开始执行");
        // 目标 URL
-        String url = "https://www.moneycontrol.com/ipo/open-upcoming-ipos";
+        List<String> urls = Arrays.asList("https://www.moneycontrol.com/ipo/upcoming-ipos/", "https://www.moneycontrol.com/ipo/open-ipos/");
        // 创建 HttpClient 实例
        HttpClient client = HttpClients.createDefault();
        // 创建 HttpGet 请求
-        HttpGet request = new HttpGet(url);
-        try {
-            // 执行请求
-            HttpResponse response = client.execute(request);
+        for (String url : urls) {
+            HttpGet request = new HttpGet(url);
+            try {
+                // 执行请求
+                HttpResponse response = client.execute(request);

-            // 检查请求是否成功
-            if (response.getStatusLine().getStatusCode() == 200) {
-                // 获取响应体
-                String responseBody = EntityUtils.toString(response.getEntity());
+                // 检查请求是否成功
+                if (response.getStatusLine().getStatusCode() == 200) {
+                    // 获取响应体
+                    String responseBody = EntityUtils.toString(response.getEntity());

-                // 使用 Jsoup 解析 HTML
-                Document doc = Jsoup.parse(responseBody);
+                    // 使用 Jsoup 解析 HTML
+                    Document doc = Jsoup.parse(responseBody);

-                // 找到包含 JSON 数据的 <script> 标签
-                Element scriptTag = doc.selectFirst("script#__NEXT_DATA__");
+                    // 找到包含 JSON 数据的 <script> 标签
+                    Element scriptTag = doc.selectFirst("script#__NEXT_DATA__");

-                if (scriptTag != null) {
-                    // 获取 JSON 数据
-                    String jsonDataStr = scriptTag.html();
+                    if (scriptTag != null) {
+                        // 获取 JSON 数据
+                        String jsonDataStr = scriptTag.html();

-                    // 将 JSON 字符串解析为 Java JSONObject
-                    JSONObject jsonObject = JSONObject.parseObject(jsonDataStr);
-                    log.info("获取到新股的json信息:"+jsonObject.toJSONString());
+                        // 将 JSON 字符串解析为 Java JSONObject
+                        JSONObject jsonObject = JSONObject.parseObject(jsonDataStr);
+                        log.info("获取到新股的json信息:"+jsonObject.toJSONString());

-                    JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
-                    JSONObject ipoTableData = pageProps.getJSONObject("ipoTableData");

-                    // 解析 openData 和 upcomingData
-                    JSONArray openData = ipoTableData.getJSONArray("openData");
-                    JSONArray upcomingData = ipoTableData.getJSONArray("upcomingData");
-                    List<StockIpo> listStockIpoList = new ArrayList<>();
-                    for (int i = 0; i < openData.size(); i++) {
-                        JSONObject entry = openData.getJSONObject(i);
-                        StockIpo stockIpo = new StockIpo();
-                        stockIpo.setStockCode(entry.getString("sc_id"));
-                        stockIpo.setStockName(entry.getString("company_name"));
-                        stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
-                        stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
-                        stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                        Integer totalNumber = 0;
-                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
-                            Integer issue_size = entry.getInteger("issue_size");
-                            BigDecimal issueSize = new BigDecimal(issue_size);
-                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
-                            totalNumber = totalNumberBigDecimal.intValue();
-                        }
-                        stockIpo.setTotalNumber(totalNumber);
-                        stockIpo.setApply(entry.getString("total_subs"));
-                        stockIpo.setCreateDate(new Date());
-                        stockIpo.setUpdateDate(new Date());
-                        stockIpo.setSourceType("3");

-                        if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
-                            continue;
+                        JSONObject pageProps = jsonObject.getJSONObject("props").getJSONObject("pageProps");
+                        JSONObject ipoTableData = pageProps.getJSONObject("ipoTableData");
+
+
+
+                        // 解析 openData 和 upcomingData
+                        JSONArray openData = ipoTableData.getJSONArray("openData");
+//                    if (openData.isEmpty()){
+//                        openData = ipoTableData.getJSONArray("openUpcomingData");
+//                    }
+                        JSONArray upcomingData = ipoTableData.getJSONArray("upcomingData");
+                        List<StockIpo> listStockIpoList = new ArrayList<>();
+                        for (int i = 0; i < openData.size(); i++) {
+                            JSONObject entry = openData.getJSONObject(i);
+                            StockIpo stockIpo = new StockIpo();
+                            stockIpo.setStockCode(entry.getString("sc_id"));
+                            stockIpo.setStockName(entry.getString("company_name"));
+                            stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
+                            stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
+                            stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
+                            Integer totalNumber = 0;
+                            if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                                BigDecimal issueSize = new BigDecimal(entry.getLong("issue_size"));
+                                BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                                totalNumber = totalNumberBigDecimal.intValue();
+                            }
+                            stockIpo.setTotalNumber(totalNumber);
+                            stockIpo.setApply(entry.getString("total_subs"));
+                            stockIpo.setCreateDate(new Date());
+                            stockIpo.setUpdateDate(new Date());
+                            stockIpo.setSourceType("3");
+
+                            if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
+                                continue;
+                            }
+                            String codeDetail = entry.getString("url").substring(entry.getString("url").lastIndexOf('/') + 1);;
+                            List<String> exchanges = getIpoExchange(stockIpo.getStockName(), codeDetail);
+
+                            for (String exchange : exchanges) {
+                                StockIpo ipo = new StockIpo();
+                                ipo.setStockCode(stockIpo.getStockCode());
+                                ipo.setStockName(stockIpo.getStockName());
+                                ipo.setStockPrice(stockIpo.getStockPrice());
+                                ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
+                                ipo.setListingDate(stockIpo.getListingDate());
+                                ipo.setTotalNumber(stockIpo.getTotalNumber());
+                                ipo.setApply(stockIpo.getApply());
+                                ipo.setCreateDate(stockIpo.getCreateDate());
+                                ipo.setUpdateDate(stockIpo.getUpdateDate());
+                                ipo.setExchangeType(exchange);
+                                ipo.setSourceType("3");
+                                listStockIpoList.add(ipo);
+                            }
                        }

-                        List<String> exchanges = getIpoExchange(stockIpo.getStockName(), stockIpo.getStockCode());
+                        for (int i = 0; i < upcomingData.size(); i++) {
+                            JSONObject entry = upcomingData.getJSONObject(i);
+                            StockIpo stockIpo = new StockIpo();
+                            stockIpo.setStockCode(entry.getString("sc_id"));
+                            stockIpo.setStockName(entry.getString("company_name"));
+                            stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
+                            stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
+                            stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
+                            Integer totalNumber = 0;
+                            if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
+                                Integer issue_size = entry.getInteger("issue_size");
+                                BigDecimal issueSize = new BigDecimal(issue_size);
+                                BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
+                                totalNumber = totalNumberBigDecimal.intValue();
+                            }
+                            stockIpo.setTotalNumber(totalNumber);
+                            stockIpo.setApply(entry.getString("total_subs"));
+                            stockIpo.setCreateDate(new Date());
+                            stockIpo.setUpdateDate(new Date());
+                            stockIpo.setSourceType("3");

-                        for (String exchange : exchanges) {
-                            StockIpo ipo = new StockIpo();
-                            ipo.setStockCode(stockIpo.getStockCode());
-                            ipo.setStockName(stockIpo.getStockName());
-                            ipo.setStockPrice(stockIpo.getStockPrice());
-                            ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
-                            ipo.setListingDate(stockIpo.getListingDate());
-                            ipo.setTotalNumber(stockIpo.getTotalNumber());
-                            ipo.setApply(stockIpo.getApply());
-                            ipo.setCreateDate(stockIpo.getCreateDate());
-                            ipo.setUpdateDate(stockIpo.getUpdateDate());
-                            ipo.setExchangeType(exchange);
+                            if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
+                                continue;
+                            }

-                            listStockIpoList.add(ipo);
+                            List<String> exchanges = getIpoExchange(stockIpo.getStockName(), stockIpo.getStockCode());
+
+                            for (String exchange : exchanges) {
+                                StockIpo ipo = new StockIpo();
+                                ipo.setStockCode(stockIpo.getStockCode());
+                                ipo.setStockName(stockIpo.getStockName());
+                                ipo.setStockPrice(stockIpo.getStockPrice());
+                                ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
+                                ipo.setListingDate(stockIpo.getListingDate());
+                                ipo.setTotalNumber(stockIpo.getTotalNumber());
+                                ipo.setApply(stockIpo.getApply());
+                                ipo.setCreateDate(stockIpo.getCreateDate());
+                                ipo.setUpdateDate(stockIpo.getUpdateDate());
+                                ipo.setExchangeType(exchange);
+                                ipo.setSourceType("3");
+                                listStockIpoList.add(ipo);
+                            }
                        }
+
+                        //  stockIpoRepository.saveAll(listStockIpoList);
+
+                        if (!listStockIpoList.isEmpty())
+                        {
+                            listStockIpoList = listStockIpoList.stream().filter(a -> StringUtils.isNotBlank(a.getStockName())).collect(Collectors.toList());
+                        }
+
+                        List<String> scIdList = Lists.transform(listStockIpoList, StockIpo::getStockCode);
+                        if(CollectionUtil.isNotEmpty(scIdList)){
+                            List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockCode.in(scIdList));
+                            List<String> existingStockScIds = existStockIpoList.stream()
+                                    .map(StockIpo::getStockCode)
+                                    .collect(Collectors.toList());
+
+                            for (StockIpo stockIpo : listStockIpoList) {
+                                StockIpo existIpo = existStockIpoList.stream().filter(a -> a.getStockCode().equals(stockIpo.getStockCode()) && (a.getExchangeType() == null || a.getExchangeType().isEmpty() || a.getExchangeType().toLowerCase().trim().equals(stockIpo.getExchangeType().toLowerCase().trim()))).findFirst().orElse(null);
+                                if (existIpo != null) {
+                                    if (existIpo.getExchangeType() == null || existIpo.getExchangeType().isEmpty()){
+                                        existIpo.setExchangeType(stockIpo.getExchangeType());
+                                    }
+                                    stockIpo.setId(existIpo.getId());
+                                    if (existIpo.getStockPrice() != null){
+                                        stockIpo.setStockPrice(existIpo.getStockPrice());
+                                        stockIpo.setApply(existIpo.getApply());
+                                    }
+                                }
+                            }
+//                        listStockIpoList = listStockIpoList.stream()
+//                                .filter(stockIpos -> !existingStockScIds.contains(stockIpos.getStockCode())).filter(stockIpo -> StringUtils.isNotBlank(stockIpo.getStockName()))
+//                                .collect(Collectors.toList());
+
+                            //保存全部的新股
+                            if(CollectionUtil.isNotEmpty(listStockIpoList)){
+                                stockIpoRepository.saveAll(listStockIpoList);
+
+                                log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
+                            }else {
+                                log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
+                            }
+                        }
+
+
+                        // 输出整个 JSON 数据
+                    } else {
+                        log.info("未找到包含 JSON 数据的 <script> 标签");
                    }
-
-                    for (int i = 0; i < upcomingData.size(); i++) {
-                        JSONObject entry = upcomingData.getJSONObject(i);
-                        StockIpo stockIpo = new StockIpo();
-                        stockIpo.setStockCode(entry.getString("sc_id"));
-                        stockIpo.setStockName(entry.getString("company_name"));
-                        stockIpo.setStockPrice(entry.getBigDecimal("issue_price"));
-                        stockIpo.setSubscriptionDate(convertStringToTimestamp(entry.getString("open_date")));
-                        stockIpo.setListingDate(convertStringToTimestamp(entry.getString("listing_date")));
-                        Integer totalNumber = 0;
-                        if(null!=entry.getInteger("issue_size")&&entry.getBigDecimal("issue_price")!=null&&!entry.getBigDecimal("issue_price").equals(BigDecimal.valueOf(0))){
-                            Integer issue_size = entry.getInteger("issue_size");
-                            BigDecimal issueSize = new BigDecimal(issue_size);
-                            BigDecimal   totalNumberBigDecimal = issueSize.divide(entry.getBigDecimal("issue_price"), 2, BigDecimal.ROUND_HALF_UP);
-                            totalNumber = totalNumberBigDecimal.intValue();
-                        }
-                        stockIpo.setTotalNumber(totalNumber);
-                        stockIpo.setApply(entry.getString("total_subs"));
-                        stockIpo.setCreateDate(new Date());
-                        stockIpo.setUpdateDate(new Date());
-                        stockIpo.setSourceType("3");
-
-                        if (stockIpo.getStockCode() == null || stockIpo.getStockName() == null){
-                            continue;
-                        }
-
-                        List<String> exchanges = getIpoExchange(stockIpo.getStockName(), stockIpo.getStockCode());
-
-                        for (String exchange : exchanges) {
-                            StockIpo ipo = new StockIpo();
-                            ipo.setStockCode(stockIpo.getStockCode());
-                            ipo.setStockName(stockIpo.getStockName());
-                            ipo.setStockPrice(stockIpo.getStockPrice());
-                            ipo.setSubscriptionDate(stockIpo.getSubscriptionDate());
-                            ipo.setListingDate(stockIpo.getListingDate());
-                            ipo.setTotalNumber(stockIpo.getTotalNumber());
-                            ipo.setApply(stockIpo.getApply());
-                            ipo.setCreateDate(stockIpo.getCreateDate());
-                            ipo.setUpdateDate(stockIpo.getUpdateDate());
-                            ipo.setExchangeType(exchange);
-
-                            listStockIpoList.add(ipo);
-                        }
-                    }
-
-                  //  stockIpoRepository.saveAll(listStockIpoList);
-
-                    if (!listStockIpoList.isEmpty())
-                    {
-                        listStockIpoList = listStockIpoList.stream().filter(a -> StringUtils.isNotBlank(a.getStockName())).collect(Collectors.toList());
-                    }
-
-                    List<String> scIdList = Lists.transform(listStockIpoList, StockIpo::getStockCode);
-                    if(CollectionUtil.isNotEmpty(scIdList)){
-                        List<StockIpo> existStockIpoList = stockIpoRepository.findAll(QStockIpoPO.stockIpoPO.stockCode.in(scIdList));
-                        List<String> existingStockScIds = existStockIpoList.stream()
-                                .map(StockIpo::getStockCode)
-                                .collect(Collectors.toList());
-
-                        listStockIpoList = listStockIpoList.stream()
-                                .filter(stockIpos -> !existingStockScIds.contains(stockIpos.getStockCode())).filter(stockIpo -> StringUtils.isNotBlank(stockIpo.getStockName()))
-                                .collect(Collectors.toList());
-
-                        //保存全部的新股
-                        if(CollectionUtil.isNotEmpty(listStockIpoList)){
-                            stockIpoRepository.saveAll(listStockIpoList);
-
-                            log.info("定时任务执行获取新股ipo的方法开始结束,保存了数据:{}", JSON.toJSONString(listStockIpoList));
-                        }else {
-                            log.info("定时任务执行获取新股ipo的方法开始结束,没有数据");
-                        }
-                    }
-
-
-                    // 输出整个 JSON 数据
                } else {
-                    log.info("未找到包含 JSON 数据的 <script> 标签");
+                    log.info("HTTP请求失败，状态码：" + response.getStatusLine().getStatusCode());
                }
-            } else {
-                log.info("HTTP请求失败，状态码：" + response.getStatusLine().getStatusCode());
+            } catch (IOException e) {
+                log.error("获取新股接口发生异常",e);
            }
-        } catch (IOException e) {
-            log.error("获取新股接口发生异常",e);
        }

+
    }

-    @Scheduled(cron = "0 0 19 * * ?")
+//    @Scheduled(cron = "0 0 19 * * ?")
    @PostConstruct
    @RequestMapping("/addMoneyStock")
    public  void addMoneyStock() {
@@ -506,22 +528,23 @@ public class Scraper {
    public List<MoneyStock> convertToMoneyStock(List<StockIpo> stockIpoList) {
        // Lấy danh sách tất cả stockCode và exchangeType từ stockIpoList
        Set<String> stockCodes = stockIpoList.stream().map(StockIpo::getStockCode).collect(Collectors.toSet());
-        Set<String> exchangeTypes = stockIpoList.stream().map(StockIpo::getExchangeType).collect(Collectors.toSet());
+//        Set<String> exchangeTypes = stockIpoList.stream().map(StockIpo::getExchangeType).collect(Collectors.toSet());
+        Set<String> exchangeTypes = stockIpoList.stream().map(stockIpo -> stockIpo.getExchangeType().toUpperCase()).collect(Collectors.toSet());

        // Lấy tất cả các MoneyStock tồn tại trong database với stockCode và exchangeType trong stockIpoList
        List<MoneyStock> existingMoneyStocks = moneyStockRepository.findAll(
                QMoneyStockPO.moneyStockPO.moneyScId.in(stockCodes)
-                        .and(QMoneyStockPO.moneyStockPO.stockType.in(exchangeTypes))
+                        .and(QMoneyStockPO.moneyStockPO.stockType.upper().in(exchangeTypes))
        );

        // Lưu các stockCode và exchangeType đã tồn tại
        Set<String> existingKeys = existingMoneyStocks.stream()
-                .map(ms -> ms.getMoneyScId() + ms.getStockType())
+                .map(ms -> ms.getMoneyScId() + ms.getStockType().toUpperCase())
                .collect(Collectors.toSet());

        // Chỉ giữ những StockIpo chưa tồn tại
        return stockIpoList.stream()
-                .filter(stockIpo -> !existingKeys.contains(stockIpo.getStockCode() + stockIpo.getExchangeType()))
+                .filter(stockIpo -> !existingKeys.contains(stockIpo.getStockCode() + stockIpo.getExchangeType().toUpperCase()))
                .map(this::convert)
                .collect(Collectors.toList());
    }
@@ -542,7 +565,7 @@ public class Scraper {
        moneyStock.setStockName(stockIpo.getStockName());
        moneyStock.setMoneyScId(stockIpo.getStockCode());
        moneyStock.setSelfDispId(stockIpo.getStockCode());
-        moneyStock.setStockType(stockIpo.getExchangeType());
+        moneyStock.setStockType(stockIpo.getExchangeType().toUpperCase());
        moneyStock.setSaveTime(DateTime.now());
        moneyStock.setNseIndiaId(getNSEId(stockIpo));

@@ -573,10 +596,10 @@ public class Scraper {

                    JSONObject jsonData = jsonObject.getJSONObject("data");

-                    if(stockIpo.getExchangeType().equals("NSE")){
+                    if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("NSE")){
                        return jsonData.getString("NSEID");
                    }
-                    else if(stockIpo.getExchangeType().equals("BSE")){
+                    else if(stockIpo.getExchangeType().toUpperCase(Locale.ROOT).equals("BSE")){
                        return jsonData.getString("BSEID");
                    }
                }
--- a/src/main/java/cn/stock/market/infrastructure/job/StockNewTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/StockNewTask.java
@@ -0,0 +1,186 @@
+package cn.stock.market.infrastructure.job;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import cn.stock.market.domain.basic.entity.Stock;
+import cn.stock.market.domain.basic.entity.StockTemp;
+import cn.stock.market.domain.basic.repository.StockRepository;
+import cn.stock.market.domain.basic.repository.StockTempRepository;
+import cn.stock.market.dto.model.Symbol;
+import cn.stock.market.infrastructure.db.po.StockPO;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+@Slf4j
+public class StockNewTask {
+	private static final OkHttpClient client = new OkHttpClient();
+	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 * * ?")
+	public void syncStock() throws Exception {
+		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;
+					}
+					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);
+						}
+					}
+					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;
+	}
+}
--- a/src/main/java/cn/stock/market/infrastructure/job/StockTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/StockTask.java
@@ -112,7 +112,7 @@ public class StockTask {
    }
    
    /*同步股票列表*/
-    @Scheduled(cron = "0 0 6 * * ?")
+//    @Scheduled(cron = "0 0 6 * * ?")
    public void syncAFutureStockList() {
    	PageInfo<JSONObject> info = EastmoneyApi.ipoApplyDate(1, 300);
    	Map<String, Stock> stockMap = StockRepository.of().cacheCodeMap();
@@ -154,7 +154,7 @@ public class StockTask {
    }
    
    /*同步股票列表*/
-    @Scheduled(cron = "0 0 6 * * ?")
+//    @Scheduled(cron = "0 0 6 * * ?")
    public void syncAStockList() {
    	MdcUtil.setTraceIdIfAbsent();
    	Config config = SpringUtils.getBean(Config.class);
--- a/src/main/java/cn/stock/market/utils/HttpClientRequest.java
+++ b/src/main/java/cn/stock/market/utils/HttpClientRequest.java
@@ -265,6 +265,56 @@ public class HttpClientRequest {
        return result;
    }

+    public static String doGetNews(String url) {
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        String result = "";
+
+        try {
+            httpClient = HttpClients.createDefault();
+
+            HttpGet httpGet = new HttpGet(url);
+
+            // Spoof real browser headers
+            httpGet.setHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7");
+            httpGet.setHeader("Accept-Language", "en-US,en;q=0.9,vi;q=0.8,ug;q=0.7,fr;q=0.6");
+            httpGet.setHeader("User-Agent", "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1");
+            httpGet.setHeader("Priority", "u=0, i");
+            httpGet.setHeader("Sec-Fetch-Dest", "document");
+            httpGet.setHeader("Sec-Fetch-Mode", "navigate");
+            httpGet.setHeader("Sec-Fetch-Site", "none");
+            httpGet.setHeader("Sec-Fetch-User", "?1");
+            httpGet.setHeader("Upgrade-Insecure-Requests", "1");
+
+            // Set cookies exactly like in curl
+            httpGet.setHeader("Cookie", "userUid=1747102033185-d570fba9-62fd-40be-93ca-ed08b4de57d4; _sid=MTc0NzEwMjAzMzE4Ni4ycTU%3D; _scor_uid=135c13065ff84620b5318b489af93e87; _gcl_au=1.1.249135292.1747102036; _ga=GA1.1.1031614211.1747102037; WZRK_G=28895afb56ff48dda59fe8de0af746bf; FCNEC=%5B%5B%22AKsRol8sHYeSYz_FYPkInYXN3P4ZDPfVKbsRfILfDuOMLhDtkTuoCJP5MlvT9gIbOe7IlDfY8ZeHszhwdVtAoKF1gWv0pLAq5EqpLpse8CEm_ZNv-bUSs6zEyqpOkeKWFI_Ei6VfNAvnZAO8PcXdF8_ncsaO902X7g%3D%3D%22%5D%5D; _ga_KRGL1M61LX=GS2.1.s1747105135$o2$g0$t1747105135$j60$l0$h0");
+
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(10000)
+                    .setSocketTimeout(15000)
+                    .setConnectionRequestTimeout(10000)
+                    .build();
+            httpGet.setConfig(requestConfig);
+
+            response = httpClient.execute(httpGet);
+            HttpEntity entity = response.getEntity();
+
+            if (entity != null) {
+                result = EntityUtils.toString(entity);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (response != null) response.close();
+                if (httpClient != null) httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
    public static void main(String[] args) {
        String url = "https://marketapi.intoday.in/widget/topgainer/view?exchange=nse";
        String str = doGet(url);
--- a/src/main/java/cn/stock/market/web/MoneyApiController.java
+++ b/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,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) {
@@ -834,343 +684,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"})
--- a/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
+++ b/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
@@ -26,13 +26,14 @@ public class MoneyProxyApiControl {

    @GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
    public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
+        log.info("queryStockByMoneyIdAndExchangeType");
        return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
    }


    public static JSONObject stockByMoneyIdAndExchangeTypeFromHttp(String scId, String exchangeType) {
        try {
-            String url = "https://priceapi.moneycontrol.com/pricefeed/"+exchangeType+"/equitycash/" + scId ;
+            String url = "https://moneycontrol.titanrwa.org/pricefeed/"+exchangeType+"/equitycash/" + scId ;
            URL obj = new URL(url);
            HttpURLConnection con = (HttpURLConnection) obj.openConnection();
            con.setRequestMethod("GET");
@@ -53,7 +54,8 @@ public class MoneyProxyApiControl {
                log.error("HTTP request failed with response code: " + responseCode);
            }
        } catch (Exception e) {
-            log.error("stockByMoneyIdAndExchangeTypeFromHttp",e);
+            e.printStackTrace();
+            log.error("stockByMoneyIdAndExchangeTypeFromHttp failed {}",e.getMessage());
        }
        return new JSONObject();
    }
--- a/src/main/java/cn/stock/market/web/StockApiController.java
+++ b/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"})
@@ -244,13 +244,20 @@ public class StockApiController {
 	}

 	@RequestMapping({"getIndiaIndexByToday.do"})
-	@ApiOperation(value = "印度--获取指定指数信息", httpMethod = "GET")
+	@ApiOperation(value = "德国--获取指定指数信息（最近交易日K线）", httpMethod = "GET")
 	@ResponseBody
 	public ServerResponse getIndiaIndexByToday() {
 		String INDEX_CODE = "TODAY_INDEX";
-		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,6000, (string) -> {
-			return this.stockService.getIndexByBtoday();
-		});
+		// 优化缓存时间为15秒，平衡数据实时性和系统性能
+		// 由于只返回最近交易日数据，可以适当延长缓存时间
+		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE, 15000, (string) -> {
+            try {
+                return this.stockService.getIndexByBtoday();
+            } catch (Exception e) {
+                log.error("获取德国指数数据失败: {}", e.getMessage(), e);
+                throw new RuntimeException("获取指数数据失败: " + e.getMessage(), e);
+            }
+        });
 	}
 	@RequestMapping({"getIndiaIndexByEttech.do"})
 	@ApiOperation(value = "印度--获取指定指数信息-Ettech", httpMethod = "GET")
--- a/src/main/java/cn/stock/market/web/config/Config.java
+++ b/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;
 }
--- a/src/main/java/cn/stock/market/web/service/MoneyApiService.java
+++ b/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<>();
+    }
+}
--- a/src/main/resources/application-base-alpha.yml
+++ b/src/main/resources/application-base-alpha.yml
@@ -1,11 +1,12 @@
 spring:
  jpa:
    show-sql: true
+
  # Redis配置
  redis:
-    host: 43.156.40.39
+    host: 167.235.39.59
    password: a5v8b86P4mVzFlUqJV
-    port: 30031
+    port: 47379
    database: 1
    lettuce:
      pool:
@@ -17,9 +18,9 @@ spring:
  datasource:
    stock-market:
      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://43.156.40.39:30030/india_stock?useUnicode=true&characterEncoding=utf-8
+      url: jdbc:mysql://de-cdb-pj5o5m8b.sql.tencentcdb.com:24110/stock-api?useUnicode=true&characterEncoding=utf-8
      username: root
-      password: uNejHIFQGJOUtYTmE
+      password: 6QJXv8dA76klnqsWh6f
      maxActive: 500
      testWhileIdle: true
      validationQuery: SELECT 1
@@ -28,7 +29,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 +43,8 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+
+stockUrlPrefix: https://apinode-dgdev.moneytj.com
 # 具体看类:CloudStorageConfig
 oss:
  type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云
Author	SHA1	Message	Date
vu-tran	5aef88988e	update orders index	2025-08-11 18:44:47 +07:00
vu-tran	02d7b9d027	Merge branch 'develop_red' of gitlab.main99.com:germany/ger-market-java into develop_red	2025-08-11 18:36:23 +07:00
vu-tran	d1fb4bded8	update index	2025-08-11 18:32:16 +07:00
Weng JinPeng	dd5eeede7d	feat: add support for fetching recent trading day chart data and optimize caching for index retrieval	2025-08-11 07:29:26 +08:00
vu-tran	f3dd600189	update time for response news	2025-08-11 00:36:45 +07:00
vu-tran	7caaccb580	update get news	2025-08-05 15:51:59 +07:00
Weng JinPeng	7deabedfa3	feat: add BME stock types to top active codes filter	2025-08-01 22:47:42 +08:00
vpckiet	721317de0a	Merge branch 'feature/update_top_list' into 'develop_red' stock top list See merge request germany/ger-market-java!4	2025-07-25 03:07:25 +00:00
Congkiet4695	88bfdfa7fa	stock top list	2025-07-25 10:06:38 +07:00
vpckiet	51bcd72051	Merge branch 'feature/stock_type_filter' into 'develop_red' update filter type stock top list See merge request germany/ger-market-java!3	2025-07-24 03:28:23 +00:00
Congkiet4695	769b35046e	update filter type stock top list	2025-07-24 10:26:47 +07:00
trannhanvu88	368f4f2f9f	Edit .gitlab-ci.yml	2025-07-23 07:11:17 +00:00
trannhanvu88	4053683339	Edit .gitlab-ci.yml	2025-07-23 05:30:29 +00:00
VoGiaHuy2058	9fd87aaf89	done sync us stock and change env	2025-07-23 10:19:05 +07:00
vu-tran	ccda6cba45	update get gainer and loser	2025-07-09 08:56:49 +07:00
vu-tran	22303b5460	update	2025-07-04 18:38:26 +07:00
vu-tran	992108c6e4	update top gainer and loser	2025-07-04 17:31:09 +07:00
vu-tran	a086f33541	update top gainer and loser	2025-07-04 17:30:59 +07:00
vu-tran	d864aee7e1	update	2025-07-04 14:01:05 +07:00
vu-tran	fc74d7c33f	update news	2025-07-04 13:41:21 +07:00
VuTran	309516c40b	update url	2025-06-30 15:48:37 +07:00
VuTran	20875fbead	update index name	2025-06-30 15:34:47 +07:00
VuTran	2e6474035b	remove scheduler sync stock from tradingview	2025-06-30 11:10:13 +07:00
vu-tran	4db963b0e5	update top active	2025-06-27 17:14:48 +07:00
vu-tran	401983255a	update index	2025-06-27 14:07:53 +07:00
vu-tran	2d36e8264f	update chart	2025-06-20 11:04:18 +07:00
vu-tran	580d4321bb	update sort by time	2025-06-19 14:43:23 +07:00
vu-tran	6f2c8652e2	Merge branch 'develop' of gitlab.main99.com:germany/ger-market-java into develop	2025-06-19 14:14:34 +07:00
vu-tran	e423e3fc19	get germany news	2025-06-19 14:14:13 +07:00
vpckiet	d237c51176	Merge branch 'feature/update_get_germany_stock' into 'develop' update get germany stock See merge request germany/ger-market-java!1	2025-06-19 03:00:22 +00:00
vpckiet	97bc0ea694	update get germany stock	2025-06-19 09:59:08 +07:00
VoGiaHuy2058	8ef7b46038	done home page	2025-06-18 22:41:58 +07:00
VoGiaHuy2058	9785a391a2	home-page	2025-06-18 17:51:36 +07:00
vu-tran	5b3504f32a	update	2025-06-18 15:38:15 +07:00
vu-tran	f67af0d3e9	udpate	2025-06-18 14:22:40 +07:00
vu-tran	af21d583d9	update new stock	2025-06-18 13:35:15 +07:00
VoGiaHuy2058	cd06493b9c	done requuiement	2025-06-18 10:37:12 +07:00
vu-tran	3255012fba	turn off india stock task	2025-06-18 10:35:08 +07:00
VoGiaHuy2058	476645109d	done for stockTemp repository	2025-06-18 07:52:49 +07:00
VoGiaHuy2058	66eccce4cb	apply new daily stock	2025-06-17 17:33:18 +07:00
owen l	5ab279daa6	Update .gitlab-ci.yml file	2025-06-17 06:34:34 +00:00
vpckiet	be24a57d2d	Merge branch 'feature/update_money_stock' into 'develop' update money ipo See merge request india/india_market_java!63	2025-06-02 06:55:25 +00:00
vpckiet	aa796cf853	update money ipo	2025-06-02 13:51:29 +07:00
vpckiet	9a06979f07	Merge branch 'feature/update_ipo' into 'develop' update money ipo check See merge request india/india_market_java!61	2025-05-22 07:33:13 +00:00
vpckiet	d1f9600361	update money ipo check	2025-05-22 14:32:35 +07:00
vpckiet	fcab660024	Merge branch 'feature/update_ipo' into 'develop' update ipo check See merge request india/india_market_java!60	2025-05-22 07:01:22 +00:00
vpckiet	ad95848c2c	update ipo check	2025-05-22 14:00:18 +07:00
vu-tran	90a26823f0	update news	2025-05-13 10:10:42 +07:00
VoGiaHuy2058	c72c0ff4cd	Revert "fix cron" This reverts commit `85094c22b2`.	2025-05-12 18:53:06 +07:00
VoGiaHuy2058	85094c22b2	fix cron	2025-05-12 18:44:16 +07:00
mush_ball	59684cccfc	Edit .gitlab-ci.yml	2025-04-28 10:45:30 +00:00
vu-tran	57690ecb5e	update logs	2025-04-28 17:38:16 +07:00
vu-tran	8cf511f1b7	update ipo	2025-04-24 13:41:59 +07:00
vu-tran	f612b5128e	update issue size to long	2025-02-10 09:54:10 +07:00
vu-tran	07a69f29b9	update get data open ipo	2025-02-10 09:37:39 +07:00
vu-tran	3e1ff24bb6	update link ipo	2025-01-15 11:27:40 +07:00
vu-tran	b26d3962c4	update crawl ipo	2024-12-11 14:23:08 +07:00
vu-tran	d085d8de12	update crawl ipo	2024-12-11 12:39:15 +07:00
vpckiet	0476ad100b	Merge branch 'bug/update_bse' into 'develop' fix bug See merge request india/india_market_java!55	2024-12-10 17:03:43 +00:00