From 6fb4fda8659d6202b34d2347fb0d481446e28ee3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 08 Oct 2024 15:56:23 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 2
src/main/resources/application.properties | 8
src/main/java/com/nq/vo/user/UserOut.java | 5
src/main/java/com/nq/ws/WebsocketRunClient.java | 210 ++++++++-------
src/main/java/com/nq/service/impl/UserAssetsServices.java | 3
src/main/java/com/nq/service/impl/StockServiceImpl.java | 23 -
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 96 +++---
src/main/java/com/nq/enums/EUserAssets.java | 1
src/main/java/com/nq/service/impl/PriceServicesImpl.java | 59 +++-
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 7
src/main/java/com/nq/ws/WsClientConfig.java | 338 +++++++++++++-------------
src/main/java/com/nq/service/impl/UserServiceImpl.java | 1
12 files changed, 393 insertions(+), 360 deletions(-)
diff --git a/src/main/java/com/nq/enums/EUserAssets.java b/src/main/java/com/nq/enums/EUserAssets.java
index 4036884..20a9382 100644
--- a/src/main/java/com/nq/enums/EUserAssets.java
+++ b/src/main/java/com/nq/enums/EUserAssets.java
@@ -8,6 +8,7 @@
HANDLING_CHARGE("HANDLING_CHARGE","手续费"),
+ NEW_HANDLING_CHARGE("NEW_HANDLING_CHARGE","新股手续费"),
CALCULATE_PROFIT_AND_LOSS("CALCULATE_PROFIT_AND_LOSS","计算盈亏"),
CLOSE_POSITION_RETURN_SECURITY_DEPOSIT("CLOSE_POSITION_RETURN_SECURITY","平仓返回保证金"),
diff --git a/src/main/java/com/nq/service/impl/PriceServicesImpl.java b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
index 2d45332..05dd037 100644
--- a/src/main/java/com/nq/service/impl/PriceServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
@@ -13,6 +13,7 @@
import com.nq.pojo.*;
import com.nq.service.IPriceServices;
import com.nq.service.IStockConfigServices;
+import com.nq.utils.PropertiesUtil;
import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.timeutil.TimeUtil;
@@ -20,8 +21,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.*;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.io.BufferedReader;
@@ -67,19 +67,19 @@
if(stockSetting.getType().equals("0")){
return new BigDecimal(stockSetting.getPrice());
}else{
- String s = doGet(stock.getStockCode());
+ String s = doPost(stock.getStockCode());
if(null != s){
Map<String, Object> stringObjectMap = jsonToMap(s);
- return new BigDecimal(stringObjectMap.get("last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+ return new BigDecimal(stringObjectMap.get("Last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
}
}
}
}
- String s = doGet(stock.getStockCode());
+ String s = doPost(stock.getStockCode());
if(null != s) {
Map<String, Object> stringObjectMap = jsonToMap(s);
- return new BigDecimal(stringObjectMap.get("last").toString());
+ return new BigDecimal(stringObjectMap.get("Last").toString());
}
return BigDecimal.ZERO;
}
@@ -87,7 +87,7 @@
@Override
public Map<String, Object> getNewStock(String stockCode) {
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
- String s = doGet(stock.getStockCode());
+ String s = doPost(stock.getStockCode());
if(null != s){
Map<String, Object> stringObjectMap = jsonToMap(s);
return stringObjectMap;
@@ -110,28 +110,47 @@
}
}
- public String doGet(String pid){
- String apiUrl = "http://api-in-2.js-stock.top/stock?pid="+pid+"&key=eVKtHt7aG4m6ozwWL9qG";
- try {
- URL url = new URL(apiUrl);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
+ public String doPost(String pid) {
+ // 从配置中获取 API URL，并拼接 key
+ String apiUrl = PropertiesUtil.getProperty("JS_IN_HTTP_URL") + "stock?key=" + PropertiesUtil.getProperty("JS_IN_KEY");
+ String result = null;
+ try {
+ URL url = new URL(apiUrl);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
- String inputLine;
- StringBuffer response = new StringBuffer();
+ // 设置请求方法为 POST
+ connection.setRequestMethod("POST");
+ // 设置请求头
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ connection.setDoOutput(true); // 允许向连接输出
- while ((inputLine = in.readLine()) != null) {
+ // 构建 POST 数据
+ String postData = "pid=" + pid;
+
+ // 发送 POST 请求
+ try (OutputStream os = connection.getOutputStream()) {
+ byte[] input = postData.getBytes("utf-8");
+ os.write(input, 0, input.length);
+ }
+
+ // 读取响应
+ BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ String inputLine;
+ StringBuffer response = new StringBuffer();
+
+ while ((inputLine = in.readLine()) != null) {
response.append(inputLine);
}
in.close();
- return response.toString();
- } catch (Exception e) {
+ result = response.toString();
+ } catch (Exception e) {
e.printStackTrace();
}
- return null;
+ return result;
}
+
+
@Override
public boolean isLimitUpBuy(String stockCode) {
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 7142531..5aefa76 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -177,23 +177,6 @@
if (stockList.size() > 0){
stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
}
-
- // Create a list to hold Futures
- List<CompletableFuture<Void>> futures = new ArrayList<>();
-
- // Use CompletableFuture to perform asynchronous processing for each stockListVO
-// for (StockListVO stockListVO : stockListVOS) {
-// CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
-// stockListVO.setNowPrice(iPriceServices.getNowPrice(stockListVO.getCode(), stockType).toString());
-// Map<String, Object> newStock = iPriceServices.getNewStock(stockListVO.getCode());
-// stockListVO.setHcrateP(newStock.get("pcp").toString());
-// });
-// futures.add(future);
-// }
-//
-// // Wait for all futures to complete
-// CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
pageInfo.setStockType(stockType);
@@ -223,9 +206,9 @@
stockVO.setSpell(stock.getStockSpell());
stockVO.setGid(stock.getStockGid().toUpperCase());
Map<String, Object> newStock = iPriceServices.getNewStock(stock.getStockCode());
- stockVO.setHcrate(newStock.get("pcp").toString().replaceAll("%", ""));
- stockVO.setToday_max(newStock.get("high").toString());
- stockVO.setToday_min(newStock.get("low").toString());
+ stockVO.setHcrate(newStock.get("ChgPct").toString().replaceAll("%", ""));
+ stockVO.setToday_max(newStock.get("High").toString());
+ stockVO.setToday_min(newStock.get("Low").toString());
if(null != cacheBaseStock){
stockVO.setOpen_px(cacheBaseStock.getOpen());
stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 9c70224..cde2574 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -224,6 +224,9 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.NEW_HANDLING_CHARGE.getCode())){
+ userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
+ extracted(amount.negate(),userAssets);
}
if(null != userPosition){
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index bbeb08f..27b2712 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1301,7 +1301,9 @@
userPosition.setOrderTotalPrice(userStockSubscribe.getBond());
// BigDecimal buy_fee_amt = buy_amt.multiply(siteSetting.getBuyFee()).setScale(2, 4);
- BigDecimal buy_fee_amt = new BigDecimal(0);
+ // 手续费率
+ BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+ BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(userStockSubscribe.getBond());
log.info("用户购买手续费（配资后总资金 * 百分比） = {}", buy_fee_amt);
userPosition.setOrderFee(buy_fee_amt);
@@ -1333,9 +1335,8 @@
if(null == userAssets){
return ServerResponse.createByErrorMsg("新股转持仓失败");
}
-// userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
-// userAssets.setFreezeMoney(userAssets.getFreezeMoney()!=null?userAssets.getFreezeMoney().setScale(2,BigDecimal.ROUND_UP):null);
userAssetsMapper.updateById(userAssets);
+ iUserAssetsServices.availablebalanceChange(stock.getStockType(), userAssets.getUserId(), EUserAssets.NEW_HANDLING_CHARGE, buy_fee_amt, "", "");
if (ret > 0) {
userStockSubscribe.setStatus(5);
userStockSubscribeMapper.update1(userStockSubscribe);
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 24daae5..03d92ad 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -862,6 +862,7 @@
userOut.setTotalMoney(rUserAssets.getTotalMoney().equals("0E-8") ? "0" : rUserAssets.getTotalMoney());
userOut.setFreezeMoney(rUserAssets.getFreezeMoney().equals("0E-8") ? "0" : rUserAssets.getFreezeMoney());
userOut.setAvailableBalance(rUserAssets.getAvailableBalance().equals("0E-8") ? "0" : rUserAssets.getAvailableBalance());
+ userOut.setAmountToBeCovered(rUserAssets.getAmountToBeCovered());
}
userOutMap.put(user.getId(), userOut);
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 4877188..90ddefa 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -284,9 +284,9 @@
}
}
ret = userStockSubscribeMapper.update1(model);
+ userAssetsMapper.updateById(userAssets);
iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
model.setStatus(5);
- userAssetsMapper.updateById(userAssets);
}else{
if(model.getApplyNumber()>model.getApplyNums()){
return ServerResponse.createByErrorMsg("配置中签数量不能超过申请数量",request);
diff --git a/src/main/java/com/nq/vo/user/UserOut.java b/src/main/java/com/nq/vo/user/UserOut.java
index 857e87a..60d9235 100644
--- a/src/main/java/com/nq/vo/user/UserOut.java
+++ b/src/main/java/com/nq/vo/user/UserOut.java
@@ -26,4 +26,9 @@
* */
private String freezeMoney;
+ /**
+ * 待补资金
+ * */
+ private String amountToBeCovered;
+
}
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 355774e..3b8a3a0 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,48 +1,48 @@
-//package com.nq.ws;
-//
-//
-//import com.nq.enums.EStockType;
-//import com.nq.utils.PropertiesUtil;
-//import lombok.extern.slf4j.Slf4j;
-//import org.java_websocket.client.WebSocketClient;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import java.net.URI;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Slf4j
-//@Configuration
-//public class WebSocketClientBeanConfig {
-//
-//
-// @Bean
-// public Map<String, WebSocketClient> websocketRunClientMap() {
-//
-// Map<String, WebSocketClient> retMap = new HashMap<>(2);
-// try {
-// WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("JS_IN_WS_URL")),EStockType.IN);
-// websocketRunClient.connect();
-// websocketRunClient.setConnectionLostTimeout(0);
-// new Thread(() -> {
-// while (true) {
-// try {
-// Thread.sleep(8000);
-// websocketRunClient.send("heartbeat".getBytes());
-// } catch (Exception e) {
-// websocketRunClient.reconnect();
-// websocketRunClient.setConnectionLostTimeout(0);
-// }
-// }
-// }).start();
-// } catch (Exception e) {
-// }
-//
-//
-//
-// return retMap;
-// }
-//
-//
-//}
+package com.nq.ws;
+
+
+import com.nq.enums.EStockType;
+import com.nq.utils.PropertiesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.java_websocket.client.WebSocketClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+public class WebSocketClientBeanConfig {
+
+
+ @Bean
+ public Map<String, WebSocketClient> websocketRunClientMap() {
+
+ Map<String, WebSocketClient> retMap = new HashMap<>(2);
+ try {
+ WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("JS_IN_WS_URL")),EStockType.IN);
+ websocketRunClient.connect();
+ websocketRunClient.setConnectionLostTimeout(0);
+ new Thread(() -> {
+ while (true) {
+ try {
+ Thread.sleep(8000);
+ websocketRunClient.send("heartbeat".getBytes());
+ } catch (Exception e) {
+ websocketRunClient.reconnect();
+ websocketRunClient.setConnectionLostTimeout(0);
+ }
+ }
+ }).start();
+ } catch (Exception e) {
+ }
+
+
+
+ return retMap;
+ }
+
+
+}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 8b31e4b..69f4020 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -1,52 +1,54 @@
-//package com.nq.ws;
-//
-//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.entity.UrlEncodedFormEntity;
-//import org.apache.http.client.methods.HttpPost;
-//import org.apache.http.impl.client.HttpClients;
-//import org.apache.http.message.BasicNameValuePair;
-//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.*;
-//
-//@Slf4j
-//public class WebsocketRunClient extends WebSocketClient {
-//
-// private EStockType eStockType;
-// public WebsocketRunClient(URI serverUri,
-// EStockType eStockType
-// ) {
-// super(serverUri);
-// this.eStockType = eStockType;
-// }
-//
-// private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
-//
-//
-// private static HttpPost httpPost;
-// static {
-// httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification"); // 初始化 HttpPost
-// }
-//
-// @Override
-// public void onOpen(ServerHandshake serverHandshake) {
-// send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+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.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+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.*;
+
+@Slf4j
+public class WebsocketRunClient extends WebSocketClient {
+
+ private EStockType eStockType;
+ public WebsocketRunClient(URI serverUri,
+ EStockType eStockType
+ ) {
+ super(serverUri);
+ this.eStockType = eStockType;
+ }
+
+ private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
+
+
+ private static HttpPost httpPost;
+ static {
+ httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification"); // 初始化 HttpPost
+ }
+
+ @Override
+ public void onOpen(ServerHandshake serverHandshake) {
+ send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
// Timer heartbeatTimer;
// // 启动心跳定时器
// heartbeatTimer = new Timer();
@@ -56,49 +58,67 @@
// send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
// }
// }, 0, 3000); // 每3秒发送一次心跳消息
-// }
-//
-// @Override
-// public void onMessage(String s) {
-// if(!s.equals("pong") && !s.equals("身份验证成功")){
-// StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
-// RedisKeyUtil.setCacheRealTimeStock(eStockType,stockDetailBean);
-// }
-// }
-//
-// public static Map<String, Object> jsonToMap(String json) {
-// Gson gson = new Gson();
-// Type type = new TypeToken<Map<String, Object>>(){}.getType();
-// return gson.fromJson(json, type);
-// }
-//
-// @Override
-// public void onClose(int i, String s, boolean b) {
-// log.info("websocket 印度股票 关闭"+1);
-// }
-//
-// @Override
-// public void onError(Exception e) {
-// log.info("websocket 错误");
-// }
-//
-// public void sendLoca(String message) {
-// 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();
-// } catch (IOException e) {
-// log.error("Http 请求错误", e);
-// }
-// }
-//}
+ }
+
+ @Override
+ public void onMessage(String s) {
+ if(!s.equals("pong") && !s.equals("身份验证成功")){
+ 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 {
+ String json = objectMapper.writeValueAsString(stockRealTimeBean);
+ sendLoca(json);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+ }
+
+ public static Map<String, String> jsonToMap(String json) {
+ Gson gson = new Gson();
+ 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);
+ }
+
+ @Override
+ public void onError(Exception e) {
+ log.info("websocket 错误");
+ }
+
+ public void sendLoca(String message) {
+ 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();
+ } catch (IOException e) {
+ log.error("Http 请求错误", e);
+ }
+ }
+}
diff --git a/src/main/java/com/nq/ws/WsClientConfig.java b/src/main/java/com/nq/ws/WsClientConfig.java
index 9a1d5e8..c7ff53c 100644
--- a/src/main/java/com/nq/ws/WsClientConfig.java
+++ b/src/main/java/com/nq/ws/WsClientConfig.java
@@ -1,169 +1,169 @@
-package com.nq.ws;
-
-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.PropertiesUtil;
-import com.nq.utils.redis.RedisKeyUtil;
-import com.nq.ws.client.IO;
-import com.nq.ws.client.Socket;
-import io.socket.emitter.Emitter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * soket-io
- */
-@Slf4j
-@Configuration
-public class WsClientConfig {
-
- private static final String SERVER_URL = PropertiesUtil.getProperty("JS_IN_HTTP_API");
- private static final String AUTH_KEY = PropertiesUtil.getProperty("JS_IN_KEY");
- private static final String ROOM_ID = "14";
- private static Socket socket;
-
- private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
-
-
- private static HttpPost httpPost;
- static {
- httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification"); // 初始化 HttpPost
- }
- @Bean
- public void websocketRunClientMap() {
- connectToServer();
- }
-
- private static void connectToServer() {
- IO.Options options = new IO.Options();
- options.reconnection = true;
- options.reconnectionDelay = 1000;
-
- try {
- socket = IO.socket(new URI(SERVER_URL), options);
- } catch (URISyntaxException e) {
- log.error("Invalid URI", e);
- return;
- }
-
- socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
- @Override
- public void call(Object... args) {
- authenticate();
- }
- });
-
- socket.on("marketData", new Emitter.Listener() {
- @Override
- public void call(Object... args) {
- send(args[0].toString());
- StockRealTimeBean stockDetailBean = new Gson().fromJson(args[0].toString(), StockRealTimeBean.class);
- RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
- }
- });
-
- socket.on(Socket.EVENT_CONNECT_ERROR, new Emitter.Listener() {
- @Override
- public void call(Object... args) {
- log.error("socketIo连接错误: " + args[0]);
- }
- });
-
- socket.on(Socket.EVENT_DISCONNECT, new Emitter.Listener() {
- @Override
- public void call(Object... args) {
- log.error("socketIo 断开连接: " + args[0]);
- if (!socket.connected()) {
- log.error("socketIo 开始重连: " + args[0]);
- reconnect();
- }
- }
- });
-
- socket.connect();
- }
-
- public static Map<String, Object> jsonToMap(String json) {
- Gson gson = new Gson();
- Type type = new TypeToken<Map<String, Object>>(){}.getType();
- return gson.fromJson(json, type);
- }
-
- private static void reconnect() {
- new Thread(new Runnable() {
- @Override
- public void run() {
- while (!socket.connected()) {
- try {
- log.error("socketIo 开始重连");
- socket.connect();
- Thread.sleep(5000); // 重连间隔，单位毫秒
- } catch (InterruptedException e) {
- log.error("重连被中断", e);
- }
- }
- }
- }).start();
- }
-
- private static void authenticate() {
- log.info("socketIo---->开始连接");
- if (socket != null && socket.connected()) {
- JSONObject authData = new JSONObject();
- try {
- authData.put("key", AUTH_KEY);
- authData.put("roomId", ROOM_ID);
- socket.emit("authenticate", authData);
- log.info("socketIo---->连接成功");
- } catch (JSONException e) {
- log.error("socketIo认证错误："+e.getMessage(), e);
- }
- }
- }
-
- private static void send(String message) {
- 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();
- } catch (IOException e) {
- log.error("Http 请求错误", e);
- }
- }
-}
+//package com.nq.ws;
+//
+//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.PropertiesUtil;
+//import com.nq.utils.redis.RedisKeyUtil;
+//import com.nq.ws.client.IO;
+//import com.nq.ws.client.Socket;
+//import io.socket.emitter.Emitter;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.http.HttpResponse;
+//import org.apache.http.client.HttpClient;
+//import org.apache.http.client.entity.UrlEncodedFormEntity;
+//import org.apache.http.client.methods.HttpPost;
+//import org.apache.http.impl.client.HttpClients;
+//import org.apache.http.message.BasicNameValuePair;
+//import org.json.JSONException;
+//import org.json.JSONObject;
+//import org.springframework.context.ApplicationContext;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import java.io.IOException;
+//import java.lang.reflect.Type;
+//import java.net.URI;
+//import java.net.URISyntaxException;
+//import java.nio.charset.StandardCharsets;
+//import java.text.SimpleDateFormat;
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * soket-io
+// */
+//@Slf4j
+//@Configuration
+//public class WsClientConfig {
+//
+// private static final String SERVER_URL = PropertiesUtil.getProperty("JS_IN_HTTP_API");
+// private static final String AUTH_KEY = PropertiesUtil.getProperty("JS_IN_KEY");
+// private static final String ROOM_ID = "14";
+// private static Socket socket;
+//
+// private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
+//
+//
+// private static HttpPost httpPost;
+// static {
+// httpPost = new HttpPost("http://127.0.0.1:8001/api/sendNotification"); // 初始化 HttpPost
+// }
+// @Bean
+// public void websocketRunClientMap() {
+// connectToServer();
+// }
+//
+// private static void connectToServer() {
+// IO.Options options = new IO.Options();
+// options.reconnection = true;
+// options.reconnectionDelay = 1000;
+//
+// try {
+// socket = IO.socket(new URI(SERVER_URL), options);
+// } catch (URISyntaxException e) {
+// log.error("Invalid URI", e);
+// return;
+// }
+//
+// socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
+// @Override
+// public void call(Object... args) {
+// authenticate();
+// }
+// });
+//
+// socket.on("marketData", new Emitter.Listener() {
+// @Override
+// public void call(Object... args) {
+// send(args[0].toString());
+// StockRealTimeBean stockDetailBean = new Gson().fromJson(args[0].toString(), StockRealTimeBean.class);
+// RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
+// }
+// });
+//
+// socket.on(Socket.EVENT_CONNECT_ERROR, new Emitter.Listener() {
+// @Override
+// public void call(Object... args) {
+// log.error("socketIo连接错误: " + args[0]);
+// }
+// });
+//
+// socket.on(Socket.EVENT_DISCONNECT, new Emitter.Listener() {
+// @Override
+// public void call(Object... args) {
+// log.error("socketIo 断开连接: " + args[0]);
+// if (!socket.connected()) {
+// log.error("socketIo 开始重连: " + args[0]);
+// reconnect();
+// }
+// }
+// });
+//
+// socket.connect();
+// }
+//
+// public static Map<String, Object> jsonToMap(String json) {
+// Gson gson = new Gson();
+// Type type = new TypeToken<Map<String, Object>>(){}.getType();
+// return gson.fromJson(json, type);
+// }
+//
+// private static void reconnect() {
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// while (!socket.connected()) {
+// try {
+// log.error("socketIo 开始重连");
+// socket.connect();
+// Thread.sleep(5000); // 重连间隔，单位毫秒
+// } catch (InterruptedException e) {
+// log.error("重连被中断", e);
+// }
+// }
+// }
+// }).start();
+// }
+//
+// private static void authenticate() {
+// log.info("socketIo---->开始连接");
+// if (socket != null && socket.connected()) {
+// JSONObject authData = new JSONObject();
+// try {
+// authData.put("key", AUTH_KEY);
+// authData.put("roomId", ROOM_ID);
+// socket.emit("authenticate", authData);
+// log.info("socketIo---->连接成功");
+// } catch (JSONException e) {
+// log.error("socketIo认证错误："+e.getMessage(), e);
+// }
+// }
+// }
+//
+// private static void send(String message) {
+// 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();
+// } catch (IOException e) {
+// log.error("Http 请求错误", e);
+// }
+// }
+//}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a01f8c..eafc32f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -47,10 +47,10 @@
#IN_NEW_HTTP_API = http://api-in-2.js-stock.top/
#IN_NEW_KEY = eVKtHt7aG4m6ozwWL9qG
-JS_IN_HTTP_API = http://api-in-2-socket.js-stock.top
-JS_IN_HTTP_URL = http://api-in-2.js-stock.top/
-JS_IN_WS_URL =ws://api-in-2-ws.js-stock.top
-JS_IN_KEY = 839tbd9OK88Aby9FbjTvr32hG
+JS_IN_HTTP_API = http://api-in-3-socket.js-stock.top
+JS_IN_HTTP_URL = http://api-in-3.js-stock.top/
+JS_IN_WS_URL =ws://api-in-3-ws.js-stock.top
+JS_IN_KEY = lkasdjfljaswdlfce9gZzQw
US_HTTP_API = http://api-us.js-stock.top/
US_WS_URL = ws://ws-us.js-stock.top
--
Gitblit v1.9.3