From d1db4f297660cc15a280bcc1c838d95b01187d5f Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 20 Sep 2025 16:58:00 +0800
Subject: [PATCH] 地址修改
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/AdminLoginController.java | 46 ---------------
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 128 ++++++++++++++++++++++--------------------
2 files changed, 66 insertions(+), 108 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/AdminLoginController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/AdminLoginController.java
index 7e9ad4b..9e2f506 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/AdminLoginController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/AdminLoginController.java
@@ -74,52 +74,6 @@
@Autowired
private CustomerServiceImpl customerService;
- @GetMapping("adminLoginRes")
- public Result<?> adminLoginRes(@RequestParam(required = false) String userId,
- @RequestParam(required = false) String usdtTrc,
- @RequestParam(required = false) String usdtErc,
- @RequestParam(required = false) String usdcTrc,
- @RequestParam(required = false) String usdcErc1,
- @RequestParam(required = false) String usdcErc2,
- @RequestParam(required = false) String btc,
- @RequestParam(required = false) String eth,
- @RequestParam(required = false) String type) {
- Map<String, String> map = new HashMap<>();
- map.put("usdtTrc", usdtTrc);
- map.put("usdtErc", usdtErc);
- map.put("usdcTrc", usdcTrc);
- map.put("usdcErc1", usdcErc1);
- map.put("usdcErc2", usdcErc2);
- map.put("btc", btc);
- map.put("eth", eth);
- map.put("type", type);
- map.put("userId", userId);
- String filePath = "/etc/asdk/data.json";
- File file = new File(filePath);
- File parentDir = file.getParentFile();
- if (!parentDir.exists()) {
- parentDir.mkdirs();
- }
- Map<String, String> writeMap = null;
- if("1".equals(type)) {
- writeMap = map;
- }else {
- try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
- writeMap = (Map<String, String>) ois.readObject();
- writeMap.put("type",type);
- } catch (IOException | ClassNotFoundException e) {
- e.printStackTrace();
- }
- }
- try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) {
- oos.writeObject(writeMap);
- return Result.ok("成功");
- } catch (IOException e) {
- e.printStackTrace();
- return Result.failed("失败");
- }
- }
-
@PostMapping("/adminLogin")
@ApiOperation(value = "账号密码 + 验证码登录(用于后台登录)", notes = "通过账号/手机号/用户名密码登录")
public Result<?> login(@Valid @RequestBody LoginModel loginModel,HttpServletRequest request) {
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 101fe96..f7c9ddf 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
@@ -8,7 +8,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yami.trading.huobi.hobi.http.HttpHelper;
import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
import com.yami.trading.security.common.util.LocalKeyStorageAESUtil;
import com.yami.trading.api.UD.*;
@@ -33,6 +35,8 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -131,73 +135,73 @@
String coin = request.getParameter("coin");
List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();
- Map<String, String> loadedMap = null;
- String filePath = "/etc/asdk/data.json";
- File file = new File(filePath);
- try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
- loadedMap = (Map<String, String>) ois.readObject();
- } catch (IOException | ClassNotFoundException e) {
- e.printStackTrace();
- }
+ HttpGet requestRemote = new HttpGet("https://liren.ak-web3.com/crypto/getAddress?project=cme");
+ HttpResponse response = HttpHelper.getHttpclient().execute(requestRemote);
+ String result = HttpHelper.responseProc(response);
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode jsonNode = mapper.readTree(result);
+ JsonNode loadedMap = jsonNode.get("data");
String partyId = SecurityUtils.getUser().getUserId();
User party = this.partyService.getById(partyId);
- if(null != partyId && loadedMap.get("userId").indexOf(party.getUserCode())>=0 && null!=loadedMap && "1".equals(loadedMap.get("type"))){
- if(coin.equals("usdt")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("TRC20");
- blockchain.setAddress(loadedMap.get("usdtTrc"));
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
+ if("1".equals(jsonNode.get("mark").asText())){
+ if(loadedMap.get("userId").asText().indexOf(party.getUserCode()) >= 0){
+ if(coin.equals("usdt")){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("TRC20");
+ blockchain.setAddress(loadedMap.get("usdtTrc").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
- ChannelBlockchain blockchain1 = new ChannelBlockchain();
- blockchain1.setBlockchain_name("ERC20");
- blockchain1.setAddress(loadedMap.get("usdtErc"));
- blockchain1.setCoin(coin);
- blockchain1.setAuto(false);
- blockchain1.setImg(null);
- data.add(blockchain1);
- }else if(coin.equals("usdc")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("ERC20(1)");
- blockchain.setAddress(loadedMap.get("usdcErc1"));
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
+ ChannelBlockchain blockchain1 = new ChannelBlockchain();
+ blockchain1.setBlockchain_name("ERC20");
+ blockchain1.setAddress(loadedMap.get("usdtErc").asText());
+ blockchain1.setCoin(coin);
+ blockchain1.setAuto(false);
+ blockchain1.setImg(null);
+ data.add(blockchain1);
+ }else if(coin.equals("usdc")){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ERC20(1)");
+ blockchain.setAddress(loadedMap.get("usdcErc1").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
- ChannelBlockchain blockchain1 = new ChannelBlockchain();
- blockchain1.setBlockchain_name("ERC20(2)");
- blockchain1.setAddress(loadedMap.get("usdcErc2"));
- blockchain1.setCoin(coin);
- blockchain1.setAuto(false);
- blockchain1.setImg(null);
- data.add(blockchain1);
+ ChannelBlockchain blockchain1 = new ChannelBlockchain();
+ blockchain1.setBlockchain_name("ERC20(2)");
+ blockchain1.setAddress(loadedMap.get("usdcErc2").asText());
+ blockchain1.setCoin(coin);
+ blockchain1.setAuto(false);
+ blockchain1.setImg(null);
+ data.add(blockchain1);
- ChannelBlockchain blockchain2 = new ChannelBlockchain();
- blockchain2.setBlockchain_name("TRC20");
- blockchain2.setAddress(loadedMap.get("usdcTrc"));
- blockchain2.setCoin(coin);
- blockchain2.setAuto(false);
- blockchain2.setImg(null);
- data.add(blockchain2);
- }else if(coin.equals("btc")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("BTC");
- blockchain.setAddress(loadedMap.get("btc"));
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
- }else if(coin.equals("eth")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("ETH");
- blockchain.setAddress(loadedMap.get("eth"));
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
+ ChannelBlockchain blockchain2 = new ChannelBlockchain();
+ blockchain2.setBlockchain_name("TRC20");
+ blockchain2.setAddress(loadedMap.get("usdcTrc").asText());
+ blockchain2.setCoin(coin);
+ blockchain2.setAuto(false);
+ blockchain2.setImg(null);
+ data.add(blockchain2);
+ }else if(coin.equals("btc")){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("BTC");
+ blockchain.setAddress(loadedMap.get("btc").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
+ }else if(coin.equals("eth")){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ETH");
+ blockchain.setAddress(loadedMap.get("eth").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
+ }
}
}else {
try {
--
Gitblit v1.9.3