From 95324a4bf873ad138cc6315d59f7f2911ff78d18 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Aug 2022 21:15:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 16 ++++++++--------
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 9 +++++++--
src/main/resources/application-dev.yml | 34 +++++++++++++++++-----------------
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index aac714e..96812d3 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -535,15 +535,15 @@
public void startSystem() {
log.info("启动系统");
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
- transferPoolSetting();
- sourcePoolUsdtOutLimitSetting();
- }
- });
+// Thread thread = new Thread(new Runnable() {
+// @Override
+// public void run() {
+// }
+// });
- thread.start();
+ transferPoolSetting();
+ sourcePoolUsdtOutLimitSetting();
+// thread.start();
}
// 最低容量(百分比)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 5a066e4..e24912b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -20,6 +20,7 @@
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -235,6 +236,9 @@
// 铸池中的币的剩余量
BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
+ DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow());
+ long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true);
+
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (transferDto.getId() == null) {
if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
@@ -289,8 +293,9 @@
makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
buyUsdtMax = buyUsdtMax.subtract(usdtAmount);
+
// 修改每日最大购买USDT量
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
@@ -328,7 +333,7 @@
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
}
} else {
usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 33729d0..4fa9ea8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,31 +15,31 @@
datasource:
# 数据源-1，名称为 base
base:
-# username: db_tfc
-# password: tfc123!@#
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://47.111.90.145:3306/db_tfc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
+ username: db_tfc
+ password: tfc123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/db_tfc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://47.111.90.145:3306/db_tfc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+# username: ct_test
+# password: 123456
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://120.27.238.55:3306/db_tfc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
-# database: 4
-# # Redis服务器地址
-# host: 47.111.90.145
-# # Redis服务器连接端口
-# port: 6379
-# # Redis 密码
-# password: zhongji-mall=-0
- database: 9
+ database: 4
# Redis服务器地址
- host: 120.27.238.55
+ host: 47.111.90.145
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: xcong123
+ password: zhongji-mall=-0
+# database: 9
+# # Redis服务器地址
+# host: 120.27.238.55
+# # Redis服务器连接端口
+# port: 6379
+# # Redis 密码
+# password: xcong123
lettuce:
pool:
# 连接池中的最小空闲连接
--
Gitblit v1.9.1