From 93cc47aeb23cab863882a4e5d523bbffd95e627b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jul 2022 15:59:24 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 3 +
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 2
src/main/resources/i18n/message_zh_cn.properties | 10 ++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 1
src/main/resources/application-dev.yml | 6 +-
src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java | 1
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 40 ++++++++++----------
7 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java b/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
index cfb580c..e03251c 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
@@ -41,7 +41,6 @@
String headAddress = request.getHeader("address");
String key = request.getHeader("key");
String path = request.getServletPath().replace("/dapi", "");
- log.info("进入拦截:{}, {}, {}", headAddress, path, key);
String chain = request.getHeader("chain");
if (StrUtil.isBlank(headAddress) || StrUtil.isBlank(key)) {
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index 8026901..3a20f67 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -14,10 +14,10 @@
* 0x55d398326f99059fF775485246999027B3197955
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
- BSC_USDT("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ BSC_USDT("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
+ "",
"https://bsc-dataseed1.ninicoin.io",
- "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
+ "0x55d398326f99059fF775485246999027B3197955",
""),
/**
@@ -26,28 +26,28 @@
* 正式 0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ BSC_TFC("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
+ "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
"https://bsc-dataseed1.ninicoin.io",
- "0x46ac4921e58773ca22826df1640672b91b1db2b3",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
* 源池币
*/
- BSC_TFC_SOURCE("BSC", "0x4EbDCA102623b46a47042D580dddAdE2a53D057F",
- "0x81c2c02d0c106c1e32ab060a37f6eb279c0649c30ea5cc1c4951e6a8dd4e963c",
+ BSC_TFC_SOURCE("BSC", "0xFe7648513033782dE07010927686B97340661360",
+ "",
"https://bsc-dataseed1.ninicoin.io",
- "0x46ac4921e58773ca22826df1640672b91b1db2b3",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
* 源池U
*/
- BSC_USDT_SOURCE("BSC", "0x4EbDCA102623b46a47042D580dddAdE2a53D057F",
- "0x81c2c02d0c106c1e32ab060a37f6eb279c0649c30ea5cc1c4951e6a8dd4e963c",
+ BSC_USDT_SOURCE("BSC", "0xFe7648513033782dE07010927686B97340661360",
+ "",
"https://bsc-dataseed1.ninicoin.io",
- "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
+ "0x55d398326f99059fF775485246999027B3197955",
""),
/**
@@ -62,28 +62,28 @@
/**
* 技术池
*/
- BSC_TFC_TECH("BSC", "0xD998DA7362360eFC6daDFEd6E9a32E70640d7600",
+ BSC_TFC_TECH("BSC", "0x8DB4d0E470e6cD206b774f5DAD2b5D0dD43C7688",
"",
"https://bsc-dataseed1.ninicoin.io",
- "0x46ac4921e58773ca22826df1640672b91b1db2b3",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
* 奖励池
*/
- BSC_TFC_REWARD("BSC", "0xf6b06a30196aa5e318232a3b61319eab0fd4a3bf",
- "9378c6a5becdcade151e98b2ee30239bcb11642e362a068a5bc7667f3d17b1fc",
+ BSC_TFC_REWARD("BSC", "0x286DDA62A7171a6d6eA6558510834fE8afc0446C",
+ "0x3d35db460e2eead11fca7b6ce5a9c5c8a8e0866775008ef5e1721b9f17b57f4f",
"https://bsc-dataseed1.ninicoin.io",
- "0x46ac4921e58773ca22826df1640672b91b1db2b3",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
* 卡牌
*/
- BSC_NFT_SDC("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
- "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ BSC_NFT_SDC("BSC", "0x3afD1Bf0994214DBe5ccfA7d8643261B195532c2",
+ "0x07ee6de0ca4b289f8e69484f70d09988c6df6697f411dc623179930a3578994f",
"https://bsc-dataseed1.ninicoin.io",
- "0x03c7D3f141c5F03971604958170E253362e13BE6",
+ "0xb7FDE337f2236F78B2823d9F97eAB03ce893CC3D",
"");
private String chain;
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index fca3d0f..d918273 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -120,6 +120,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void connect(ConnectDto connectDto) {
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
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 69f033a..cc12112 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
@@ -98,7 +98,8 @@
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
// 启动未启动
if (!"start".equals(hasStart)) {
- system.setFeeRatio(BigDecimal.TEN);
+ system.setFeeRatio(new BigDecimal("7"));
+ system.setBuyFeeRatio(new BigDecimal("3"));
system.setUsdtRemain(BigDecimal.ZERO);
system.setUsdtTotal(BigDecimal.ZERO);
system.setSaleRemain(BigDecimal.ZERO);
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 d2041f3..ec08f1c 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
@@ -324,7 +324,7 @@
if (!dappSystemService.systemHasStart()) {
HashMap<String, BigDecimal> map = new HashMap<>();
map.put("x", new BigDecimal("0.05"));
- map.put("y", new BigDecimal("100000"));
+ map.put("y", new BigDecimal("0.05"));
return map;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 06c4fd1..7638e54 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -49,6 +49,6 @@
publisher-confirm-type: correlated
system:
- online-transfer: true
- chain-listener: true
- trade-job: true
\ No newline at end of file
+ online-transfer: false
+ chain-listener: false
+ trade-job: false
\ No newline at end of file
diff --git a/src/main/resources/i18n/message_zh_cn.properties b/src/main/resources/i18n/message_zh_cn.properties
index 5f34ccc..5882079 100644
--- a/src/main/resources/i18n/message_zh_cn.properties
+++ b/src/main/resources/i18n/message_zh_cn.properties
@@ -1,8 +1,8 @@
system_error=????
-transfer_msg_001=?????
-transfer_msg_002=????USDT???
+transfer_msg_001=??????
+transfer_msg_002=??USDT???
transfer_msg_003=??24??????
-transfer_msg_004=????????
-transfer_msg_005=?????????
-transfer_msg_006=??????
\ No newline at end of file
+transfer_msg_004=???
+transfer_msg_005=??????
+transfer_msg_006=???
\ No newline at end of file
--
Gitblit v1.9.1