From 383e355a2f48fbd2c514dad636c863807ebe7761 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 11:25:36 +0800
Subject: [PATCH] 20221213转币

---
 src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java |   17 ++++++++++++++---
 src/main/resources/application-dev.yml                       |   18 +++++++-----------
 2 files changed, 21 insertions(+), 14 deletions(-)

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 134c642..96d14bd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -1,6 +1,9 @@
 package cc.mrbird.febs.dapp.contract;
 
 import cc.mrbird.febs.common.service.RedisService;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
 import cc.mrbird.febs.dapp.entity.DappMemberEntity;
@@ -22,6 +25,7 @@
 import org.web3j.protocol.http.HttpService;
 import org.web3j.tx.gas.DefaultGasProvider;
 import org.web3j.tx.gas.StaticGasProvider;
+import org.web3j.utils.Convert;
 
 import java.math.BigInteger;
 import java.util.List;
@@ -54,17 +58,24 @@
         }
         return web3;
     }
-
     // gas费用单价
 //    public static final BigInteger GAS_PRICE = BigInteger.valueOf(32000000000L);
-    public static final BigInteger GAS_PRICE = BigInteger.valueOf(10000000000L);
+    public static final BigInteger GAS_PRICE = Convert.toWei(getGas(), Convert.Unit.GWEI).toBigInteger();
     // gas费用最大值
 //    public static final BigInteger GAS_LIMIT = BigInteger.valueOf(4300000L);
-    public static final BigInteger GAS_LIMIT = BigInteger.valueOf(1000000L);
+    public static final BigInteger GAS_LIMIT = Convert.toWei("100000", Convert.Unit.WEI).toBigInteger();
     private static StaticGasProvider getStaticGasProvider(){
         return new StaticGasProvider(GAS_PRICE,GAS_LIMIT);
     }
 
+    private static String getGas() {
+        String gas;
+        String resp = HttpUtil.get("https://gbsc.blockscan.com/gasapi.ashx?apikey=key&method=gasoracle");
+        JSONObject data = JSONObject.parseObject(resp);
+        gas = data.getString("FastGasPrice");
+        return StrUtil.isBlank(gas) ? "35" : gas;
+    }
+
     private static Web3j getInstanceScope() {
 
         HttpService httpService = new HttpService(blockchainNode);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 550cb06..3c5c0db 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -26,13 +26,14 @@
 #          url: jdbc:mysql://120.27.238.55:3306/db_bnbweb?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
 
   redis:
-    database: 13
+    # Redis数据库索引(默认为 0)
+    database: 11
     # Redis服务器地址
-    host: 120.27.238.55
+    host: 154.91.195.148
     # Redis服务器连接端口
     port: 6379
     # Redis 密码
-    password: d3y6dsdl;f.327
+    password: dapp!@#123
     lettuce:
       pool:
         # 连接池中的最小空闲连接
@@ -46,15 +47,10 @@
     # 连接超时时间(毫秒)
     timeout: 5000
   rabbitmq:
-    host: 120.27.238.55
+    host: 154.91.195.148
     port: 5672
-    username: ct_rabbit
-    password: 123456
-#    host: 47.111.90.145
-#    port: 5672
-#    username: zj_mall
-#    password: zj_mall123
-
+    username: xc_rabbit
+    password: xuncong123
     publisher-confirm-type: correlated
 
 system:

--
Gitblit v1.9.1