From 52df45c5210c72fd6f89939780041a4482e41618 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 22 Jul 2025 19:25:20 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 12 +++---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 11 ++++-
src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java | 46 +++++++++++-----------
src/main/java/com/nq/pojo/IndexDateBo.java | 28 ++++++++++++++
src/main/resources/application.yml | 8 ++--
src/main/java/com/nq/service/impl/PayServiceImpl.java | 2
6 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/nq/pojo/IndexDateBo.java b/src/main/java/com/nq/pojo/IndexDateBo.java
new file mode 100644
index 0000000..2ca06e8
--- /dev/null
+++ b/src/main/java/com/nq/pojo/IndexDateBo.java
@@ -0,0 +1,28 @@
+package com.nq.pojo;
+
+import lombok.Data;
+
+/**
+ * @program: dabaogp
+ * @description:指数
+ * @create: 2025-07-21 17:14
+ **/
+@Data
+public class IndexDateBo {
+
+ private String Id; // 指数id 也是指数的pid
+ private String Name; // 股票名称
+ private String Symbol; // 股票编码
+ private String Last; // 股票最新价格
+ private String High; // 最高
+ private String Low; // 最低
+ private String Open; // 今开
+ private String PrevClose; // 昨收
+ private String Time; // 价格更新时间
+ private String Volume; // 交易量
+ private String Chg; // 涨幅
+ private String ChgPct; // 涨幅率
+ private String country_id; // 国家id
+ private String type; // 指数所在的交易所
+
+}
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index eb53af3..a4a6af6 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -914,7 +914,7 @@
.eq(PaymentRecharge::getStatus,1)
.last("limit 1")
);
-
+
if(!vo.getStatus().equals("payin_ing")){
log.error("充值2回调交易中："+vo.toString());
return;
diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index 12a5a4c..ed777bb 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -78,16 +78,16 @@
public ServerResponse<PageInfo> getList(int pageNum, int pageSize, Integer type, String sort, String keyword, HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
List<SiteNews> listData = this.siteNewsMapper.pageList(pageNum, pageSize, type, sort, keyword);
- GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
- //取出每一条数据的内容，进行翻译
- for (SiteNews siteNews : listData) {
- try {
- siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), request.getHeader("lang")));
- siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), request.getHeader("lang")));
- } catch (Exception e) {
- log.error("翻译失败");
- }
- }
+// GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+// //取出每一条数据的内容，进行翻译
+// for (SiteNews siteNews : listData) {
+// try {
+// siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), request.getHeader("lang")));
+// siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), request.getHeader("lang")));
+// } catch (Exception e) {
+// log.error("翻译失败");
+// }
+// }
PageInfo pageInfo = new PageInfo(listData);
pageInfo.setList(listData);
@@ -98,19 +98,19 @@
@Override
public ServerResponse getDetail(int id, HttpServletRequest request) {
SiteNews model = siteNewsMapper.load(id);
- if(model!=null){
- GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
- //取出每一条数据的内容，进行翻译
-
- try {
- model.setContent(googleTranslateUtil.translate(model.getContent(), request.getHeader("lang")));
- model.setTitle(googleTranslateUtil.translate(model.getTitle(), request.getHeader("lang")));
- model.setDescription(googleTranslateUtil.translate(model.getDescription(), request.getHeader("lang")));
- } catch (Exception e) {
- log.error("翻译失败");
- }
- return ServerResponse.createBySuccess(model);
- }
+// if(model!=null){
+// GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+// //取出每一条数据的内容，进行翻译
+//
+// try {
+// model.setContent(googleTranslateUtil.translate(model.getContent(), request.getHeader("lang")));
+// model.setTitle(googleTranslateUtil.translate(model.getTitle(), request.getHeader("lang")));
+// model.setDescription(googleTranslateUtil.translate(model.getDescription(), request.getHeader("lang")));
+// } catch (Exception e) {
+// log.error("翻译失败");
+// }
+// return ServerResponse.createBySuccess(model);
+// }
return ServerResponse.createBySuccess(model);
}
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 34ef33e..df8ffdd 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -40,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -464,10 +465,14 @@
@Override
public ServerResponse getIndexData() {
- Object object = HttpUtil.get(EStockType.JP.stockUrl + "/indices?country_id="+EStockType.JP.contryId+"&key="+EStockType.JP.getStockKey());
+ Object object = HttpUtil.get("http://api-jp.js-stock.top/indices?country_id=35&key=82G6ecXGSN2O1lZJSNSD");
Gson gson = new Gson();
- List<StockIndexData> dataList = gson.fromJson(object.toString(), new TypeToken<List<StockIndexData>>(){}.getType());
- return ServerResponse.createBySuccess(dataList);
+ List<IndexDateBo> dataList = gson.fromJson(object.toString(), new TypeToken<List<IndexDateBo>>(){}.getType());
+ List<String> targetIds = Arrays.asList("535569508", "535569510", "535658223");
+ List<IndexDateBo> filteredList = dataList.stream()
+ .filter(item -> targetIds.contains(item.getId()))
+ .collect(Collectors.toList());
+ return ServerResponse.createBySuccess(filteredList);
}
public ServerResponse<Stock> findStockByName(String name) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8199de9..2d5f0d7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,10 +17,10 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.yanshiz.com/
+ftp.server.http.prefix=https://img.bycarlyle.com/
redis1.ip=localhost
-redis1.port=6380
+redis1.port=6379
redis1.pwd=
redis1.timeout=10000
redis.max.total=50
@@ -40,7 +40,7 @@
admin.super.name=18916320007
-#股票key的地址
+#è¡ç¥¨keyçå°å
#IN_HTTP_API = https://data.is4vc.com/v1
#IN_WS_URL =ws://ws.is4vc.com:8001/websocket-server/v1
#IN_KEY = r3ZAgtcYzuBizmqge2hK
@@ -66,7 +66,7 @@
#HK_KEY = QgiqrYYZem1WWXWbHeT7
JP_HTTP_API = http://api-jp.js-stock.top/
JP_WS_URL = ws://api-jp-ws.js-stock.top
-JP_KEY = XBAhluTZJ9hNvRJ0hHmj
+JP_KEY = k281ultTZyeN7mdUFyZL
#HG_HTTP_API = http://test.js-stock.top/
@@ -138,11 +138,11 @@
us.stock.buy.url = https://push2.eastmoney.com/api/qt/stock/details/get?fields1=f1,f2,f3,f4&fields2=f51,f52,f53,f54,f55&fltt=2&pos=-14&secid=
us.index.url = https://56.push2.eastmoney.com/api/qt/clist/get?pn=1&pz=999&po=1&np=1&ut=bd1d9ddb04089700cf9c27f6f7426281&fltt=2&invt=2&wbp2u=%7C0%7C0%7C0%7Cweb&fid=f3&fs=i:100.NDX,i:100.DJIA,i:100.SPX&fields=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,f26,f22,f33,f11,f62,f128,f136,f115,f152,f124,f107&_=
-#涨停板
+#涨åæ¿
ztb.url =https://push2ex.eastmoney.com/getTopicZTPool?&ut=7eea3edcaed734bea9cbfc24409ed989&dpt=wz.ztzt&Pageindex=0&pagesize=999&sort=fbt%3Aasc&date=20221202&_=
-#改变现价
+#æ¹åç°ä»·
#changePrice.url =http://116.124.132.181/stock/base/cx_gp
#????
home.index.recommend.url=https://guba.sina.cn/api/?s=community&a=get_hot_stock_list&type=cn&num=20&page=1&platform=ios&version=6.10.0
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d058a45..65302fc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -104,9 +104,9 @@
# 地址
host: localhost
# 端口，默认为6379
- port: 6380
+ port: 6379
# 数据库索引
- database: 3
+ database: 0
# 密码
password:
# 连接超时时间
@@ -124,10 +124,10 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:6306/stock-rg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: Err;2[eoGFUriwdgr
+ password: 123456
druid:
# 初始连接数
initialSize: 5
--
Gitblit v1.9.3