From ed02adce53d9f51287e14764815006dd4d040daf Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 18 Jun 2026 21:25:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/ws/WebsocketRunClient.java | 172 ++++++++++++++++++++-------------
src/main/java/com/nq/utils/stock/sina/StockApi.java | 20 +--
src/main/java/com/nq/service/impl/StockServiceImpl.java | 5
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 29 ++++-
src/main/java/com/nq/utils/redis/RedisKeyUtil.java | 65 +++++++++---
5 files changed, 185 insertions(+), 106 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 6567b19..6a42ec9 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -177,7 +177,10 @@
stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
List<StockListVO> stockListVOS = Lists.newArrayList();
if (stockList.size() > 0){
- stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
+ List<StockListVO> realTimes = StockApi.getStockReailTimes(stockList);
+ if (realTimes != null) {
+ stockListVOS.addAll(realTimes);
+ }
}
RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
diff --git a/src/main/java/com/nq/utils/redis/RedisKeyUtil.java b/src/main/java/com/nq/utils/redis/RedisKeyUtil.java
index 731b0bb..04b3038 100644
--- a/src/main/java/com/nq/utils/redis/RedisKeyUtil.java
+++ b/src/main/java/com/nq/utils/redis/RedisKeyUtil.java
@@ -10,6 +10,7 @@
import com.nq.pojo.StockRealTimeBean;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.stock.sina.StockApi;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,19 +65,44 @@
}
if(stockRealTimeBean == null){
String s = doPost(stock.getStockCode());
- Map<String, Object> stringObjectMap = jsonToMap(s);
- stockRealTimeBean = new StockRealTimeBean();
- stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct").toString());
- stockRealTimeBean.setLast(stringObjectMap.get("Last").toString());
- stockRealTimeBean.setHigh(stringObjectMap.get("High").toString());
- stockRealTimeBean.setLow(stringObjectMap.get("Low").toString());
- stockRealTimeBean.setBid(stringObjectMap.get("Id").toString());
- stockRealTimeBean.setPc(stringObjectMap.get("PrevClose").toString());
- stockRealTimeBean.setAsk(stringObjectMap.get("Ask").toString());
+ if (StringUtils.isBlank(s)) {
+ stockRealTimeBean = buildFallbackRealTime(stock);
+ } else {
+ try {
+ Map<String, Object> stringObjectMap = jsonToMap(s);
+ stockRealTimeBean = new StockRealTimeBean();
+ stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct").toString());
+ stockRealTimeBean.setLast(stringObjectMap.get("Last").toString());
+ stockRealTimeBean.setHigh(stringObjectMap.get("High").toString());
+ stockRealTimeBean.setLow(stringObjectMap.get("Low").toString());
+ stockRealTimeBean.setBid(stringObjectMap.get("Id").toString());
+ stockRealTimeBean.setPc(stringObjectMap.get("PrevClose").toString());
+ stockRealTimeBean.setAsk(stringObjectMap.get("Ask").toString());
+ stockRealTimeBean.setPid(stock.getStockCode());
+ } catch (Exception e) {
+ log.warn("解析实时行情失败, code={}, err={}", stock.getStockCode(), e.getMessage());
+ stockRealTimeBean = buildFallbackRealTime(stock);
+ }
+ }
}
- stockRealTimeBean.setPcp(stockRealTimeBean.getPcp().replace("%",""));
+ if (stockRealTimeBean.getPcp() != null) {
+ stockRealTimeBean.setPcp(stockRealTimeBean.getPcp().replace("%",""));
+ }
return stockRealTimeBean;
+ }
+
+ private static StockRealTimeBean buildFallbackRealTime(Stock stock) {
+ StockRealTimeBean bean = new StockRealTimeBean();
+ bean.setPid(stock.getStockCode());
+ bean.setLast("0");
+ bean.setHigh("0");
+ bean.setLow("0");
+ bean.setBid("0");
+ bean.setAsk("0");
+ bean.setPc("0");
+ bean.setPcp("0");
+ return bean;
}
public static Map<String, Object> jsonToMap(String json) {
@@ -155,16 +181,16 @@
private static String executePostRequest(String pid) {
String apiUrl = PropertiesUtil.getProperty("JS_IN_HTTP_URL") +
"stock?key=" + PropertiesUtil.getProperty("JS_IN_KEY");
-
+ HttpURLConnection connection = null;
try {
URL url = new URL(apiUrl);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
connection.setDoOutput(true);
- connection.setConnectTimeout(5000);
- connection.setReadTimeout(10000);
+ connection.setConnectTimeout(3000);
+ connection.setReadTimeout(5000);
String postData = "pid=" + pid;
@@ -173,9 +199,8 @@
os.write(input, 0, input.length);
}
- // 读取响应
try (BufferedReader in = new BufferedReader(
- new InputStreamReader(connection.getInputStream()))) {
+ new InputStreamReader(connection.getInputStream(), "utf-8"))) {
StringBuilder response = new StringBuilder();
String inputLine;
@@ -187,8 +212,12 @@
}
} catch (Exception e) {
- e.printStackTrace();
- return null; // 返回null表示请求失败
+ log.warn("拉取实时行情失败 pid={}, err={}", pid, e.getMessage());
+ return null;
+ } finally {
+ if (connection != null) {
+ connection.disconnect();
+ }
}
}
diff --git a/src/main/java/com/nq/utils/stock/sina/StockApi.java b/src/main/java/com/nq/utils/stock/sina/StockApi.java
index 369dc63..3ec429b 100644
--- a/src/main/java/com/nq/utils/stock/sina/StockApi.java
+++ b/src/main/java/com/nq/utils/stock/sina/StockApi.java
@@ -33,18 +33,17 @@
return null;
}
List<StockListVO> stockListVOs = new ArrayList<>();
- try {
- for (int i = 0; i < stocks.size(); i++) {
- Stock stock = stocks.get(i);
+ for (Stock stock : stocks) {
+ try {
StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
StockListVO stockListVO = new StockListVO();
stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
- stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
- if(realTimeStock.getPcp().contains("-")){
+ stockListVO.setHcrateP(realTimeStock.getPcp() + "%");
+ if (realTimeStock.getPcp().contains("-")) {
stockListVO.setColor(0);
- }else{
+ } else {
stockListVO.setColor(1);
- stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
+ stockListVO.setHcrateP(realTimeStock.getPcp() + "%");
}
stockListVO.setNowPrice(realTimeStock.getLast());
stockListVO.setToday_max(realTimeStock.getHigh());
@@ -61,12 +60,9 @@
stockListVO.setStock_plate(stock.getStockPlate());
stockListVO.setStock_type(stock.getStockType());
stockListVOs.add(stockListVO);
+ } catch (Exception e) {
+ log.warn("组装股票实时行情失败 code={}, err={}", stock.getStockCode(), e.getMessage());
}
-
-
- } catch (Exception e) {
- e.printStackTrace();
- return null;
}
return stockListVOs;
}
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 3b8a3a0..38ba2d2 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -22,24 +22,39 @@
Map<String, WebSocketClient> retMap = new HashMap<>(2);
try {
- WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("JS_IN_WS_URL")),EStockType.IN);
+ WebsocketRunClient websocketRunClient = new WebsocketRunClient(
+ new URI(PropertiesUtil.getProperty("JS_IN_WS_URL")), EStockType.IN);
websocketRunClient.connect();
websocketRunClient.setConnectionLostTimeout(0);
+ retMap.put(EStockType.IN.getCode(), websocketRunClient);
new Thread(() -> {
- while (true) {
+ while (!Thread.currentThread().isInterrupted()) {
try {
Thread.sleep(8000);
+ if (!websocketRunClient.isOpen()) {
+ log.warn("印度股票 websocket 未连接，尝试重连");
+ websocketRunClient.reconnectBlocking();
+ websocketRunClient.setConnectionLostTimeout(0);
+ continue;
+ }
websocketRunClient.send("heartbeat".getBytes());
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ break;
} catch (Exception e) {
- websocketRunClient.reconnect();
- websocketRunClient.setConnectionLostTimeout(0);
+ log.warn("印度股票 websocket 保活异常: {}", e.getMessage());
+ try {
+ websocketRunClient.reconnectBlocking();
+ websocketRunClient.setConnectionLostTimeout(0);
+ } catch (Exception reconnectEx) {
+ log.warn("印度股票 websocket 重连失败: {}", reconnectEx.getMessage());
+ }
}
}
- }).start();
+ }, "ws-in-keepalive").start();
} catch (Exception e) {
+ log.error("印度股票 websocket 初始化失败", e);
}
-
-
return retMap;
}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 9c2fd8a..59643e3 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -1,131 +1,167 @@
package com.nq.ws;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nq.enums.EStockType;
import com.nq.pojo.StockRealTimeBean;
-import com.nq.service.IMandatoryLiquidationService;
-import com.nq.service.impl.MandatoryLiquidationService;
-import com.nq.utils.ApplicationContextRegisterUtil;
import com.nq.utils.redis.RedisKeyUtil;
import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
-import org.springframework.context.ApplicationContext;
import java.io.IOException;
import java.lang.reflect.Type;
import java.net.URI;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
@Slf4j
-public class WebsocketRunClient extends WebSocketClient {
+public class WebsocketRunClient extends WebSocketClient {
- private EStockType eStockType;
- public WebsocketRunClient(URI serverUri,
- EStockType eStockType
- ) {
+ private static final int HTTP_CONNECT_TIMEOUT_MS = 2000;
+ private static final int HTTP_SOCKET_TIMEOUT_MS = 3000;
+
+ private static final CloseableHttpClient HTTP_CLIENT = HttpClients.custom()
+ .setDefaultRequestConfig(RequestConfig.custom()
+ .setConnectTimeout(HTTP_CONNECT_TIMEOUT_MS)
+ .setConnectionRequestTimeout(HTTP_CONNECT_TIMEOUT_MS)
+ .setSocketTimeout(HTTP_SOCKET_TIMEOUT_MS)
+ .build())
+ .setMaxConnTotal(20)
+ .setMaxConnPerRoute(10)
+ .build();
+
+ private final EStockType eStockType;
+ private Timer heartbeatTimer;
+ private volatile boolean localNotifyEnabled = true;
+
+ public WebsocketRunClient(URI serverUri, EStockType eStockType) {
super(serverUri);
this.eStockType = eStockType;
}
- private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
+ private void startHeartbeat() {
+ stopHeartbeat();
+ heartbeatTimer = new Timer("ws-heartbeat-" + eStockType.getCode(), true);
+ heartbeatTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (!isOpen()) {
+ return;
+ }
+ try {
+ sendAuthKey();
+ } catch (Exception e) {
+ log.warn("websocket {} 心跳失败: {}", eStockType.getCode(), e.getMessage());
+ }
+ }
+ }, 0, 3000);
+ }
+ private void stopHeartbeat() {
+ if (heartbeatTimer != null) {
+ heartbeatTimer.cancel();
+ heartbeatTimer = null;
+ }
+ }
- private static HttpPost httpPost;
- static {
- httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification"); // 初始化 HttpPost
+ private void sendAuthKey() {
+ send(("key:" + eStockType.getStockKey() + ":" + eStockType.getContryId()).getBytes());
}
@Override
public void onOpen(ServerHandshake serverHandshake) {
- send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
- Timer heartbeatTimer;
- // 启动心跳定时器
- heartbeatTimer = new Timer();
- heartbeatTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
- }
- }, 0, 3000); // 每3秒发送一次心跳消息
+ sendAuthKey();
+ startHeartbeat();
}
@Override
public void onMessage(String s) {
- if(!s.equals("pong") && !s.equals("身份验证成功")){
+ if ("pong".equals(s) || "身份验证成功".equals(s)) {
+ log.debug("websocket {} 握手/心跳: {}", eStockType.getCode(), s);
+ return;
+ }
+ try {
Map<String, String> stringObjectMap = jsonToMap(s);
StockRealTimeBean stockRealTimeBean = new StockRealTimeBean();
- stockRealTimeBean.setPid(stringObjectMap.get("Id").toString());
- stockRealTimeBean.setLast(stringObjectMap.get("Last").toString());
- stockRealTimeBean.setBid(stringObjectMap.get("Bid").toString());
- stockRealTimeBean.setAsk(stringObjectMap.get("Ask").toString());
- stockRealTimeBean.setHigh(stringObjectMap.get("High").toString());
- stockRealTimeBean.setLow(stringObjectMap.get("Low").toString());
- stockRealTimeBean.setPc(stringObjectMap.get("Chg").toString());
- stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct").toString()+"%");
- stockRealTimeBean.setTime(stringObjectMap.get("Time").toString());
- RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockRealTimeBean);
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- if(!stockRealTimeBean.getPcp().contains("-")){
- stockRealTimeBean.setPcp("+"+stringObjectMap.get("ChgPct").toString()+"%");
- }
- String json = objectMapper.writeValueAsString(stockRealTimeBean);
- sendLoca(json);
- StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
- RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
+ stockRealTimeBean.setPid(stringObjectMap.get("Id"));
+ stockRealTimeBean.setLast(stringObjectMap.get("Last"));
+ stockRealTimeBean.setBid(stringObjectMap.get("Bid"));
+ stockRealTimeBean.setAsk(stringObjectMap.get("Ask"));
+ stockRealTimeBean.setHigh(stringObjectMap.get("High"));
+ stockRealTimeBean.setLow(stringObjectMap.get("Low"));
+ stockRealTimeBean.setPc(stringObjectMap.get("Chg"));
+ stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct") + "%");
+ stockRealTimeBean.setTime(stringObjectMap.get("Time"));
+ RedisKeyUtil.setCacheRealTimeStock(EStockType.IN, stockRealTimeBean);
- }else{
- log.error("websocket 消息错误："+s);
+ if (!stockRealTimeBean.getPcp().contains("-")) {
+ stockRealTimeBean.setPcp("+" + stringObjectMap.get("ChgPct") + "%");
+ }
+ if (localNotifyEnabled) {
+ ObjectMapper objectMapper = new ObjectMapper();
+ sendLocal(objectMapper.writeValueAsString(stockRealTimeBean));
+ }
+ StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
+ RedisKeyUtil.setCacheRealTimeStock(EStockType.IN, stockDetailBean);
+ } catch (Exception e) {
+ log.warn("websocket {} 消息处理失败: {}", eStockType.getCode(), e.getMessage());
}
}
public static Map<String, String> jsonToMap(String json) {
Gson gson = new Gson();
- Type type = new TypeToken<Map<String, String>>(){}.getType();
+ Type type = new TypeToken<Map<String, String>>() {
+ }.getType();
return gson.fromJson(json, type);
}
@Override
public void onClose(int i, String s, boolean b) {
- log.info("websocket 印度股票 关闭"+1);
+ stopHeartbeat();
+ log.info("websocket {} 连接关闭 code={} reason={} remote={}", eStockType.getCode(), i, s, b);
}
@Override
public void onError(Exception e) {
- log.info("websocket 错误");
+ log.warn("websocket {} 错误: {}", eStockType.getCode(), e.getMessage());
}
- public void sendLoca(String message) {
+ /**
+ * 推送本地通知服务；必须 consume 响应体，否则 HttpClient 连接池会泄漏。
+ */
+ public void sendLocal(String message) {
+ HttpPost httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification");
+ CloseableHttpResponse response = null;
try {
- // 准备 form-data 参数
List<BasicNameValuePair> params = new ArrayList<>();
params.add(new BasicNameValuePair("message", message));
-
- // 设置编码格式为 UTF-8
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
- httpPost.setEntity(entity); // 设置 HttpPost 对象的参数
-
- // 发送请求
- HttpResponse response = httpClient.execute(httpPost);
-
- // 处理响应
- int statusCode = response.getStatusLine().getStatusCode();
+ httpPost.setEntity(new UrlEncodedFormEntity(params, StandardCharsets.UTF_8));
+ response = HTTP_CLIENT.execute(httpPost);
+ EntityUtils.consume(response.getEntity());
} catch (IOException e) {
- log.error("Http 请求错误", e);
+ localNotifyEnabled = false;
+ log.warn("本地通知服务不可用，已暂停推送(127.0.0.1:8001): {}", e.getMessage());
+ } finally {
+ if (response != null) {
+ try {
+ response.close();
+ } catch (IOException ignored) {
+ }
+ }
}
}
}
--
Gitblit v1.9.3