From 79f9ba270556be32c508ef50542ef402d41f9aba Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 23 Nov 2021 16:50:44 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 2
src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java | 10 ++--
src/main/resources/logback-spring.xml | 2
src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java | 4 +-
src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java | 2
src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java | 2
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 8 ++--
src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java | 2
pom.xml | 2
src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 26 ++++++------
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 2
src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java | 4 +-
src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java | 2
13 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index c31494b..ff9d9d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.xcong</groupId>
<artifactId>excoin</artifactId>
- <version>bea</version>
+ <version>XCT</version>
<name>excoin</name>
<description>Demo project for Spring Boot</description>
<parent>
diff --git a/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
index 1ebf9bd..c3d3a0d 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
@@ -6,5 +6,5 @@
* @author wzy
*/
public enum CoinTypeEnum {
- USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC,BEA, XCT
+ USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC, XCT
}
diff --git a/src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java
index 9f68507..bc9a734 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java
@@ -7,7 +7,7 @@
*/
@Getter
public enum SymbolEnum {
- BEA("BEA", "BEA/USDT")
+ XCT("XCT", "XCT/USDT")
,BTC("BTC", "BTC/USDT")
,ETH("ETH", "ETH/USDT")
,LTC("LTC", "LTC/USDT")
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
index fb3598d..fc0770c 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
@@ -49,12 +49,12 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = Exception.class)
public Result add(@RequestBody GbzAddDto gbzAddDto) {
-// String status = redisUtils.getString("bea_order_status");
+// String status = redisUtils.getString("xct_order_status");
// if ("1".equals(status)) {
// return Result.fail("无法购买");
// }
- String start = redisUtils.getString("bea_start");
+ String start = redisUtils.getString("xct_start");
if ("2".equals(start)) {
return Result.fail("暂无法购买");
}
@@ -63,9 +63,9 @@
return Result.fail("最少购买数量为10个");
}
- String total = redisUtils.getString("bea_coin_total");
+ String total = redisUtils.getString("xct_coin_total");
MemberEntity loginUser = LoginUserUtils.getAppLoginUser();
- BigDecimal price = new BigDecimal(redisUtils.getString("bea_order_new_price"));
+ BigDecimal price = new BigDecimal(redisUtils.getString("xct_order_new_price"));
BigDecimal amount = BigDecimal.valueOf(gbzAddDto.getCount()).multiply(price);
MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(loginUser.getId(), CoinTypeEnum.USDT.name());
@@ -74,7 +74,7 @@
}
if (Integer.parseInt(total) < gbzAddDto.getCount()) {
- return Result.fail("BEA数量不足");
+ return Result.fail("XCT数量不足");
}
GbzOrderEntity gbzOrder = new GbzOrderEntity();
@@ -82,13 +82,13 @@
gbzOrder.setAmount(amount);
gbzOrder.setCnt(gbzAddDto.getCount());
gbzOrder.setMemberId(loginUser.getId());
- gbzOrder.setSymbol(CoinTypeEnum.BEA.name());
+ gbzOrder.setSymbol(CoinTypeEnum.XCT.name());
gbzOrder.setStatus(1);
gbzOrderDao.insert(gbzOrder);
memberWalletCoinDao.updateBlockBalance(wallet.getId(), amount.negate(), BigDecimal.ZERO, 0);
- redisUtils.set("bea_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
+ redisUtils.set("xct_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
LogRecordUtils.insertMemberAccountMoneyChange(loginUser.getId(), "购买BEA", amount, "USDT", 1, 1);
return Result.ok("购买成功");
}
@@ -113,14 +113,14 @@
@GetMapping(value = "/findPrice")
public Result findPrice() {
PriceVo priceVo = new PriceVo();
- String newPriceStr = redisUtils.getString("bea_order_new_price");
+ String newPriceStr = redisUtils.getString("xct_order_new_price");
priceVo.setNewPrice(StrUtil.isNotBlank(newPriceStr) ? new BigDecimal(newPriceStr) : AppContants.DEFAULT_PRICE);
- String status = redisUtils.getString("bea_order_status");
+ String status = redisUtils.getString("xct_order_status");
priceVo.setStatus(StrUtil.isNotBlank(status) ? Integer.parseInt(status) : 2);
- String remain = redisUtils.getString("bea_coin_total");
+ String remain = redisUtils.getString("xct_coin_total");
priceVo.setRemainCnt(280000);
BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
@@ -131,7 +131,7 @@
@ApiOperation(value = "提取到资产")
@PostMapping(value = "/changeWallet")
public Result changeWallet() {
- String status = redisUtils.getString("bea_order_status");
+ String status = redisUtils.getString("xct_order_status");
if (!"1".equals(status)) {
return Result.fail("暂无法划转");
}
@@ -144,11 +144,11 @@
}
MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), CoinTypeEnum
- .BEA.name());
+ .XCT.name());
memberWalletCoinDao.updateBlockBalance(wallet.getId(), totalAmount, BigDecimal.ZERO, 0);
gbzOrderDao.updateStatus(member.getId());
- LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取BEA到资产", totalAmount, "BEA", 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取BEA到资产", totalAmount, "XCT", 1, 1);
return Result.ok("提取成功");
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
index 3039c5e..2e6cb2d 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -69,7 +69,7 @@
@SubmitRepeat
public Result submitSalesWalletCoinOrder(@RequestBody @Valid SubmitSalesWalletCoinOrderDto submitSalesWalletCoinOrderDto) {
log.debug("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto));
- String status = redisUtils.getString("bea_start");
+ String status = redisUtils.getString("xct_start");
if ("1".equals(status)) {
return Result.fail("暂未开放");
}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
index 643644d..cc332a8 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
@@ -485,7 +485,7 @@
}
Long memberId = memberCoinAddress.getMemberId();
// 查询钱包 并更新
- MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.BEA.name());
+ MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCT.name());
if (walletCoinEntity == null) {
// 创建一个钱包
// 创建这个钱包
@@ -501,15 +501,15 @@
memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0);
- String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.BEA.name(), "", BigDecimal.ZERO, null);
+ String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.XCT.name(), "", BigDecimal.ZERO, null);
// 插入财务记录
- LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.BEA.name(), 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.XCT.name(), 1, 1);
try {
ThreadPoolUtils.sendDingTalk(5);
MemberEntity member = memberDao.selectById(memberId);
if (StrUtil.isNotBlank(member.getPhone())) {
- String amount = balance.toPlainString() + "BEA";
+ String amount = balance.toPlainString() + "XCT";
Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
} else {
SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index 4ab4abf..0762d7c 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -809,7 +809,7 @@
@Override
public Result findAllWalletCoinOrder() {
- List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.BEA.toString());
+ List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.XCT.toString());
return Result.ok(orderCoinsDealEntities);
}
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java b/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
index a3eb732..c1d173a 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
@@ -5,8 +5,8 @@
public class SymbolsConstats {
public final static List<String> EXCHANGE_SYMBOLS = new ArrayList<>();
- public final static String ROC = "BEA";
+ public final static String ROC = "XCT";
static {
- EXCHANGE_SYMBOLS.add("BEA");
+ EXCHANGE_SYMBOLS.add("XCT");
}
}
diff --git a/src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java b/src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
index eb6deb1..191d892 100644
--- a/src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
+++ b/src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
@@ -382,7 +382,7 @@
kLine.setLow(kLine.getClose());
kLine.setHigh(kLine.getClose());
kLine.setVolume(BigDecimal.ZERO);
- redisUtils.set("BEA/USDT",kLine);
+ redisUtils.set("XCT/USDT",kLine);
}
}
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java
index dc019f2..cc37463 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java
@@ -52,7 +52,7 @@
@RabbitListener(queues = RabbitMqConfig.QUEUE_TRADE_PLATE)
public void tradePlate(String content) {
//log.info("--发送盘口消息--");
- tradePlateSendWebSocket.sendMessagePlate("BEA/USDT",content,null);
+ tradePlateSendWebSocket.sendMessagePlate("XCT/USDT",content,null);
}
/**
diff --git a/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java b/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
index 6dbef1b..6cc6030 100644
--- a/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
+++ b/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
@@ -22,8 +22,8 @@
return "EOS/USDT";
case "etcusdt":
return "ETC/USDT";
- case "beausdt":
- return "BEA/USDT";
+ case "xctusdt":
+ return "XCT/USDT";
default:
return null;
}
@@ -33,8 +33,8 @@
switch (symbol) {
case "BTC/USDT":
return "btcusdt";
- case "BEA/USDT":
- return "beausdt";
+ case "XCT/USDT":
+ return "xctusdt";
default:
return null;
}
@@ -56,7 +56,7 @@
return "EOS_NEW_PRICE";
case "ETC/USDT":
return "ETC_NEW_PRICE";
- case "BEA/USDT":
+ case "XCT/USDT":
return "BEA_NEW_PRICE";
default:
return null;
diff --git a/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java b/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
index 3c3dde7..b3a0d03 100644
--- a/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
+++ b/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
@@ -98,7 +98,7 @@
// 发送订阅消息
String nekk = factory.getTrader(SymbolsConstats.ROC).sendTradePlateMessage();
SubResultModel subResultModel = new SubResultModel();
- subResultModel.setId("beausdt");
+ subResultModel.setId("xctusdt");
subResultModel.setSubbed(sub);
synchronized (session) {
try {
@@ -220,7 +220,7 @@
String key = "KINE_{}_{}";
// 币币k线数据
//key = StrUtil.format(key, symbol, period);
- key = StrUtil.format(key, "BEA/USDT", period);
+ key = StrUtil.format(key, "XCT/USDT", period);
RedisUtils bean = SpringContextHolder.getBean(RedisUtils.class);
Object o = bean.get(key);
List<CandlestickModel> candlestickModels = new ArrayList<>();
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 565ee06..4982832 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
<configuration>
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="bea/logs" />
+ <property name="log.path" value="XCT/logs" />
<!-- <springProperty scope="context" name="log.path" source="logging.file.path"/>-->
<!-- 彩色日志 -->
--
Gitblit v1.9.1