From 28726a5a2c712c6f67e8a53ee16fcb5135f4ea69 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 29 Jun 2024 13:56:08 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 2 +-
src/main/java/com/nq/service/impl/StockServiceImpl.java | 22 +++++++++++-----------
src/main/java/com/nq/controller/backend/AdminMoneyLogController.java | 2 +-
src/main/resources/application.yml | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminMoneyLogController.java b/src/main/java/com/nq/controller/backend/AdminMoneyLogController.java
index 0dfdc21..bfe8edb 100644
--- a/src/main/java/com/nq/controller/backend/AdminMoneyLogController.java
+++ b/src/main/java/com/nq/controller/backend/AdminMoneyLogController.java
@@ -23,7 +23,7 @@
@RequestParam(value = "phone", required = false) String phone,
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
- return ServerResponse.createBySuccess(iMoneyLogServces.queryMoneyLog(userId,pageSize,pageNum));
+ return ServerResponse.createBySuccess(iMoneyLogServces.queryMoneyLog(userId,pageNum,pageSize));
}
}
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index a936bc5..3196cba 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -188,17 +188,17 @@
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();
+// 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);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1587be0..841b161 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/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.essencefunds.com/
+ftp.server.http.prefix=https://img.apratrade.com/
redis1.ip=localhost
redis1.port=6379
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fa94728..18d5047 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -122,7 +122,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/zyqsstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
--
Gitblit v1.9.3