From 46e20ff02e0cd73c739087dd8c08e3bfdc4c9ad4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 17:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 8 ++++++++
src/main/java/cc/mrbird/febs/common/contants/AppContants.java | 4 ++++
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 6 ++++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
index 3b227c1..80586b0 100644
--- a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
@@ -1,7 +1,9 @@
package cc.mrbird.febs.common.contants;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.LinkedList;
+import java.util.Map;
public class AppContants {
@@ -183,4 +185,6 @@
public static final BigDecimal NFT_ACTIVE_PRICE = new BigDecimal("10");
public static final String REDIS_KEY_TFC_NEW_PRICE = "TFC_NEW_PRICE";
+
+ public static final Map FEE_ADDRESS_KEY = new HashMap<String,String>();
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
index 9f02e92..55ef8d2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.contract;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.service.RedisService;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
@@ -92,13 +93,14 @@
private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
// 合约地址 TODO
- private static String contractAddr = "0xDc94C3DcaddE676142B4596E0310AE5C54Bd3765";
+ private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";
// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
// 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
//private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
- private static String privateKey = "0xbf6f11f5689961d5351375bebbae751de0d0d5c2e2095c1017368485dc909ff8";
+// private static String privateKey = "0x5672e3b09eae475fc2ad725757874b453b9c7ed76bb3df76340a96c819de0845";
+ private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString();
private EthFilter getFilter(BigInteger startBlock) {
if (startBlock != null) {
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 5def91a..31c735f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.controller;
import cc.mrbird.febs.common.annotation.EncryptEnable;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.dto.ConnectDto;
@@ -44,6 +45,13 @@
return new FebsResponse().success().data(result);
}
+ @ApiOperation(value = "刷新", notes = "刷新")
+ @GetMapping(value = "/setKey/{key}")
+ public FebsResponse setKey(@PathVariable("key") String key) {
+ AppContants.FEE_ADDRESS_KEY.put("feeAddressKey",key);
+ return new FebsResponse().success();
+ }
+
@ApiOperation(value = "链接接口", notes = "链接接口")
@PostMapping(value = "/connect")
public FebsResponse connect(@RequestBody ConnectDto connectDto) {
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 ae6f35b..f3c9f21 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
@@ -257,7 +257,7 @@
DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
- chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+// chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
//直接返利30%给直接上级
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
String refererId = dappMemberEntity.getRefererId();
--
Gitblit v1.9.1