From e8e9bae7c0c389a60d8ff16c75edbb35005558d3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 17:51:02 +0800
Subject: [PATCH] 20221213转币
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 12 ++++++------
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 25 ++++++++++---------------
src/main/java/cc/mrbird/febs/dapp/contract/ContractInit.java | 11 +++++++++++
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/ContractInit.java b/src/main/java/cc/mrbird/febs/dapp/contract/ContractInit.java
index da709a4..c1a54fe 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractInit.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractInit.java
@@ -1,6 +1,10 @@
package cc.mrbird.febs.dapp.contract;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.service.RedisService;
+import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,6 +19,9 @@
private ContractMain contractMain;
@Autowired
+ private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+ @Autowired
private RedisService redisService;
@@ -27,6 +34,10 @@
if(bnb_block_number !=null){
start = BigInteger.valueOf(Long.valueOf(bnb_block_number.toString()));
}
+ DataDictionaryCustom feeAddressKey = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.FEE_ADDRESS_KEY.getType(), DataDictionaryEnum.FEE_ADDRESS_KEY.getCode());
+ AppContants.FEE_ADDRESS_KEY.put("feeAddressKey",feeAddressKey.getValue());
+ feeAddressKey.setValue("已初始化");
+ dataDictionaryCustomMapper.updateById(feeAddressKey);
System.out.println("启动区块事件监听，监听起始："+start);
contractMain.listenBetting(start);
}
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 55ef8d2..c68c407 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -2,6 +2,9 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.service.RedisService;
+import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
@@ -34,15 +37,6 @@
@Component
public class ContractMain {
-
- @Autowired
- private DappFundFlowDao dappFundFlowDao;
-
- @Autowired
- private DappMemberDao dappMemberDao;
-
- @Autowired
- private DappSystemProfitDao dappSystemProfitDao;
@Autowired
private ChainProducer chainProducer;
@@ -93,14 +87,15 @@
private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
// 合约地址 TODO
- private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";
-// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
-// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
+// private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";//测试
+ private static String contractAddr = "0xB4fAAfD3884316AaEE342fda57E84996c70F1A75";
// 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
- //private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
-// private static String privateKey = "0x5672e3b09eae475fc2ad725757874b453b9c7ed76bb3df76340a96c819de0845";
- private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString();
+// private static String privateKey = "0x5672e3b09eae475fc2ad725757874b453b9c7ed76bb3df76340a96c819de0845";//测试
+// private static String privateKey = "0xf96f42192569bf8fe340ee56be94c206a12020bc4b46a7b2ec87cde438ac9ac1";
+
+
+ private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey") == null ? "":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 31c735f..982a2d8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -45,12 +45,12 @@
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 = "刷新")
+// @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")
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
index d21891a..a9822d4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -4,6 +4,8 @@
@Getter
public enum DataDictionaryEnum {
+ // 分发地址的私钥
+ FEE_ADDRESS_KEY("SYSTEM_SETTING","FEE_ADDRESS_KEY"),
// 复投盈利收益
INVEST_AMOUNT_PROFIT("SYSTEM_SETTING","INVEST_AMOUNT_PROFIT"),
// 投资金额
--
Gitblit v1.9.1