From 52e5074c4db95d5e1a262de66173cb0517a9adde Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Fri, 19 Feb 2021 15:22:47 +0800
Subject: [PATCH] TRC20版本提交
---
src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java | 4 ++--
src/main/resources/application-prod.yml | 10 +++++-----
src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java | 2 +-
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java | 9 +++++++--
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java b/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
index f64835b..006221f 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
@@ -42,8 +42,8 @@
})
@GetMapping(value = "/findBlockAddress")
@SubmitRepeat
- public Result findBlockAddress(String symbol) {
- return blockSerive.findBlockAddress(symbol);
+ public Result findBlockAddress(String symbol,String lable) {
+ return blockSerive.findBlockAddress(symbol,lable);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java
index 4784320..a26216c 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java
@@ -4,6 +4,6 @@
public interface BlockSerive {
- Result findBlockAddress(String symbol);
+ Result findBlockAddress(String symbol,String lable);
}
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
index 6bba54c..5cc6945 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java
@@ -8,6 +8,7 @@
import com.xcong.excoin.modules.blackchain.service.*;
import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
@@ -35,14 +36,18 @@
private UsdtUpdateProducer usdtUpdateProducer;
@Override
- public Result findBlockAddress(String symbol) {
+ public Result findBlockAddress(String symbol,String lable) {
//获取用户ID
String mId = LoginUserUtils.getAppLoginUser().getId().toString();
MemberEntity member = memberDao.selectById(mId);
if (member == null) {
return Result.fail(MessageSourceUtils.getString("member_service_0003"));
}
- String lable = "ERC20";
+ if(StringUtils.isBlank(lable)){
+ //lable = "ERC20";
+ lable = "TRC20";
+ }
+
Result result = new Result();
try {
Map<String, String> map = new HashMap<String, String>();
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5c8de19..17d1b68 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -50,11 +50,11 @@
## Redis数据库索引（默认为0）
database: 1
## Redis服务器地址
- host: 154.91.195.160
+ host: 47.96.73.250
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: cpv-user123456
+ password: qwer12345678
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -72,10 +72,10 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 154.91.195.160
+ host: 47.96.73.250
port: 5672
- username: cpv_user
- password: cpv123456
+ username: rabbit
+ password: 123456
publisher-confirm-type: correlated
--
Gitblit v1.9.1