详情查询、详情列表查询

工具方法
抓取全量股票数据入库
2024-05-31 18:11:23 +08:00 · 2024-05-31 17:49:52 +08:00 · 2024-05-30 18:27:49 +08:00 · 2024-05-30 11:10:30 +08:00 · 2024-05-06 12:33:09 +00:00 · 2024-05-06 12:31:40 +00:00
37 changed files with 1516 additions and 67 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
  # 构建
  - build
+  - dockerize
  - webhook

 build:
@@ -37,6 +38,28 @@ build:
    - mvn clean install -Dmaven.test.skip=true
    - ls
    - echo ">>>>>>Finish Building<<<<<<"
+dockerize:
+  stage: dockerize
+  tags:
+   - hk2
+  dependencies:
+    - build
+  only:
+    - main
+    - develop
+  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
 webhook:
  stage: webhook
  only:
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+FROM openjdk:8
+
+RUN echo "deb http://archive.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list \
+    && echo "deb-src http://archive.debian.org/debian/ stretch main contrib non-free" >> /etc/apt/sources.list \
+    && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid
+
+RUN apt-get update
+#RUN apt-get install -y iputils-ping dnsutils vim net-tools --allow-unauthenticated
+
+WORKDIR /app
+
+COPY target/india_market_java.jar /app/app.jar
+
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+CMD ["docker-entrypoint.sh"]
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \
+	-Dspring.redis.host=$REDIS_HOST \
+	-Dspring.redis.password=$REDIS_PASS \
+	-Dmarket.domain=$MARKET_HOST \
+	-Dspring.redis.port=$REDIS_PORT \
+	-Dspring.datasource.stock-market.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
+	-Dspring.datasource.stock-market.username=$MYSQL_USER \
+	-Dspring.datasource.stock-market.password=$MYSQL_PASSWORD \
+	-Dspring.datasource.stock.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \
+	-Dspring.datasource.stock.username=$MYSQL_USER \
+	-Dspring.datasource.stock.password=$MYSQL_PASSWORD"
+
+
+echo 'param:'$@
+echo 'JAVA_OPTS:'$JAVA_OPTS
+
+java $JAVA_OPTS -jar /app/app.jar $@
+
+tail -f /dev/null
--- a/src/main/generated/cn/stock/market/infrastructure/db/po/QTwelveStockPO.java
+++ b/src/main/generated/cn/stock/market/infrastructure/db/po/QTwelveStockPO.java
@@ -0,0 +1,49 @@
+package cn.stock.market.infrastructure.db.po;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QTwelveStockPO is a Querydsl query type for TwelveStockPO
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTwelveStockPO extends EntityPathBase<TwelveStockPO> {
+
+    private static final long serialVersionUID = -100071895L;
+
+    public static final QTwelveStockPO twelveStockPO = new QTwelveStockPO("twelveStockPO");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> isLock = createNumber("isLock", Integer.class);
+
+    public final NumberPath<Integer> isShow = createNumber("isShow", Integer.class);
+
+    public final DateTimePath<java.util.Date> saveTime = createDateTime("saveTime", java.util.Date.class);
+
+    public final StringPath stockCode = createString("stockCode");
+
+    public final StringPath stockName = createString("stockName");
+
+    public final StringPath stockType = createString("stockType");
+
+    public QTwelveStockPO(String variable) {
+        super(TwelveStockPO.class, forVariable(variable));
+    }
+
+    public QTwelveStockPO(Path<? extends TwelveStockPO> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QTwelveStockPO(PathMetadata metadata) {
+        super(TwelveStockPO.class, metadata);
+    }
+
+}
+
--- a/src/main/java/cn/stock/market/application/assembler/TwelveStockAssembler.java
+++ b/src/main/java/cn/stock/market/application/assembler/TwelveStockAssembler.java
@@ -0,0 +1,35 @@
+package cn.stock.market.application.assembler;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.TwelveStockDTO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockAssembler 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockAssembler {
+  public TwelveStockDTO toDTO(TwelveStock e) {
+    TwelveStockDTO dto = Beans.mapper(e, TwelveStockDTO.class);
+    if(dto == null) return dto;
+    fill(e, dto);
+    return  dto;
+  }
+
+  protected void fill(TwelveStock e, TwelveStockDTO dto) {
+    if(dto == null) return;
+    return;
+  }
+
+  public static TwelveStockAssembler of() {
+    return SpringUtils.getBean(TwelveStockAssembler.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/convert/TwelveStockConvert.java
+++ b/src/main/java/cn/stock/market/domain/basic/convert/TwelveStockConvert.java
@@ -0,0 +1,23 @@
+package cn.stock.market.domain.basic.convert;
+
+import cn.qutaojing.common.domain.convert.SimpleEntityPOConvert;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockConvert 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockConvert extends SimpleEntityPOConvert<TwelveStock, TwelveStockPO> {
+  public static TwelveStockConvert of() {
+    return SpringUtils.getBean(TwelveStockConvert.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/entity/TwelveStock.java
+++ b/src/main/java/cn/stock/market/domain/basic/entity/TwelveStock.java
@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.entity;
+
+import cn.qutaojing.common.utils.Beans;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStock 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStock extends TwelveStockPO {
+  public void update(TwelveStockCreateCommand cmd) {
+    Beans.copyProperties(cmd, this);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/factory/TwelveStockFactory.java
+++ b/src/main/java/cn/stock/market/domain/basic/factory/TwelveStockFactory.java
@@ -0,0 +1,28 @@
+package cn.stock.market.domain.basic.factory;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.dto.command.TwelveStockCreateCommand;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * TwelveStockFactory 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Component
+@Lazy
+public class TwelveStockFactory {
+  public static TwelveStockFactory of() {
+    return SpringUtils.getBean(TwelveStockFactory.class);
+  }
+
+  public TwelveStock from(TwelveStockCreateCommand cmd) {
+    TwelveStock e = TwelveStock.builder().build();
+    e.update(cmd);
+    return e;
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/repository/TwelveStockRepository.java
+++ b/src/main/java/cn/stock/market/domain/basic/repository/TwelveStockRepository.java
@@ -0,0 +1,46 @@
+package cn.stock.market.domain.basic.repository;
+
+import cn.qutaojing.common.domain.convert.IEntityPOConvert;
+import cn.qutaojing.common.domain.respostory.SimplePoConvertEntityRepository;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.convert.TwelveStockConvert;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import cn.stock.market.infrastructure.db.repo.TwelveStockRepo;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+import java.lang.Override;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TwelveStockRepository 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Repository
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockRepository extends SimplePoConvertEntityRepository<TwelveStock, TwelveStockPO, Integer> {
+  final TwelveStockRepo repo;
+
+  final TwelveStockConvert convert;
+
+  @Override
+  public GenericJpaRepository<TwelveStockPO, Integer> repo() {
+    return repo;
+  }
+
+  @Override
+  public IEntityPOConvert<TwelveStock, TwelveStockPO> convert() {
+    return convert;
+  }
+
+  public static TwelveStockRepository of() {
+    return SpringUtils.getBean(TwelveStockRepository.class);
+  }
+}
--- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java
@@ -1,23 +1,18 @@
 package cn.stock.market.domain.basic.service;

-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.math.BigDecimal;
-import java.net.URL;
-import java.net.URLConnection;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;

-import javax.net.ssl.X509TrustManager;
 import javax.persistence.EntityExistsException;
 import javax.servlet.http.HttpServletRequest;
-import javax.sound.midi.Soundbank;

-import cn.hutool.core.bean.BeanUtil;
 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.TodayApis;
 import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
 import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
@@ -30,22 +25,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
 import okhttp3.Request.Builder;
 import org.apache.commons.lang3.StringUtils;
 import cn.stock.market.infrastructure.db.po.QStockPO;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.HttpClientUtils;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpEntity;
@@ -70,11 +54,6 @@ import cn.stock.market.infrastructure.api.sina.vo.MarketVO;
 import cn.stock.market.infrastructure.api.sina.vo.MarketVOResult;
 import cn.stock.market.infrastructure.api.sina.vo.k.MinDataVO;
 import cn.stock.market.infrastructure.api.sina.vo.k.echarts.EchartsDataVO;
-import cn.stock.market.utils.GetPyByChinese;
-import cn.stock.market.utils.HttpClientRequest;
-import cn.stock.market.utils.PropertiesUtil;
-import cn.stock.market.utils.ServerResponse;
-import cn.stock.market.utils.Utils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.client.RestTemplate;
@@ -273,7 +252,7 @@ public class StockService {
 					.header("Referer", "https://www.business-standard.com/")
 					.header("Accept-Language", "en-US,en;q=0.9")
 					.get();
-			result = doc.html().substring(doc.html().indexOf("<div class=\"short-video-img\">"),doc.html().lastIndexOf("<div class=\"short-video-img\">")+500);
+			result = doc.html().substring(doc.html().indexOf("<div class=\"shortvideoimg\" style=\"position:relative\">"),doc.html().lastIndexOf("<div class=\"shortvideoimg\" style=\"position:relative\">")+1200);
 		} catch (Exception e) {
 			return e.toString();
 		}
@@ -1008,7 +987,17 @@ public class StockService {
 			vo1.setKLine(kine);
 			indexVoList.add(vo1);
 		}catch (Exception e){
-			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+			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);
+				}
+			}
 		}

 		try {
@@ -1028,7 +1017,17 @@ public class StockService {
 			vo1.setKLine(kine);
 			indexVoList.add(vo1);
 		}catch (Exception e){
-			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+			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);

@@ -1069,4 +1068,48 @@ public class StockService {

 	}

+	public ServerResponse getEttechcharts(){
+		List<IndiaIndexVo> indexVoList = new ArrayList<>();
+		try {
+			//获取详情
+			String indexid = "2365";
+			String exchange = "47";
+			String keyName = "sensex";
+			IndiaIndexVo vo1 = new IndiaIndexVo();
+			JSONObject object = EttechchartsApis.getStockDetail(indexid, exchange,keyName);
+			IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
+			market.setName("BSESENSEX指数");
+			vo1.setIndexVo(market);
+
+			//获取k线图  1min 当天的数据 分钟
+			String scripcode = "SENSEX";
+			List kine = EttechchartsApis.getStockKline(scripcode,exchange);
+			vo1.setKLine(kine);
+			indexVoList.add(vo1);
+		}catch (Exception e){
+			log.info("获取BSESENSEX指数数据异常，异常信息{}。。。。",e.getMessage());
+		}
+		try {
+			//获取详情
+			String indexid = "2369";
+			String exchangeid = "50";
+			String keyName = "nifty";
+			IndiaIndexVo vo1 = new IndiaIndexVo();
+			JSONObject object = EttechchartsApis.getStockDetail(indexid, exchangeid,keyName);
+			IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
+			market.setName("NIFTY50指数");
+			vo1.setIndexVo(market);
+
+			//获取k线图  1min 当天的数据 分钟
+			String scripcode = "NSE+Index";
+			List kine = EttechchartsApis.getStockKline(scripcode,exchangeid);
+			vo1.setKLine(kine);
+			indexVoList.add(vo1);
+		}catch (Exception e){
+			log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
+		}
+		return ServerResponse.createBySuccess(indexVoList);
+	}
+
+
 }
--- a/src/main/java/cn/stock/market/domain/basic/service/TwelveStockService.java
+++ b/src/main/java/cn/stock/market/domain/basic/service/TwelveStockService.java
@@ -0,0 +1,33 @@
+package cn.stock.market.domain.basic.service;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.factory.TwelveStockFactory;
+import cn.stock.market.domain.basic.repository.TwelveStockRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * TwelveStockService 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Service
+@RequiredArgsConstructor(
+    onConstructor = @__(@Autowired)
+)
+public class TwelveStockService {
+  final TwelveStockRepository repository;
+
+  final TwelveStockFactory factory;
+
+  public TwelveStockRepository repository() {
+    return repository;
+  }
+
+  public static TwelveStockService of() {
+    return SpringUtils.getBean(TwelveStockService.class);
+  }
+}
--- a/src/main/java/cn/stock/market/dto/TwelveStockDTO.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockDTO.java
@@ -0,0 +1,23 @@
+package cn.stock.market.dto;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockDTO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockDTO extends TwelveStockPO {
+}
--- a/src/main/java/cn/stock/market/dto/TwelveStockData.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockData.java
@@ -0,0 +1,22 @@
+package cn.stock.market.dto;
+
+import lombok.Data;
+
+@Data
+public class TwelveStockData {
+	
+    private String symbol;
+    
+    private String name;
+    
+    private String currency;
+    
+    private String exchange;
+    
+    private String mic_code;
+    
+    private String country;
+    
+    private String type;
+}
+
--- a/src/main/java/cn/stock/market/dto/TwelveStockInfo.java
+++ b/src/main/java/cn/stock/market/dto/TwelveStockInfo.java
@@ -0,0 +1,61 @@
+package cn.stock.market.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+/**
+ * TwelveStockInfo类用于存储股票信息。
+ * 该类包含了股票的基本信息和交易数据。
+ */
+@ApiModel("TwelveStockInfo")
+public class TwelveStockInfo {
+    @ApiModelProperty("股票代码")
+    private String stockCode;
+
+    @ApiModelProperty("交易代码")
+    private String symbol;
+
+    @ApiModelProperty("股票名称")
+    private String stockName;
+
+    @ApiModelProperty("股票类型")
+    private String stockType;
+
+    @ApiModelProperty("当前价格")
+    private String lastPrice;
+
+    @ApiModelProperty("变动百分比")
+    private String perchg;
+    @ApiModelProperty("变动值")
+    private String change;
+
+    @ApiModelProperty("开盘价格")
+    private String openPrice;
+
+    @ApiModelProperty("昨日收盘价格")
+    private String previousPrice;
+
+    @ApiModelProperty("成交量")
+    private String volume;
+
+    @ApiModelProperty("最高价格")
+    private String highPrice;
+
+    @ApiModelProperty("最低价格")
+    private String lowPrice;
+
+    @ApiModelProperty("52周最高价格")
+    private String week52HighPrice;
+
+    @ApiModelProperty("52周最低价格")
+    private String week52LowPrice;
+
+    @ApiModelProperty("股票当前的交易状态: 1-表示退市Closed, 2-Opening Auction, 3-Continuous Trading, 15-Intra-day Close (scheduled)")
+    private String status;
+
+    @ApiModelProperty("股票id")
+    private Integer id;
+}
+
--- a/src/main/java/cn/stock/market/dto/command/TwelveStockCreateCommand.java
+++ b/src/main/java/cn/stock/market/dto/command/TwelveStockCreateCommand.java
@@ -0,0 +1,48 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockCreateCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+public class TwelveStockCreateCommand {
+  /**
+   * 主键 */
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}
--- a/src/main/java/cn/stock/market/dto/command/TwelveStockModifyCommand.java
+++ b/src/main/java/cn/stock/market/dto/command/TwelveStockModifyCommand.java
@@ -0,0 +1,24 @@
+package cn.stock.market.dto.command;
+
+import java.lang.Integer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * TwelveStockModifyCommand 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@EqualsAndHashCode(
+    callSuper = false
+)
+public class TwelveStockModifyCommand extends TwelveStockCreateCommand {
+  Integer id;
+}
--- a/src/main/java/cn/stock/market/infrastructure/api/EttechchartsApis.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/EttechchartsApis.java
--- a/src/main/java/cn/stock/market/infrastructure/api/GrowwInApis.java
+++ b/src/main/java/cn/stock/market/infrastructure/api/GrowwInApis.java
@@ -0,0 +1,233 @@
+package cn.stock.market.infrastructure.api;
+
+import cn.stock.market.dto.TodayStockDTO;
+import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
+import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 数据来源网站：<a href="https://groww.in/indices/nifty">...</a>, <a href="https://groww.in/indices/sp-bse-sensex">...</a>
+ *
+ * @auther jnerh
+ */
+public class GrowwInApis {
+
+    public static final String INDEX_DETAIL_URL = "https://groww.in/v1/api/stocks_data/v1/accord_points/exchange/%s/segment/CASH/latest_indices_ohlc/%s";
+    public static final String INDEX_KLINE_URL = "https://groww.in/v1/api/charting_service/v2/chart/delayed/exchange/%s/segment/CASH/%s/daily?intervalInMinutes=%s&minimal=true";
+
+
+    public static void requestSenSexData(List<IndiaIndexVo> indexVoList) {
+        IndiaIndexVo vo1 = new IndiaIndexVo();
+        JSONObject object = GrowwInApis.getSenSexDetail();
+        IndiaStockVO market = GrowwInApis.objToVo(object);
+        market.setName("BSESENSEX指数");
+        vo1.setIndexVo(market);
+
+        List kine = GrowwInApis.getSenSexKline();
+        vo1.setKLine(kine);
+        indexVoList.add(vo1);
+    }
+    public static void requestNifty50Data(List<IndiaIndexVo> indexVoList) {
+        IndiaIndexVo vo1 = new IndiaIndexVo();
+        JSONObject object = GrowwInApis.getNifty50Detail();
+        IndiaStockVO market = GrowwInApis.objToVo(object);
+        market.setName("NIFTY50指数");
+        vo1.setIndexVo(market);
+
+        List kine = GrowwInApis.getNifty50Kline();
+        vo1.setKLine(kine);
+        indexVoList.add(vo1);
+    }
+
+    /**
+     * 获取Nifty50指数详情
+     */
+    public static JSONObject getIndexDetail(String exchange, String type) {
+        String url = String.format(INDEX_DETAIL_URL, exchange, type);
+        String str = get(url);
+        return JSON.parseObject(str);
+    }
+
+    /**
+     * 获取k线图
+     */
+    public static List getIndexKline(String exchange, String type, String intervalInMinutes) {
+        String url = String.format(INDEX_KLINE_URL, exchange, type, intervalInMinutes);
+        String str = get(url);
+        JSONObject object = JSON.parseObject(str);
+        return getList(object.getString("candles"));
+    }
+
+
+    /**
+     * 获取Nifty50指数详情
+     */
+    public static JSONObject getSenSexDetail() {
+        return getIndexDetail("BSE", "1");
+    }
+
+    /**
+     * 获取k线图
+     */
+    public static List getSenSexKline() {
+        return getIndexKline("BSE", "1", "1");
+    }
+
+    /**
+     * 获取Nifty50指数详情
+     */
+    public static JSONObject getNifty50Detail() {
+        return getIndexDetail("NSE", "NIFTY");
+    }
+
+    /**
+     * 获取k线图
+     */
+    public static List getNifty50Kline() {
+        return getIndexKline("NSE", "NIFTY", "5");
+    }
+
+    static String get(String url) {
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        String result = "";
+
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet httpGet = new HttpGet(url);
+            httpGet.setHeader("Referer", "https://groww.in/indices/nifty");
+            httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0");
+            httpGet.setHeader("X-App-Id", "growwWeb");
+            httpGet.setHeader("X-Device-Id", "fd4815a2-49e4-570a-931a-0316d4d8a52d");
+            httpGet.setHeader("X-Device-Type", "desktop");
+            httpGet.setHeader("X-Platform", "web");
+            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
+            httpGet.setConfig(requestConfig);
+            response = httpClient.execute(httpGet);
+            HttpEntity entity = response.getEntity();
+            result = EntityUtils.toString(entity);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+
+            if (null != response) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != httpClient) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+    public static IndiaStockVO objToVo(JSONObject object) {
+        IndiaStockVO market = new IndiaStockVO();
+        if (object.containsKey("close")) {
+            market.setClose(object.getString("close"));
+        }
+        if (object.containsKey("value")) {
+            market.setNowPrice(object.getString("value"));
+        }
+        if (object.containsKey("dayChangePerc")) {
+            market.setRate(object.getString("dayChangePerc"));
+        }
+        if (object.containsKey("high")) {
+            market.setHigh(object.getString("high"));
+        }
+        if (object.containsKey("low")) {
+            market.setLow(object.getString("low"));
+        }
+        if (object.containsKey("open")) {
+            market.setOpen(object.getString("open"));
+        }
+
+        return market;
+    }
+
+    private static List getList(String json) {
+        List<JSONObject> dataObject = new ArrayList<>();
+        JSONArray jsonArray = JSON.parseArray(json);
+        for (Object obj : jsonArray) {
+            JSONObject entity = new JSONObject();
+            JSONArray jsonArray1 = JSON.parseArray(obj.toString());
+            entity.put("upd_date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(JSON.parseArray(obj.toString()).getLong(0) * 1000)).replace(" ", "T"));
+            entity.put("price", jsonArray1.getBigDecimal(1));
+            dataObject.add(entity);
+        }
+        return dataObject;
+    }
+
+    private static TodayStockDTO todayStockDTO(JSONObject jsonObject) {
+        TodayStockDTO dto = new TodayStockDTO();
+        if (jsonObject.containsKey("exchange")) {
+            dto.setStockType(jsonObject.getString("exchange"));
+        } else {
+            dto.setStockType("");
+        }
+        if (jsonObject.containsKey("lname")) {
+            dto.setStockName(jsonObject.getString("lname"));
+        } else {
+            dto.setStockName("");
+        }
+        if (jsonObject.containsKey("high_price")) {
+            dto.setHighPrice(jsonObject.getString("highPrice"));
+        } else {
+            dto.setHighPrice("0.00");
+        }
+        if (jsonObject.containsKey("low_price")) {
+            dto.setLowPrice(jsonObject.getString("low_price"));
+        } else {
+            dto.setLowPrice("0.00");
+        }
+        if (jsonObject.containsKey("price")) {
+            dto.setLastPrice(jsonObject.getString("price"));
+        } else {
+            dto.setLastPrice("0.00");
+        }
+        if (jsonObject.containsKey("close_price")) {
+            dto.setPrevClosePrice(jsonObject.getString("close_price"));
+        } else {
+            dto.setPrevClosePrice("0.00");
+        }
+        if (jsonObject.containsKey("netchg")) {
+            dto.setChange(jsonObject.getString("netchg"));
+        } else {
+            dto.setChange("0.00");
+        }
+        if (jsonObject.containsKey("perchg")) {
+            dto.setChangePercent(jsonObject.getString("perchg"));
+        } else {
+            dto.setChangePercent("0.00");
+        }
+        return dto;
+
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getNifty50Detail());
+        System.out.println(getNifty50Kline());
+    }
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/po/TwelveStockPO.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/po/TwelveStockPO.java
@@ -0,0 +1,66 @@
+package cn.stock.market.infrastructure.db.po;
+
+import java.lang.Integer;
+import java.lang.String;
+import java.util.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ * TwelveStockPO 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+@SuperBuilder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(
+    name = "twelve_stock"
+)
+public class TwelveStockPO {
+  /**
+   * 主键 */
+  @Id
+  @GeneratedValue(
+      strategy = javax.persistence.GenerationType.IDENTITY
+  )
+  Integer id;
+
+  /**
+   * 股票code */
+  String stockCode;
+
+  /**
+   * 股票名称 */
+  String stockName;
+
+  /**
+   * BSE or NSE */
+  String stockType;
+
+  /**
+   * 保存时间 */
+  Date saveTime;
+
+  /**
+   * 是否锁定 0否  1是 */
+  Integer isLock;
+
+  /**
+   * 是否展示  0是  1否 */
+  Integer isShow;
+}
--- a/src/main/java/cn/stock/market/infrastructure/db/repo/TwelveStockRepo.java
+++ b/src/main/java/cn/stock/market/infrastructure/db/repo/TwelveStockRepo.java
@@ -0,0 +1,15 @@
+package cn.stock.market.infrastructure.db.repo;
+
+import cn.stock.market.infrastructure.db.po.TwelveStockPO;
+import com.rp.spring.jpa.GenericJpaRepository;
+import java.lang.Integer;
+
+/**
+ * TwelveStockRepo 
+ *
+ * @author rplees 
+ * @email rplees.i.ly@gmail.com 
+ * @created 2024/05/30 
+ */
+public interface TwelveStockRepo extends GenericJpaRepository<TwelveStockPO, Integer> {
+}
--- a/src/main/java/cn/stock/market/infrastructure/job/TwelvedataTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/TwelvedataTask.java
@@ -0,0 +1,105 @@
+package cn.stock.market.infrastructure.job;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Lists;
+
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.domain.basic.entity.TwelveStock;
+import cn.stock.market.domain.basic.service.TwelveStockService;
+import cn.stock.market.dto.TwelveStockData;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.web.config.Config;
+
+@Slf4j
+@Component
+@RestController
+public class TwelvedataTask {
+	
+    @Autowired
+    private TwelveStockService twelveStockService;
+	
+    @GetMapping("/task/syncStockData")
+    @Scheduled(cron = "0 0 18 * * ?")
+    public void syncStockData() {
+        log.info("每天18点定时同步Twelvedata股票数据开始");
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        // 获取股票symbol列表
+        List<TwelveStockData> stockList = getStockList();
+        // 查询出数据库中所有股票
+        List<TwelveStock> allStocks = twelveStockService.repository().findAll();
+        List<String> savedSymbols = allStocks.stream().map(p-> p.getStockCode() + "#" + p.getStockType()).distinct().collect(Collectors.toList());
+        // 去除数据库中已经存在的股票
+        // 使用Iterator安全地移除元素
+        if(stockList!=null && stockList.size()>0) {
+	        Iterator<TwelveStockData> iterator = stockList.iterator();
+	        while (iterator.hasNext()) {
+	        	TwelveStockData stockData = iterator.next();
+	            if (savedSymbols.contains(stockData.getSymbol() + "#" + stockData.getExchange())) { // 根据条件移除元素
+	                iterator.remove();
+	            }
+	        }
+        }
+        //剩余数据入库
+        List<TwelveStock> addList = Lists.newArrayList();
+        if(stockList!=null && stockList.size()>0) {
+        	for(TwelveStockData stockData:stockList) {
+        		addList.add(cover(stockData));
+        	}
+        	twelveStockService.repository().saveAll(addList);
+        }
+        log.info("syncStockData执行, 受影响数{}, 耗时:{}毫秒", addList.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+    }
+    
+    private TwelveStock cover(TwelveStockData data) {
+  	  TwelveStock stock = new TwelveStock();
+  	  stock.setStockCode(data.getSymbol());
+  	  stock.setStockName(data.getName());
+  	  stock.setStockType(data.getExchange());
+  	  stock.setSaveTime(new Date());
+  	  return stock;
+    }
+    
+    private List<TwelveStockData> getStockList() {
+        try {
+        	String source = "docs";
+        	String country = "India";
+        	List<TwelveStockData> list = Lists.newArrayList();
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/stocks?source=%s&country=%s&apikey=%s",source,country,config.getTwelveApikey());
+			String result = HttpRequest.doTwelveGet(url);
+			log.info("getStockList：获取 {} {} 的股票全量列表结束，耗时: {} ms ",source,country,(System.currentTimeMillis()-start));
+			JSONObject jsonObject = JSONObject.parseObject(result);
+			if (jsonObject != null && !jsonObject.isEmpty()) {
+				JSONArray jsonArray = jsonObject.getJSONArray("data");
+				if(jsonArray!=null && jsonArray.size()>0) {
+			        for (int i = 0; i < jsonArray.size(); i++) {
+			            JSONObject item = jsonArray.getJSONObject(i);
+			            TwelveStockData stock = JSONObject.toJavaObject(item, TwelveStockData.class);
+			            list.add(stock);
+			        }
+				}
+			}
+			return list;
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			 log.error("getStockList同步twelvedata股票数据异常,Exception:{}", e);
+		}
+        return null;
+    }
+}
--- a/src/main/java/cn/stock/market/utils/HttpClientRequest.java
+++ b/src/main/java/cn/stock/market/utils/HttpClientRequest.java
@@ -212,6 +212,59 @@ public class HttpClientRequest {
        return result;
    }

+    public static String doEttechchartsGet(String url) {
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        String result = "";
+
+        try {
+            httpClient = HttpClients.createDefault();
+
+            HttpGet httpGet = new HttpGet(url);
+
+//            httpGet.setHeader(":authority","ettechcharts.indiatimes.com");
+//            httpGet.setHeader(":method","GET");
+//            httpGet.setHeader(":scheme","https");
+            httpGet.setHeader("accept","*/*");
+            httpGet.setHeader("accept-encoding","gzip, deflate, br");
+            httpGet.setHeader("accept-language","zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6");
+            httpGet.setHeader("user-agent","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36");
+            httpGet.setHeader("Referer", "https://economictimes.indiatimes.com/");
+
+
+            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
+
+            httpGet.setConfig(requestConfig);
+
+            response = httpClient.execute(httpGet);
+
+            HttpEntity entity = response.getEntity();
+
+            result = EntityUtils.toString(entity);
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+
+            if (null != response) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != httpClient) {
+                try {
+                    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/utils/HttpRequest.java
+++ b/src/main/java/cn/stock/market/utils/HttpRequest.java
@@ -2,6 +2,7 @@ package cn.stock.market.utils;


 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ -142,6 +143,52 @@ public class HttpRequest {
        return text;
    }

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

    public static void main(String[] args) {
        String url = "";
--- a/src/main/java/cn/stock/market/utils/RequestCacheUtils.java
+++ b/src/main/java/cn/stock/market/utils/RequestCacheUtils.java
@@ -65,6 +65,50 @@ public class RequestCacheUtils {
 		
 		return response;
 	}
+
+	/**
+	 * 根据时间创建缓存
+	 * @param key	key
+	 * @param duration 时间(毫秒)
+	 * @return
+	 */
+	public static Cache<String, ServerResponse<?>> cacheByMilliseconds(String key,long duration) {
+		if(! map.containsKey(key)) {
+			log.info("创建缓存: {}", key);
+			Cache<String, ServerResponse<?>> cache = CacheBuilder.newBuilder()
+					.maximumSize(1000)
+					.expireAfterWrite(duration,TimeUnit.MILLISECONDS)
+					.weakValues()
+					.recordStats()
+					.build(
+//						new CacheLoader<String, Object>() {
+//						@Override
+//						public Object load(String key) throws Exception {
+//							return func.apply(key);
+//						}
+//					 }
+					);
+			map.put(key, cache);
+		}
+
+		return map.get(key);
+	}
+
+	@SneakyThrows
+	public static <T> ServerResponse<T> cache(String module, String key,long duration, Function<String, ServerResponse<?>> func) {
+		Cache<String, ServerResponse<?>> cache = cacheByMilliseconds(module,duration);
+		AtomicBoolean bool = new AtomicBoolean(true);
+		ServerResponse<T> response = (ServerResponse<T>) cache.get(key, () -> {
+			bool.set(false);
+			return func.apply(key);
+		});
+
+		if(bool.get()) {
+			log.info("命中缓存 module: {}, key: {}, 时间戳: {}", module, key, System.currentTimeMillis());
+		}
+
+		return response;
+	}
 	
 	public static void main(String[] args) throws InterruptedException {
 		ServerResponse<Object> response = null;
--- a/src/main/java/cn/stock/market/web/ArticleApiController.java
+++ b/src/main/java/cn/stock/market/web/ArticleApiController.java
@@ -20,7 +20,7 @@ import cn.stock.market.domain.basic.service.SiteArticleService;
 import cn.stock.market.utils.ServerResponse;

@Controller
-@RequestMapping({"/api/market/art/", "/api/hq/art/"})
+@RequestMapping({"/market/api/market/art/","/market/api/market/art/","/api/market/art/", "/api/hq/art/"})
@Api(tags = "公告信息")
 public class ArticleApiController extends BaseController {

--- a/src/main/java/cn/stock/market/web/BTodayStockController.java
+++ b/src/main/java/cn/stock/market/web/BTodayStockController.java
@@ -35,7 +35,7 @@ public class BTodayStockController {
    @Autowired
    private BtodayStockService btodayStockService;

-    @GetMapping("/api/bToday/kLine")
+    @GetMapping({"/market/api/bToday/kLine","/api/bToday/kLine"})
    @ApiOperation(value = "股票详情K线图",httpMethod = "GET")
    @ApiImplicitParams({
            @ApiImplicitParam(name="exchange",value = "BSE或者NSE"),
@@ -140,7 +140,7 @@ public class BTodayStockController {
                    "fromredis: 标志是否来自 Redis 缓存，false 表示不是", response = JSONObject.class),

    })
-    @GetMapping("/api/bToday/stockDetail")
+    @GetMapping({"/market/api/bToday/stockDetail","/api/bToday/stockDetail"})
    @EncryptFilter(decryptRequest = false)
    public com.alibaba.fastjson.JSONObject getPriceChartCompanyPullView(
            @RequestParam(value = "exchange") String exchange,
--- a/src/main/java/cn/stock/market/web/InfoController.java
+++ b/src/main/java/cn/stock/market/web/InfoController.java
@@ -25,7 +25,7 @@ import springfox.documentation.annotations.ApiIgnore;
 * @created Dec 4, 2018 10:22:44 PM
 */
@RestController
-@RequestMapping("/api/hq/")
+@RequestMapping({"/market/api/hq/","/api/hq/"})
@ApiIgnore
 public class InfoController {
 	@Value("${spring.application.name}")
@@ -40,6 +40,7 @@ public class InfoController {
 	public Map<String, Object> test(@RequestParam(required = false) String key) {
 		Map<String, Object> map = Maps.newHashMap();
 		map.put("stockMarketDbUrl", stockMarketDbUrl);
+		map.put("stockMarketDbUrl1", stockMarketDbUrl);
 		if(StringUtils.isNotBlank(key)) {
 			map.put("key", PropertiesUtil.getProperty(key));
 		}
--- a/src/main/java/cn/stock/market/web/MoneyApiController.java
+++ b/src/main/java/cn/stock/market/web/MoneyApiController.java
@@ -1,5 +1,6 @@
 package cn.stock.market.web;

+import cn.hutool.core.date.DateUtil;
 import cn.stock.market.MoneyStockSuggestDTO;
 import cn.stock.market.domain.basic.entity.MoneyStock;
 import cn.stock.market.domain.basic.repository.MoneyStockRepository;
@@ -37,10 +38,11 @@ import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;

 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;

 /**
@@ -166,7 +168,7 @@ public class MoneyApiController {
                    "priceprevclose: 前一交易日的收盘价\n" +
                    "30DayAvg: 过去30天的平均", response = JSONObject.class),
    })
-    @GetMapping("/api/market/money/getStockDetail")
+    @GetMapping({"/market/api/market/money/getStockDetail","/api/market/money/getStockDetail"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

@@ -509,7 +511,7 @@ public class MoneyApiController {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: top gainer", response = JSONObject.class),
    })
-    @GetMapping("/api/market/money/getTopGainer")
+    @GetMapping({"/market/api/market/money/getTopGainer","/api/market/money/getTopGainer"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

@@ -525,8 +527,10 @@ public class MoneyApiController {
            } else if (StringUtils.equals(stockType, "bse")) {
                moneyStockSuggestDTOS = bseGainer();
            }
-
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            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)){
@@ -552,7 +556,7 @@ public class MoneyApiController {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: TopLoser", response = JSONObject.class),
    })
-    @GetMapping("/api/market/money/getTopLoser")
+    @GetMapping({"/market/api/market/money/getTopLoser","/api/market/money/getTopLoser"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

@@ -565,7 +569,10 @@ public class MoneyApiController {
            }else if(StringUtils.equals(stockType,"bse")){
                moneyStockSuggestDTOS = bseTopLoser();
            }
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            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());
@@ -602,7 +609,7 @@ public class MoneyApiController {
            @ApiResponse(code = 200, message = "" +
                    "股票推荐相关: top active", response = JSONObject.class),
    })
-    @GetMapping("/api/market/money/getTopActives")
+    @GetMapping({"/market/api/market/money/getTopActives","/api/market/money/getTopActives"})
    @ResponseBody
    @EncryptFilter(decryptRequest = false)

@@ -615,7 +622,10 @@ public class MoneyApiController {
            }else if(StringUtils.equals(stockType,"bse")){
                moneyStockSuggestDTOS = bseActives();
            }
-            moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
+            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());
@@ -644,7 +654,7 @@ public class MoneyApiController {



-    @GetMapping("/api/market/money/history/kLine")
+    @GetMapping({"/market/api/market/money/history/kLine","/api/market/money/history/kLine"})
    @ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源",response = StockHistoryResponse.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "symbol", value = "Stock symbol 对应的是NSEID 或者是BSEID", required = true, dataType = "String", paramType = "query"),
@@ -667,24 +677,24 @@ public class MoneyApiController {
        int countback = 5;
        if(StringUtils.equals("H",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (1* 24 * 60 * 60 );
-            countback = 16;
-            request.setResolution("60");
+            from = to - ( 60 * 60 );
+            countback = 60;
+            request.setResolution("1");
        }else if(StringUtils.equals("D",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
            from = to - (24 * 60 * 60 );
-            countback = 30;
-            request.setResolution("60");
+            countback = 390;
+            request.setResolution("1");
        }else if(StringUtils.equals("W",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
-            from = to - (10 * 24 * 60 * 60 );
-            countback = 30;
-            request.setResolution("1D");
+            from = to - (7 * 24 * 60 * 60 );
+            countback = 471;
+            request.setResolution("5");
        }else if(StringUtils.equals("M",resolution)){
            to  = (long) (System.currentTimeMillis() / 1000);
            from = to - (35 * 24 * 60 * 60 );
-            countback = 30;
-            request.setResolution("1D");
+            countback = 328;
+            request.setResolution("30");
        }

        request.setFrom(from);
@@ -716,6 +726,7 @@ public class MoneyApiController {
        }

        if (response != null) {
+            setResponse(response,resolution);
            // API request successful, return the response
            return ResponseEntity.ok(response);
        } else {
@@ -726,6 +737,50 @@ public class MoneyApiController {
        // 返回响应
    }

+    private void setResponse(StockHistoryResponse response,String resolution){
+        if(!"ok".equals(response.getS())){
+            return;
+        }
+        if(Objects.isNull(response.getT())){
+            return;
+        }
+        if(StringUtils.equals("H",resolution) || StringUtils.equals("D",resolution)) {
+            List<Long> t = new ArrayList<>();
+            List<Double> o = new ArrayList<>();
+            List<Double> h = new ArrayList<>();
+            List<Double> l = new ArrayList<>();
+            List<Double> c = new ArrayList<>();
+            List<Long> v = new ArrayList<>();
+
+            //根据时间过滤，只留当天的数据
+            Date currentTime = new Date();
+            //判断最后一条是不是当天的数据，如果不是，把最后一条的时间作为当天的时间
+            long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
+            if(!DateUtil.isSameDay(currentTime, new Date(getTime))){
+                currentTime = new Date(getTime);
+            }
+            int i = 0;
+            for (Long time : response.getT()) {
+                time = time * 1000;
+                if (DateUtil.isSameDay(currentTime, new Date(time))) {
+                    t.add(response.getT().get(i));
+                    o.add(response.getO().get(i));
+                    h.add(response.getH().get(i));
+                    l.add(response.getL().get(i));
+                    c.add(response.getC().get(i));
+                    v.add(response.getV().get(i));
+                }
+                i++;
+            }
+            response.setT(t);
+            response.setO(o);
+            response.setH(h);
+            response.setL(l);
+            response.setC(c);
+            response.setV(v);
+        }
+    }
+



@@ -750,13 +805,16 @@ public class MoneyApiController {


    public static void main(String[] args) {
-        nseGainer();
-        nseActives();
-        nseTopLoser();
-
-        bseActives();
-        bseGainer();
-        bseTopLoser();
+//        nseGainer();
+////        nseActives();
+////        nseTopLoser();
+////
+////        bseActives();
+////        bseGainer();
+////        bseTopLoser();
+        System.out.println(new Date());
+        System.out.println(new Date(1713949200000L));
+        System.out.println(DateUtil.isSameDay(new Date(),new Date(1713949200000L)));
    }

    private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()
--- a/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
+++ b/src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.GetMapping;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -23,7 +24,7 @@ import java.net.URL;
 public class MoneyProxyApiControl {


-    @RequestMapping(value = "/api/proxy/queryStockMoneyProxy",method = RequestMethod.GET)
+    @GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
    public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
        return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
    }
--- a/src/main/java/cn/stock/market/web/SiteNewsController.java
+++ b/src/main/java/cn/stock/market/web/SiteNewsController.java
@@ -18,7 +18,7 @@ import cn.stock.market.domain.basic.service.SiteNewsService;
 import cn.stock.market.utils.ServerResponse;

@Controller
-@RequestMapping({"/api/market/news/", "/api/hq/news/"})
+@RequestMapping({"/market/api/market/news/", "/market/api/hq/news/","/api/market/news/", "/api/hq/news/"})
@Api(tags="新闻资讯")
 public class SiteNewsController {
    private static final Logger log = LoggerFactory.getLogger(SiteNewsController.class);
--- a/src/main/java/cn/stock/market/web/StockApiController.java
+++ b/src/main/java/cn/stock/market/web/StockApiController.java
@@ -56,7 +56,7 @@ import springfox.documentation.annotations.ApiIgnore;

@Controller
@Api(value = "/StockApiController", tags = "股票行情")
-@RequestMapping({"/api/market/stock/", "/api/hq/stock/"})
+@RequestMapping({"/market/api/market/stock/", "/market/api/hq/stock/","/api/market/stock/", "/api/hq/stock/"})
 public class StockApiController {
 	private static final Logger log = LoggerFactory.getLogger(StockApiController.class);

@@ -238,10 +238,19 @@ public class StockApiController {
 	@ResponseBody
 	public ServerResponse getIndiaIndexByToday() {
 		String INDEX_CODE = "TODAY_INDEX";
-		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE, (string) -> {
+		return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,60000, (string) -> {
 			return this.stockService.getIndexByBtoday();
 		});
 	}
+	@RequestMapping({"getIndiaIndexByEttech.do"})
+	@ApiOperation(value = "印度--获取指定指数信息-Ettech", httpMethod = "GET")
+	@ResponseBody
+	public ServerResponse getIndiaIndexByEttech() {
+		String INDEX_CODE = "TODAY_INDEX";
+		return RequestCacheUtils.cache("getIndiaIndexByEttech.do", INDEX_CODE, (string) -> {
+			return this.stockService.getEttechcharts();
+		});
+	}

 	//根据股票id查询 股票指数、大盘指数信息
 	@RequestMapping({"getMarketByStockGid.do"})
--- a/src/main/java/cn/stock/market/web/TodayApiController.java
+++ b/src/main/java/cn/stock/market/web/TodayApiController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;

@Controller
@Api(value = "/TodayApiController", tags = "today股票行情")
-@RequestMapping({"/api/market/today/"})
+@RequestMapping({"/market/api/market/today/","/api/market/today/"})
 public class TodayApiController {

    @RequestMapping({"getTopGainers.do"})
--- a/src/main/java/cn/stock/market/web/TwelveApiController.java
+++ b/src/main/java/cn/stock/market/web/TwelveApiController.java
@@ -0,0 +1,137 @@
+package cn.stock.market.web;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.StringUtil;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import cn.qutaojing.common.utils.SpringUtils;
+import cn.stock.market.dto.StockHistoryResponse;
+import cn.stock.market.dto.TwelveStockInfo;
+import cn.stock.market.utils.HttpRequest;
+import cn.stock.market.utils.ServerResponse;
+import cn.stock.market.web.annotations.EncryptFilter;
+import cn.stock.market.web.config.Config;
+
+/**
+ * twelvedata数据源接口
+ * 
+ */
+@RestController
+@Api(value = "/TwelveApiController", tags = "twelvedata股票行情")
+@Slf4j
+@RequestMapping({"/api/market/twelvedata", "/api/hq/twelvedata"})
+public class TwelveApiController {
+    
+    @ApiOperation(value = "股票详情信息", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCode",value = "股票对应代码",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetail")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetail(String stockCode,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCode,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	TwelveStockInfo info = mapJsonToTwelveStock(data);
+            	log.info("getStockDetail：获取 {}, {} 的股票详情结束，耗时: {} ms ",stockCode,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", info);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCode,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+
+    private TwelveStockInfo mapJsonToTwelveStock(JSONObject jsonObject) {
+    	TwelveStockInfo info = new TwelveStockInfo();
+        if (jsonObject != null && !jsonObject.isEmpty()) {
+        	info.setStockCode(jsonObject.getString("symbol"));
+        	info.setSymbol(jsonObject.getString("symbol"));
+        	info.setStockName(jsonObject.getString("name"));
+        	info.setStockType(jsonObject.getString("exchange"));
+        	info.setLastPrice(jsonObject.getString("close"));
+        	info.setPerchg(jsonObject.getString("percent_change"));
+        	info.setChange(jsonObject.getString("change"));
+        	info.setOpenPrice(jsonObject.getString("open"));
+        	info.setPreviousPrice(jsonObject.getString("previous_close"));
+        	info.setVolume(jsonObject.getString("volume"));
+        	info.setHighPrice(jsonObject.getString("high"));
+        	info.setLowPrice(jsonObject.getString("low"));
+        	JSONObject json = jsonObject.getJSONObject("fifty_two_week");
+        	if(json!=null && !json.isEmpty()) {
+	        	info.setWeek52HighPrice(json.getString("high"));
+	        	info.setWeek52LowPrice(json.getString("low"));
+        	}
+        }
+        return info;
+    }
+    
+    @ApiOperation(value = "股票详情列表", httpMethod = "GET")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "stockCodes",value = "股票对应代码, 多个时以英文逗号分隔",dataType ="String",required = true, paramType = "query"),
+    	@ApiImplicitParam(name = "stockType",value = "股票对应代码:BSE/NSE",dataType ="String",required = true, paramType = "query")
+    })
+    @GetMapping("/getStockDetailList")
+    @EncryptFilter(decryptRequest = false)
+    public ServerResponse<?> getStockDetailList(String stockCodes,String stockType) {
+        try {
+        	long start = System.currentTimeMillis();
+        	Config config = SpringUtils.getBean(Config.class);
+        	String url = String.format("https://api.twelvedata.com/quote?symbol=%s&exchange=%s&apikey=%s",stockCodes,stockType,config.getTwelveApikey());
+            String result = HttpRequest.doTwelveGet(url);
+            if(StringUtil.isNotEmpty(result)) {
+            	JSONObject data = JSONObject.parseObject(result);
+            	List<TwelveStockInfo> list = mapJsonToTwelveList(stockCodes,data);
+            	log.info("getStockDetailList：获取 {}, {} 的股票列表详情结束，耗时: {} ms ",stockCodes,stockType,(System.currentTimeMillis()-start));
+            	return ServerResponse.createBySuccess("操作成功", list);
+            }
+        } catch (Exception e) {
+            log.error("获取股票详情参数：{},{}. Exception:{}" , stockCodes,stockType, e);
+        }
+        return ServerResponse.createBySuccess("操作成功");
+    }
+    
+    private List<TwelveStockInfo> mapJsonToTwelveList(String stockCodes,JSONObject jsonObject) {
+		if (jsonObject == null || jsonObject.isEmpty()) {
+			return new ArrayList<>();
+		}
+		List<TwelveStockInfo> list = new ArrayList<>();
+		String[] items = stockCodes.split(",");
+		if(items!=null && items.length>0) {
+			if(items.length == 1) {
+				TwelveStockInfo info = mapJsonToTwelveStock(jsonObject);
+				list.add(info);
+				return list;
+			}
+			for (String str : items) {
+				JSONObject json = jsonObject.getJSONObject(str);
+				TwelveStockInfo vo = mapJsonToTwelveStock(json);
+				list.add(vo);
+			}
+		}
+		return list;
+    }
+
+
+}
--- 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 twelveApikey;
 }
--- a/src/main/resources/application-base-alpha.yml
+++ b/src/main/resources/application-base-alpha.yml
@@ -42,6 +42,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tJi2z8cegG8fTW7BSQu
 aliyunAccessKeySecret: fnCI9LUcqLuH7D6nkhvSHQMob1JSm8
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
  type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云
--- a/src/main/resources/application-base-prod.yml
+++ b/src/main/resources/application-base-prod.yml
@@ -46,6 +46,7 @@ gugudataAppKey: K5LZKV8KAYM4
 aliyunAccessKeyId: LTAI5tCQRp7t158TVyoF2Yhe
 aliyunAccessKeySecret: glyzOno773Cv7HeWDliveu2H5gX486
 aliyunAppCode: 75ef2615da614eaaa71e2e2058fc53b0
+twelveApikey: 4098a6fc2c3245a88c7da804f10223c2
 # 具体看类:CloudStorageConfig
 oss:
  type: 2 # 类型 1：七牛  2：阿里云  3：腾讯云
--- a/src/test/java/rp/lee/jpa/JpaDDDGen.java
+++ b/src/test/java/rp/lee/jpa/JpaDDDGen.java
@@ -31,9 +31,9 @@ public class JpaDDDGen {
 	 */
 	public static DataSource getMySQLDataSource() {
 		MysqlDataSource mysqlDS = new MysqlDataSource();
-		mysqlDS.setURL("jdbc:mysql://43.132.212.180:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
+		mysqlDS.setURL("jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8");
 		mysqlDS.setUser("root");
-		mysqlDS.setPassword("33BsUUcnXRYgwt");
+		mysqlDS.setPassword("33BsUUcnXRYgwtIND");
 		return mysqlDS;
 	}
 	
@@ -50,7 +50,7 @@ public class JpaDDDGen {
 		/**
 		 * cs_statistic - 要生成的数据库表
 		 */
-		Cons.tableNameToEntiyMapping.put("money_stock", null);
+		Cons.tableNameToEntiyMapping.put("twelve_stock", null);

 		ToolDDD.g(getMySQLDataSource().getConnection());
 	}
Author	SHA1	Message	Date
zhanghuilong	f565132607	详情查询、详情列表查询	2024-05-31 18:11:23 +08:00
zhanghuilong	67a3d6fd74	工具方法	2024-05-31 17:49:52 +08:00
zhanghuilong	c8b0bcd336	抓取全量股票数据入库	2024-05-30 18:27:49 +08:00
zhanghuilong	a12000f99e	twelve_stock实体	2024-05-30 11:10:30 +08:00
william	59a0480be0	Merge branch 'main' into 'develop' # Conflicts: # docker-entrypoint.sh	2024-05-06 12:33:09 +00:00
william	5fe3200ea1	fix bug	2024-05-06 12:31:40 +00:00
vercel	943c6c77e4	fix: 新闻抓取优化	2024-05-05 13:53:46 +08:00
william	b2e93f646c	1	2024-05-01 11:57:12 +08:00
william	9af156cd4a	1	2024-05-01 11:53:13 +08:00
william	8660354dc1	fix bug	2024-05-01 01:35:02 +08:00
william	ed924d85ae	Merge branch 'main' of gitlab.main99.com:india/india_market_java	2024-05-01 01:30:32 +08:00
william	b7f0793d88	修复错误	2024-05-01 01:30:27 +08:00
Administrator	4e9810e074	Merge branch 'develop' into 'main' Merge branch 'main' into 'develop' See merge request india/india_market_java!25	2024-04-30 16:37:43 +00:00
Administrator	d2e186cae6	Merge branch 'main' into 'develop' Main See merge request india/india_market_java!24	2024-04-30 16:19:23 +00:00
william	d8862710a1	兼容路径错误问题	2024-05-01 00:17:46 +08:00
william	efae848b4f	修复环境变量	2024-04-30 21:47:07 +08:00
william	0cec277282	修改命名	2024-04-29 23:35:09 +08:00
Administrator	f6cc52bb9c	更改docker镜像的名称	2024-04-29 10:23:45 +00:00
guoshuai	45fe49a398	Merge branch 'develop' into 'main' fix:优化money股票K线图1w和1m See merge request india/india_market_java!23	2024-04-29 07:16:55 +00:00
xiaoliuhu	e0007aa6cc	fix:优化money股票K线图1w和1m	2024-04-29 14:10:48 +08:00
william	3982de78be	1	2024-04-27 09:00:47 +08:00
william	d24ce12179	1	2024-04-27 08:58:06 +08:00
william	7524952c46	docker镜像构建	2024-04-27 08:46:05 +08:00
guoshuai	40555fcd64	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!22	2024-04-25 11:54:10 +00:00
xiaoliuhu	30d95acdcf	fix:优化money股票K线图	2024-04-25 10:09:59 +08:00
xiaoliuhu	c340bba073	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 22:21:04 +08:00
guoshuai	4a3b75e0c6	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!21	2024-04-24 14:14:25 +00:00
xiaoliuhu	33c83af353	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 22:11:49 +08:00
xiaoliuhu	11130a9eda	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:50:28 +08:00
xiaoliuhu	5a95d6be9a	优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:24:03 +08:00
xiaoliuhu	e680bee42b	fix:优化money股票K线图1H和1D只返回当天数据	2024-04-24 21:18:39 +08:00
xiaoliuhu	fbc7815365	fix:修改economictimes获取指数详情bug	2024-04-20 21:32:52 +08:00
xiaoliuhu	37bb619e24	fix:修改economictimes获取指数详情bug	2024-04-20 21:28:18 +08:00
xiaoliuhu	a7e6cc0b05	fix:拓展可自定义时间缓存接口,app指数接口增加缓存1分钟	2024-04-20 19:20:05 +08:00
xiaoliuhu	ece782497f	fix:app指数接口增加economictimes数据源兜底	2024-04-20 19:11:47 +08:00
zhangjian	4b25467bd2	日志打印优化	2024-04-20 17:16:43 +08:00
zhangjian	5b3cc7e156	印度--获取指定指数信息接口getIndiaIndexByToday.do: BToday添加兜底数据源Growwin	2024-04-20 17:01:59 +08:00
zhangjian	55c9865845	money股票推荐getTopGainer和 getTopLoser接口根据股票名称去重	2024-04-20 14:26:15 +08:00
zhangjian	07d3b0623e	money股票推荐相关getTopActives接口根据股票名称去重	2024-04-20 10:33:50 +08:00
guoshuai	85fe98cc29	Merge branch 'develop' into 'main' hotfix: 脏数据情况下的一个股票处理 See merge request india/india_market_java!20	2024-03-26 11:21:53 +00:00
guoshuai	9d6413bc43	Merge branch 'develop' into 'main' hotfix:价格优化 See merge request india/india_market_java!19	2024-03-21 09:42:50 +00:00
guoshuai	8c472d2973	Merge branch 'develop' into 'main' 代码优化 See merge request india/india_market_java!18	2024-03-18 10:19:06 +00:00
rplees	1d945f126e	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!17	2024-03-15 06:07:14 +00:00
rplees	19cb36b33a	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!16	2024-02-23 09:52:23 +00:00
rplees	a977f7c5fe	Merge branch 'develop' into 'main' 新闻定时任务新增日志信息 See merge request india/india_market_java!15	2024-02-16 10:39:43 +00:00
rplees	f7bf2cb0eb	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!14	2024-02-16 10:13:14 +00:00
guoshuai	de44d54ece	Merge branch 'develop' into 'main' 代码返回参数优化 See merge request india/india_market_java!13	2024-02-15 15:47:04 +00:00
guoshuai	ff2896a0fd	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!12	2024-02-15 15:04:45 +00:00
rplees	877154c1cc	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!11	2024-02-12 14:11:14 +00:00
rplees	96c23943ab	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!10	2024-02-08 12:35:11 +00:00
rplees	930e1e79cf	Merge branch 'develop' into 'main' 新股修改的时间获取 See merge request india/india_market_java!9	2024-02-06 07:42:08 +00:00
rplees	6c429ba58f	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!8	2024-02-02 07:12:48 +00:00
rplees	277ee7dfe4	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!7	2024-01-24 06:27:47 +00:00
rplees	933dadca3c	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!6	2024-01-14 15:09:09 +00:00
li deng	a9704b62ae	Merge branch 'dengli2024/1/11' into 'main' 新闻定时任务 See merge request india/india_market_java!5	2024-01-11 10:16:49 +00:00
dengli	ef392a7fe7	新闻定时任务	2024-01-11 18:04:32 +08:00
rplees	e98b6d0463	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!4	2024-01-09 12:35:18 +00:00
rplees	0a0c969e28	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!3	2024-01-04 07:45:15 +00:00
rplees	2087d8914b	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!2	2024-01-03 12:00:31 +00:00
rplees	42a40b9ff8	Merge branch 'develop' into 'main' Develop See merge request india/india_market_java!1	2023-12-31 11:13:55 +00:00