From 4363803b4107bb7698391de0867236ce553e8f50 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Dec 2025 18:36:35 +0800
Subject: [PATCH] 1
---
trading-order-security-common/src/main/java/com/yami/trading/security/common/enums/CryptoCurrencyEnum.java | 4 ++--
trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java | 13 +++++++------
trading-order-admin/src/main/resources/config/system.properties | 4 ++--
trading-order-admin/src/main/resources/email/ftl/verification_email.ftl | 4 ++--
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
index 45b37f9..4b82ab7 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/UD/UdunClient.java
@@ -21,17 +21,17 @@
/**
* UDUN API Gateway
*/
- private final String gateway = "https://sig11.udun.io";
+ private final String gateway = "https://sig10.udun.io";
/**
* UDUN Merchant Key
*/
- private final String merchantKey = "7161e42ff45204dca8b9c4e203b24f63";
+ private final String merchantKey = "2ea108221e1ab2129a614ca4f1e899ef";
/**
* UDUN Merchant Number
*/
- private final String merchantId = "321176";
+ private final String merchantId = "322138";
/**
* Callback 充值
@@ -139,12 +139,13 @@
public static void main(String[] args) {
Map<String, Object> params = new HashMap<>();
- params.put("merchantId", 321176);
+ params.put("merchantId", 322138);
params.put("showBalance", false);
- ResultMsg result = JSONUtil.toBean(UdunUtils.post("https://sig11.udun.io", "7161e42ff45204dca8b9c4e203b24f63", ApiPath.SUPPORT_COIN, JSONUtil.toJsonStr(params)), ResultMsg.class);
+ ResultMsg result = JSONUtil.toBean(UdunUtils.post("https://sig10.udun.io", "2ea108221e1ab2129a614ca4f1e899ef", ApiPath.SUPPORT_COIN, JSONUtil.toJsonStr(params)), ResultMsg.class);
if (result.getCode() != HttpStatus.HTTP_OK) {
Console.error(JSONUtil.toJsonStr(result));
}
- System.out.println(JSONUtil.toList(JSONUtil.parseArray(result.getData()), Coin.class));
+ List<Coin> coinList = JSONUtil.toList(JSONUtil.parseArray(result.getData()), Coin.class);
+ System.out.println(coinList);
}
}
diff --git a/trading-order-admin/src/main/resources/config/system.properties b/trading-order-admin/src/main/resources/config/system.properties
index 2d8380f..0ccac30 100644
--- a/trading-order-admin/src/main/resources/config/system.properties
+++ b/trading-order-admin/src/main/resources/config/system.properties
@@ -17,6 +17,6 @@
email.host=smtp.share-email.com
-email.username=donotreply@fractionxex.com
+email.username=noreply@fractionxex.com
email.password=aa123456@
-email.from=donotreply@fractionxex.com
\ No newline at end of file
+email.from=noreply@fractionxex.com
\ No newline at end of file
diff --git a/trading-order-admin/src/main/resources/email/ftl/verification_email.ftl b/trading-order-admin/src/main/resources/email/ftl/verification_email.ftl
index 7663c96..05f5942 100644
--- a/trading-order-admin/src/main/resources/email/ftl/verification_email.ftl
+++ b/trading-order-admin/src/main/resources/email/ftl/verification_email.ftl
@@ -17,14 +17,14 @@
</style>
</head>
<body>
-<p>Thank you for creating a MetaEquityEX account.</p>
+<p>Thank you for creating a FracTionxEX account.</p>
<p>Please enter the following verification code to complete your registration:</p>
<!-- 带样式的验证码 -->
<div class="code-box">${code}</div>
<p>This code is valid for 10 minutes. Please do not share it with anyone. If this was not requested by you, please contact our customer support team immediately.</p>
-<p style="text-align: right; margin-top: 30px;">— The MetaEquityEX Team</p>
+<p style="text-align: right; margin-top: 30px;">— The FracTionxEX Team</p>
</body>
</html>
diff --git a/trading-order-security-common/src/main/java/com/yami/trading/security/common/enums/CryptoCurrencyEnum.java b/trading-order-security-common/src/main/java/com/yami/trading/security/common/enums/CryptoCurrencyEnum.java
index 774c5b4..511b654 100644
--- a/trading-order-security-common/src/main/java/com/yami/trading/security/common/enums/CryptoCurrencyEnum.java
+++ b/trading-order-security-common/src/main/java/com/yami/trading/security/common/enums/CryptoCurrencyEnum.java
@@ -23,8 +23,8 @@
USDT_ERC20("usdt", "ERC20","USDT-ERC20", "usdt"),
ETH("eth", "ETH","ETH", "ethusdt"),
BTC("btc", "BTC","BTC", "btcusdt"),
- USDC_ERC20("usdc", "ERC20","USDC-ERC20", "usdcusdt"),
- USDC_TRC20("usdc", "TRC20","USDC-TRC20", "usdcusdt");
+ USDC_ERC20("usdc", "ERC20","USDC", "usdcusdt"),
+ USDC_TRC20("usdc", "TRC20","USDCTRC20", "usdcusdt");
private final String coin;
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
index 900274e..8d59b3f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
@@ -93,7 +93,7 @@
}
// log.info(MessageFormat.format("target:{0},code:{1},ip:{2}", target, code, ip));
- String content = "[FracTionXEX]";
+ String content = "[FracTionxEX]";
if (target.indexOf("@") == -1) {
send_code_text = this.sysparaService.find("send_code_text").getSvalue();
--
Gitblit v1.9.3