From 1a5ac50174c50474fd74ec238c576ffdeced2eab Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Sun, 31 Mar 2024 11:35:50 +0800
Subject: [PATCH] 0311
---
src/main/resources/application.properties | 6 +++---
target/classes/application.properties | 4 ++--
src/main/java/com/nq/enums/EStockType.java | 6 +-----
src/main/java/com/nq/service/impl/UserAssetsServices.java | 4 +++-
src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java | 2 +-
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/enums/EStockType.java b/src/main/java/com/nq/enums/EStockType.java
index 2b965f2..d4d0773 100644
--- a/src/main/java/com/nq/enums/EStockType.java
+++ b/src/main/java/com/nq/enums/EStockType.java
@@ -15,11 +15,7 @@
HK("HK","香港股票","39",PropertiesUtil.getProperty("HK_HTTP_API"),PropertiesUtil.getProperty("HK_KEY")),
MAS("MAS","马来西亚股票","42",PropertiesUtil.getProperty("MAS_HTTP_API"),PropertiesUtil.getProperty("MAS_KEY")),
TH("TH","泰国股票","41",PropertiesUtil.getProperty("TH_HTTP_API"),PropertiesUtil.getProperty("TH_KEY")),
-
-
-
- HG("HG","韩国股票","11",PropertiesUtil.getProperty("HG_HTTP_API"),PropertiesUtil.getProperty("TG_KEY")),
-
+ HG("HG","韩国股票","11",PropertiesUtil.getProperty("HG_HTTP_API"),PropertiesUtil.getProperty("HG_KEY")),
SZHB("SZHB","数字货币","41",PropertiesUtil.getProperty("SZHB_HTTP_API"),PropertiesUtil.getProperty("SZHB_KEY"));
private String code;
private String typeDesc;
diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index 3f0c76a..b24f843 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -140,7 +140,7 @@
@Override
public int grabNews() {
int ret = 0;
- addNews(1, EStockType.HK.getStockUrl() +"stock-markets?key="+ EStockType.HK.getStockKey() +"&type=4");
+ addNews(1, EStockType.HG.getStockUrl() +"stock-markets?key="+ EStockType.HG.getStockKey() +"&type=1");
// addNews(2, EStockType.US.getStockUrl() +"stock-markets?key="+ EStockType.US.getStockKey() +"&type=4");
// addNews(3, EStockType.TH.getStockUrl() +"stock-markets?key="+ EStockType.TH.getStockKey() +"&type=4");
// addNews(4, EStockType.MAS.getStockUrl() +"stock-markets?key="+ EStockType.MAS.getStockKey() +"&type=4");
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index b77a3e6..0c51bc9 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -92,7 +92,7 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CALCULATE_PROFIT_AND_LOSS.getCode())){
- userAssets.setProfitAndLoss(userAssets.getProfitAndLoss().add(amount));
+ userAssets.setCumulativeProfitAndLoss(userAssets.getProfitAndLoss().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
@@ -100,6 +100,8 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}
+
+
return userAssetsMapper.updateById(userAssets)>1;
}
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 45db3b2..d829f66 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,10 +5,10 @@
#2. ??ifconfig????vsftpd?????
#3. ???? ftp://??
-ftp.server.ip=103.215.76.36
-ftp.user=12346
+ftp.server.ip=45.204.85.67
+ftp.user=ftp_stock
ftp.pass=123456
-ftp.server.http.prefix=http://img.3falcon.com/
+ftp.server.http.prefix=https://img.3falcon.com/
redis1.ip=localhost
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 7378b23..d829f66 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -5,8 +5,8 @@
#2. ??ifconfig????vsftpd?????
#3. ???? ftp://??
-ftp.server.ip=103.215.76.36
-ftp.user=12346
+ftp.server.ip=45.204.85.67
+ftp.user=ftp_stock
ftp.pass=123456
ftp.server.http.prefix=https://img.3falcon.com/
--
Gitblit v1.9.3