From 31ca313cfbdd0e1805d48de0fca339121254fab8 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Tue, 02 Sep 2025 14:07:16 +0800
Subject: [PATCH] 修改

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java                         |    6 +++---
 trading-order-admin/src/main/resources/redisson/redisson-dev.yml                                               |    2 +-
 trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java |    6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
index b626ca4..574323f 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
@@ -127,7 +127,11 @@
     public Object getBlockchainName(HttpServletRequest request) throws Exception {
         String coin = request.getParameter("coin");
 //        List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();
-        return Result.succeed(channelBlockchainService.list(Wrappers.<ChannelBlockchain>query().lambda().eq(ChannelBlockchain::getCoin, coin.toLowerCase())));
+        List<ChannelBlockchain> data = channelBlockchainService.list(Wrappers.<ChannelBlockchain>query().lambda().eq(ChannelBlockchain::getCoin, coin.toLowerCase()));
+        for (ChannelBlockchain cbc : data) {
+            cbc.setBlockchain_name(cbc.getBlockchainName());
+        }
+        return Result.succeed(data);
 //        try {
 //            coin  = coin.toLowerCase();
 //            Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
diff --git a/trading-order-admin/src/main/resources/redisson/redisson-dev.yml b/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
index c76245f..e2dc559 100644
--- a/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
+++ b/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
@@ -5,7 +5,7 @@
   password:
   idleConnectionTimeout: 10000
   connectTimeout: 10000
-  timeout: 3000
+  timeout: 30000
   retryAttempts: 3
   retryInterval: 1500
   clientName: null
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index bc35e06..d152d52 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -1276,9 +1276,9 @@
             if (user != null) {
                 throw new YamiShopBindException("账号已存在!");
             }
-            if (!isValidUsername(userName)) {
-                throw new YamiShopBindException("用户名不合法!");
-            }
+//            if (!isValidUsername(userName)) {
+//                throw new YamiShopBindException("用户名不合法!");
+//            }
             user = new User();
             user.setUserName(userName);
         }

--
Gitblit v1.9.3