From 87ae8174c670dad02f4da2ab66df32dd573a03a8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 22 Aug 2024 14:33:58 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
index 6aa9363..c6edc71 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -1,10 +1,10 @@
package org.example.websocket.server;
-import cn.hutool.core.util.NumberUtil;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -20,26 +20,17 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import javax.annotation.PostConstruct;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
/**
* @ClassDescription: websocket服务端
@@ -86,15 +77,20 @@
private boolean hasReceivedSubscription(Session session) {
WsBo wsBo = getWsBoForSession(session.getId());
- String s = RedisUtil.get("user_" + wsBo.getUserId());
- if(null == s || s.isEmpty() && !wsBo.getToken().equals(s)){
+ String s = RedisUtil.get(wsBo.getUserId().toString());
+ if(StringUtils.isEmpty(s) || !wsBo.getToken().equals(s)){
closeSession(session, "用户未登录");
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ return false;
}
return wsBo != null;
}
@OnError
public void onError(Session session, @NonNull Throwable throwable) {
+ onClose();
log.error("连接发生报错: {}", throwable.getMessage());
throwable.printStackTrace();
}
@@ -102,6 +98,7 @@
@OnClose
public void onClose() {
int count = onlineCount.decrementAndGet();
+ threadLocalData.remove(session.getId());
wsServers.remove(this);
cancelScheduledTasks(); // 取消定时任务
log.info("服务端断开连接，当前连接的客户端数量为：{}", count);
@@ -119,6 +116,18 @@
try {
if(!message.equals("ping")){
WsBo bean = JSONUtil.toBean(message, WsBo.class);
+ if(null == bean){
+ log.error("没有订阅消息");
+ closeSession(session,null);
+ }
+ String s = RedisUtil.get(bean.getUserId().toString());
+ if(StringUtils.isEmpty(s)){
+ log.error("未登录");
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ closeSession(session,null);
+ }
threadLocalData.put(session.getId(), bean);
}
}catch (Exception e){
@@ -152,6 +161,7 @@
sessionLock.unlock();
}
} else {
+ closeSession(session, "会话不存在或已关闭");
log.error("会话不存在或已关闭，无法发送消息");
}
} catch (Exception e) {
@@ -172,19 +182,34 @@
private void schedulePushMessage(Session session, String message) throws JsonProcessingException {
WsBo wsBo = getWsBoForSession(session.getId());
+
if (wsBo != null) {
+
+ String s = RedisUtil.get(wsBo.getUserId().toString());
+ if(StringUtils.isEmpty(s) || !s.equals(wsBo.getToken())){
+ Map<String,Integer> map = new HashMap<>();
+ map.put("status",1);
+ pushMessage(session,JSONUtil.toJsonStr(map));
+ closeSession(session,"登录状态失效");
+ }
+
+
long currentTime = System.currentTimeMillis();
long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
int time = wsBo.getTime();
- message = megFiltration(wsBo,message);
- if (currentTime - lastMessageTime >= time * 1000) {
- // 时间间隔达到要求，可以发送消息
+ if(wsBo.getPushNow()){
+ message = megFiltration(wsBo,message);
pushMessage(session, message);
lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
- } else {
- // 时间间隔未达到，不发送消息，可以记录日志或者其他操作
-// log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
+ wsBo.setPushNow(false);
+ }else{
+ message = megFiltration(wsBo,message);
+ if (currentTime - lastMessageTime >= time * 1000) {
+ // 时间间隔达到要求，可以发送消息
+ pushMessage(session, message);
+ lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
+ }
}
}
}
@@ -215,8 +240,9 @@
}
//价差
redisValueMap = redisValueMap.stream()
- .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
+ .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread() && Double.parseDouble(data.getSpread()) <= 1000)
.collect(Collectors.toList());
+
//最低金额
if(null != wsBo.getMinAmount()){
redisValueMap = redisValueMap.stream()
@@ -246,6 +272,7 @@
.filter(data -> list.contains(data.getBuyAndSell()))
.forEach(data -> data.setMarker(true));
}
+ map.put("uuid",wsBo.getUuid());
map.put("current",wsBo.getCurrent());
map.put("sizes",wsBo.getSizes());
map.put("total",redisValueMap.size());
@@ -321,12 +348,9 @@
// 关闭会话的方法
private void closeSession(Session session, String reason) {
- try {
- session.close(new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, reason));
- } catch (IOException e) {
- log.error("强制断开连接----异常: {}", e.getMessage());
- }
+ threadLocalData.remove(session.getId());
wsServers.remove(this);
- log.info("客户端未及时发送订阅消息，断开连接");
+ log.info(reason);
+ onClose();
}
}
--
Gitblit v1.9.3