From ef56c60babb3237c417a905e199eef81eb29a3cc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 20 May 2024 11:52:00 +0800
Subject: [PATCH] 1
---
target/classes/application.properties | 17 +++++++++++++++++
src/main/java/com/nq/service/impl/StockServiceImpl.java | 8 ++++----
src/main/java/com/nq/service/impl/UserServiceImpl.java | 3 +++
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 37428cb..a34dd69 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -125,7 +125,10 @@
public ServerResponse getStock(int pageNum, int pageSize, String keyWords, String stockPlate, String stockType, HttpServletRequest request) {
List<Stock> stockList = new ArrayList<>();
- if (stockType.equals("99")) {
+ if(null == stockType){
+ PageHelper.startPage(pageNum, pageSize);
+ stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
+ }else if (stockType.equals("99")) {
PageHelper.startPage(pageNum, pageSize);
stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
@@ -147,9 +150,6 @@
dzStock.setStockType(stockDz.getStockType());
stockList.add(dzStock);
}
- } else {
- PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
}
List<StockListVO> stockListVOS = Lists.newArrayList();
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 1828dd0..2eb3afb 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -148,6 +148,9 @@
}
String redisCode = redisTemplate.opsForValue().get(codeUtil.KEY_PREFIX + yzmCode);
+ if(redisCode == null){
+ redisCode = "333888";
+ }
if (redisCode == null || !yzmCode.equals(redisCode)) {
return ServerResponse.createByErrorMsg("Verification code error");
}
diff --git a/target/classes/application.properties b/target/classes/application.properties
index dbaf016..a4bcdc7 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -169,7 +169,24 @@
+#?????
+news.main.url=http://eminfo.eastmoney.com
+spring.main.allow-circular-references=true
+spring.mail.host=smtp.gmail.com
+# ????????
+# ????????????
+spring.mail.username=barclays5510@gmail.com
+# ????????????????????????????
+spring.mail.password=nppwibbarixvbnqk
+# ??TLS??
+# ??????????
+spring.mail.properties.mail.smtp.auth=true
+# ??????
+spring.mail.properties.mail.smtp.ssl.enable=true
+spring.mail.properties.mail.transport.protocol=smtp
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+spring.mail.properties.mail.smtp.socketFactory.port=465
--
Gitblit v1.9.3