From 62d7a119eff0f11e4cf3f98249e1b8d978507944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Nov 2021 15:19:57 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 2 +-
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
index 2a4bd52..1643e11 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -38,7 +38,7 @@
public class TrxUsdtUpdateService {
public static List<String> addressList = new ArrayList<>();
- private static String http = "https://api.shasta.trongrid.io";
+ private static String http = "https://api.trongrid.io";
private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 08c13dd..2fb473a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -122,10 +122,10 @@
return Result.fail("账号已存在");
}
-// boolean isTrue = commonservice.verifyCode(registerDto.getAccount(), registerDto.getCode());
-// if (!isTrue) {
-// return Result.fail(MessageSourceUtils.getString("common_verify_code"));
-// }
+ boolean isTrue = commonservice.verifyCode(registerDto.getAccount(), registerDto.getCode());
+ if (!isTrue) {
+ return Result.fail(MessageSourceUtils.getString("common_verify_code"));
+ }
member = new MemberEntity();
member.setPassword(SecureUtil.md5(registerDto.getPassword()));
--
Gitblit v1.9.1