From a986870d4bccfc098ef8d040869fcacd055cbeb2 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 09:45:45 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/basic/service/StockService.java | 2 +- .../stock/market/web/StockApiController.java | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index fa8d0c9..48cdfab 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -281,7 +281,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("articleBody") + 15, doc.html().indexOf(",\"author\":") - 1); + result = doc.html().substring(doc.html().indexOf("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); } catch (Exception e) { return e.toString(); } diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 1a6d0e1..5a899fb 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -167,6 +167,35 @@ public class StockApiController { return ServerResponse.createBySuccess(newsRepository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.id.desc())); } + @RequestMapping({"test.do"}) + @ApiOperation(value = "印度新闻列表", httpMethod = "GET") + @ResponseBody + public ServerResponse test(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { + String news = stockService.getNews(); + return ServerResponse.createBySuccess(news); + /*List newsList = Arrays.asList(news.split("") + 6, n.indexOf("
") - 47); + + SiteNews siteNews = new SiteNews(); + siteNews.setAddTime(new Date()); + siteNews.setSourceId(id); + siteNews.setTitle(title); + siteNews.setDescription(time); + siteNews.setImgurl(imgUrl); + siteNews.setContent(stockService.getNewsInfo(contentUrl)); + List list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id)); + if (list.size() == 0) { + newsRepository.save(siteNews); + } + });*/ + } + //印度股票时线-K线 @RequestMapping({"getINDTimeK.do"}) @ApiOperation(value = "印度股票K线", httpMethod = "GET") From e87c451b3fcaa7aa391e6022277040b3c78f3fb4 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 09:59:18 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/StockApiController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 5a899fb..60608e4 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -172,10 +172,10 @@ public class StockApiController { @ResponseBody public ServerResponse test(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { String news = stockService.getNews(); - return ServerResponse.createBySuccess(news); - /*List newsList = Arrays.asList(news.split(" Date: Wed, 10 Jan 2024 10:15:48 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/StockApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 60608e4..c933a5b 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -174,7 +174,7 @@ public class StockApiController { String news = stockService.getNews(); List newsList = Arrays.asList(news.split(" { String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2); String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_")); From c646988219baec287aced241e95cf40408d998e0 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 10:20:39 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/domain/basic/service/StockService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 48cdfab..0a5324d 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -281,7 +281,8 @@ 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("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); + //result = doc.html().substring(doc.html().indexOf("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); + result = doc.html(); } catch (Exception e) { return e.toString(); } From a9fe1c39a7cca72026776ed49d912351ac4409f2 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 10:34:21 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/domain/basic/service/StockService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 0a5324d..898baaa 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -272,8 +272,9 @@ public class StockService { return result; } - public String getNewsInfo(String url) { + public List getNewsInfo(String url) { String result = ""; + List list = new ArrayList<>(); try { // 使用Jsoup连接到网页 Document doc = Jsoup.connect(url) @@ -281,12 +282,14 @@ 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("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); - result = doc.html(); + result = doc.html().substring(doc.html().indexOf("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); + list.add(result); + list.add(doc.html().substring(doc.html().indexOf("twitter:description") + 32, doc.html().indexOf(" Date: Wed, 10 Jan 2024 10:36:08 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/stock/market/infrastructure/job/InvestingTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java index e8103d2..1d4942f 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java +++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java @@ -125,7 +125,7 @@ public class InvestingTask { siteNews.setTitle(title); siteNews.setDescription(time); siteNews.setImgurl(imgUrl); - siteNews.setContent(stockService.getNewsInfo(contentUrl)); + //siteNews.setContent(stockService.getNewsInfo(contentUrl)); List list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id)); if (list.size() == 0) { newsRepository.save(siteNews); From a49ad82f3fcfe70661a70a6931d7fc7f0c0d2ea9 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 10:41:06 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/domain/basic/service/StockService.java | 2 +- .../market/infrastructure/job/InvestingTask.java | 6 +++--- .../java/cn/stock/market/web/StockApiController.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 898baaa..677c3ea 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -284,7 +284,7 @@ public class StockService { .get(); result = doc.html().substring(doc.html().indexOf("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); list.add(result); - list.add(doc.html().substring(doc.html().indexOf("twitter:description") + 32, doc.html().indexOf("") + 6, n.indexOf("
") - 47); SiteNews siteNews = new SiteNews(); siteNews.setAddTime(new Date()); siteNews.setSourceId(id); - siteNews.setTitle(title); siteNews.setDescription(time); siteNews.setImgurl(imgUrl); - //siteNews.setContent(stockService.getNewsInfo(contentUrl)); + List newsInfo = stockService.getNewsInfo(contentUrl); + siteNews.setContent(newsInfo.get(0)); + siteNews.setTitle(newsInfo.get(1)); List list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id)); if (list.size() == 0) { newsRepository.save(siteNews); diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index c933a5b..cacd778 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -174,26 +174,26 @@ public class StockApiController { String news = stockService.getNews(); List newsList = Arrays.asList(news.split(" { + newsList.forEach( n -> { String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2); String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_")); String imgUrl = n.substring(n.indexOf("img src=") + 9, n.indexOf("?")); String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9); - String title = n.substring(n.indexOf("html\">") + 6, n.indexOf("
") - 47); SiteNews siteNews = new SiteNews(); siteNews.setAddTime(new Date()); siteNews.setSourceId(id); - siteNews.setTitle(title); siteNews.setDescription(time); siteNews.setImgurl(imgUrl); - siteNews.setContent(stockService.getNewsInfo(contentUrl)); + List newsInfo = stockService.getNewsInfo(contentUrl); + siteNews.setContent(newsInfo.get(0)); + siteNews.setTitle(newsInfo.get(1)); List list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id)); if (list.size() == 0) { newsRepository.save(siteNews); } - });*/ + }); + return ServerResponse.createBySuccess(); } //印度股票时线-K线 From bc3efbc2deec9a578f72788db7b074a2b73be2b3 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 10:41:18 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/StockApiController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index cacd778..a5ed0ac 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -168,7 +168,6 @@ public class StockApiController { } @RequestMapping({"test.do"}) - @ApiOperation(value = "印度新闻列表", httpMethod = "GET") @ResponseBody public ServerResponse test(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { String news = stockService.getNews(); From bc5cf91a88f5e5a9b579fd2c8d1dc4db398f016e Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 10:56:10 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/stock/market/web/StockApiController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index a5ed0ac..f7803f6 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -169,8 +169,9 @@ public class StockApiController { @RequestMapping({"test.do"}) @ResponseBody - public ServerResponse test(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { - String news = stockService.getNews(); + public ServerResponse test(@RequestParam("url") String url, @RequestParam("pageNum") Integer pageNum) { + return ServerResponse.createBySuccess(stockService.getNewsInfo(url)); + /*String news = stockService.getNews(); List newsList = Arrays.asList(news.split(" Date: Wed, 10 Jan 2024 11:01:44 +0800 Subject: [PATCH 11/18] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/basic/service/StockService.java | 12 ++++--- .../api/investing/InvestingApis.java | 31 +++++++++++++++++-- .../api/investing/InvestingInvokerApis.java | 9 ++++++ .../infrastructure/db/po/BtodayStockPO.java | 6 ++++ .../market/infrastructure/job/Scraper.java | 2 ++ 5 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 677c3ea..634e28b 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -945,8 +945,10 @@ public class StockService { market.setName("BSESENSEX指数"); vo1.setIndexVo(market); - String type = "min"; - List list = InvestingApis.of().kline(StockCode.of(stockCode), type); + String period = "P1D"; + String interval = "PT1H"; + String type = "day"; + List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ type = "day"; list = InvestingApis.of().kline(StockCode.of(stockCode), type); @@ -963,8 +965,10 @@ public class StockService { market.setName("NIFTY50指数"); vo2.setIndexVo(market); - String type = "min"; - List list = InvestingApis.of().kline(StockCode.of(stockCode), type); + String period = "P1D"; + String interval = "PT1H"; + String type = "day"; + List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ type = "day"; list = InvestingApis.of().kline(StockCode.of(stockCode), type); diff --git a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java index 0720def..0a74949 100644 --- a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java +++ b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java @@ -153,7 +153,6 @@ public class InvestingApis { "Time": "1698055197", "Url": "/equities/aditya-birla", "Volume": 3693615 - * @param httpClient * @param currPage * @param pageSize * @return @@ -252,7 +251,35 @@ public class InvestingApis { .collect(Collectors.toList()) ; } - + public List kIndex(String code,String period, String interval,String type) throws IOException { + if(code == null) { + throw new RuntimeException("找不到股票信息"); + } + Date nowDate = new Date(); + JSONObject json = InvestingInvokerApis.of().__IndiaIndex(code, period,interval); + return json + .getJSONArray("data") + .stream() + .map(val -> { + JSONArray _ar = (JSONArray) val; + JSONObject item = new JSONObject(); + item.put("date", _ar.get(0)); + item.put("open", _ar.get(1)); + item.put("high", _ar.get(2)); + item.put("low", _ar.get(3)); + item.put("close", _ar.get(4)); + item.put("volume", _ar.get(5)); + return item; + }).filter(val -> { + if("min".equalsIgnoreCase(type)) { + return DateUtil.isSameDay(nowDate, new Date(val.getLong("date"))); + } + return true; + }) + .collect(Collectors.toList()) + ; + } + public static InvestingApis of() { return new InvestingApis(); } diff --git a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingInvokerApis.java b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingInvokerApis.java index 57924da..06b5f2e 100644 --- a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingInvokerApis.java +++ b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingInvokerApis.java @@ -201,6 +201,15 @@ public class InvestingInvokerApis { String body = httpClient().newCall(builder.build()).execute().body().string(); return JSON.parseObject(body); } + + public JSONObject __IndiaIndex(String code,String period, String interval)throws IOException { + String tmpl = "https://api.investing.com/api/financialdata/{}/historical/chart/?period={}&interval={}&pointscount=160"; + String url = StrFormatter.format(tmpl, code, period, interval); + Builder builder = builderGet(url); + + String body = httpClient().newCall(builder.build()).execute().body().string(); + return JSON.parseObject(body); + } public static InvestingInvokerApis of() { return new InvestingInvokerApis(); diff --git a/src/main/java/cn/stock/market/infrastructure/db/po/BtodayStockPO.java b/src/main/java/cn/stock/market/infrastructure/db/po/BtodayStockPO.java index fddb048..5802af8 100644 --- a/src/main/java/cn/stock/market/infrastructure/db/po/BtodayStockPO.java +++ b/src/main/java/cn/stock/market/infrastructure/db/po/BtodayStockPO.java @@ -71,4 +71,10 @@ public class BtodayStockPO { /** * 上次更新时间 */ Date lastUpdateTime; + + /** 是否锁定 0否 1是 */ + Integer isLock; + + /** 是否展示 0是 1否 */ + Integer isShow; } diff --git a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java index fa3e607..18119ce 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/Scraper.java +++ b/src/main/java/cn/stock/market/infrastructure/job/Scraper.java @@ -257,6 +257,8 @@ public class Scraper { btodayStock.setSelfUrl(url); btodayStock.setUrl(detailUrl); btodayStock.setLastUpdateTime(new Date()); + btodayStock.setIsLock(0); + btodayStock.setIsShow(0); btodayStockRepo.save(btodayStock); /* if (webInfo != null) { From 49e7593da5b9590b30ef2c7215d92511468c4376 Mon Sep 17 00:00:00 2001 From: dengli Date: Wed, 10 Jan 2024 11:14:37 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/domain/basic/service/StockService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 27a937a..d6e76f9 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -282,10 +282,9 @@ 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("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); - list.add(doc.html()); - //list.add(result); - //list.add(doc.html().substring(doc.html().indexOf("twitter:description") + 30, doc.html().indexOf(" Date: Wed, 10 Jan 2024 11:19:36 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/domain/basic/service/StockService.java | 4 ++-- src/main/java/cn/stock/market/web/StockApiController.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index acecf96..3557277 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -282,9 +282,9 @@ 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("articleBody") + 13, doc.html().indexOf(",\"author\":") - 1); + 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") + 20, doc.html().indexOf(" newsList = Arrays.asList(news.split(" Date: Wed, 10 Jan 2024 11:25:13 +0800 Subject: [PATCH 15/18] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/domain/basic/service/StockService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 5df92fe..f51a1a0 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -946,7 +946,7 @@ public class StockService { vo1.setIndexVo(market); String period = "P1D"; - String interval = "PT1H"; + String interval = "PT30M"; String type = "day"; List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ @@ -966,7 +966,7 @@ public class StockService { vo2.setIndexVo(market); String period = "P1D"; - String interval = "PT1H"; + String interval = "PT30M"; String type = "day"; List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ From 91a557cc51f5b85217bdd0eaba531c6577d3f8d2 Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Wed, 10 Jan 2024 11:55:45 +0800 Subject: [PATCH 16/18] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stock/market/domain/basic/service/StockService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index f51a1a0..3d1fa2f 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -946,7 +946,7 @@ public class StockService { vo1.setIndexVo(market); String period = "P1D"; - String interval = "PT30M"; + String interval = "PT1M"; String type = "day"; List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ @@ -966,7 +966,7 @@ public class StockService { vo2.setIndexVo(market); String period = "P1D"; - String interval = "PT30M"; + String interval = "PT1M"; String type = "day"; List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ From 8b368cfcc8f0eb2c3760bc0be78e62ab1f5025e6 Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Wed, 10 Jan 2024 12:04:48 +0800 Subject: [PATCH 17/18] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/stock/market/domain/basic/service/StockService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/domain/basic/service/StockService.java b/src/main/java/cn/stock/market/domain/basic/service/StockService.java index 3d1fa2f..818b724 100644 --- a/src/main/java/cn/stock/market/domain/basic/service/StockService.java +++ b/src/main/java/cn/stock/market/domain/basic/service/StockService.java @@ -946,7 +946,7 @@ public class StockService { vo1.setIndexVo(market); String period = "P1D"; - String interval = "PT1M"; + String interval = "PT5M"; String type = "day"; List list = InvestingApis.of().kIndex(stockCode,period,interval, type); if(list == null || list.size() == 0){ From d221ed3d04e110a10e8b1459d580ca4b31def110 Mon Sep 17 00:00:00 2001 From: xiaoliuhu Date: Wed, 10 Jan 2024 16:30:37 +0800 Subject: [PATCH 18/18] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/infrastructure/api/investing/InvestingApis.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java index 0a74949..fa410cf 100644 --- a/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java +++ b/src/main/java/cn/stock/market/infrastructure/api/investing/InvestingApis.java @@ -271,7 +271,7 @@ public class InvestingApis { item.put("volume", _ar.get(5)); return item; }).filter(val -> { - if("min".equalsIgnoreCase(type)) { + if("day".equalsIgnoreCase(type)) { return DateUtil.isSameDay(nowDate, new Date(val.getLong("date"))); } return true;