From 6f353ae65e9c9f117a9c1177aa5766fd6a3a161e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 02 Jun 2024 16:57:26 +0800
Subject: [PATCH] 1
---
target/classes/application.properties | 6 +++++-
src/main/java/com/nq/service/impl/TradingHourServiceImpl.java | 4 ++++
target/classes/mapper/UserMapper.xml | 3 +++
target/classes/mapper/UserStockSubscribeMapper.xml | 5 ++---
src/main/java/com/nq/utils/timeutil/TimeUtil.java | 2 +-
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
index 52ac833..30b1cbb 100644
--- a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDate;
/**
* @program: dabao
@@ -55,6 +56,9 @@
if(stockTimeSetting == null){
return false;
}
+ if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+ return false;
+ }
return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
}
diff --git a/src/main/java/com/nq/utils/timeutil/TimeUtil.java b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
index b87dc8b..07218d4 100644
--- a/src/main/java/com/nq/utils/timeutil/TimeUtil.java
+++ b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
@@ -16,7 +16,7 @@
}
- if(now.isAfter(pmTime) && now.isBefore(pmTime1)){
+ if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
return true;
}
return false;
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 424bb3d..59b9a9a 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -17,7 +17,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.marwadi.online/
+ftp.server.http.prefix=https://img.essencefunds.com/
redis1.ip=localhost
redis1.port=6379
@@ -45,6 +45,10 @@
IN_WS_URL =ws://ws.is4vc.com:8001/websocket-server
IN_KEY = r3ZAgtcYzuBizmqge2hK
+JS_IN_HTTP_API = http://api-in-2-socket.js-stock.top
+JS_IN_WS_URL =ws://api-in-2-ws.js-stock.top
+JS_IN_KEY = eVKtHt7aG4m6ozwWL9qG
+
US_HTTP_API = http://api-us.js-stock.top/
US_WS_URL = ws://ws-us.js-stock.top
US_KEY = jZFrku4RGQjP87Hmq5tm
diff --git a/target/classes/mapper/UserMapper.xml b/target/classes/mapper/UserMapper.xml
index 5665a62..25e3a6a 100644
--- a/target/classes/mapper/UserMapper.xml
+++ b/target/classes/mapper/UserMapper.xml
@@ -36,6 +36,9 @@
</sql>
+ <select id="findByPhone" parameterType="string" resultType="com.nq.pojo.User">
+ select * from user where phone= #{phone}
+ </select>
<select id="login" resultMap="BaseResultMap" parameterType="map">
SELECT
diff --git a/target/classes/mapper/UserStockSubscribeMapper.xml b/target/classes/mapper/UserStockSubscribeMapper.xml
index f80cfda..dbad41a 100644
--- a/target/classes/mapper/UserStockSubscribeMapper.xml
+++ b/target/classes/mapper/UserStockSubscribeMapper.xml
@@ -201,9 +201,8 @@
</update>
- <select id="load" resultMap="BaseResultMap">
- SELECT <include refid="Base_Column_List" />
- FROM user_stock_subscribe
+ <select id="load" resultType="com.nq.pojo.UserStockSubscribe" parameterType="int">
+ SELECT * FROM user_stock_subscribe
WHERE id = #{id}
</select>
--
Gitblit v1.9.3