From 3a4b0612d57d9799444867fa600ac3138cfb40ba Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Jun 2021 11:18:32 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 2 +- src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java | 4 ++-- src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java | 2 +- src/main/resources/application-prod.yml | 6 +++--- src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 6 +++--- src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java | 2 +- src/main/resources/application.yml | 14 +++++++------- 7 files changed, 18 insertions(+), 18 deletions(-) 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 f50807c..93cba89 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,ROC + USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC,GBZ } 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 58e1460..32f69d5 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 { - ROC("ROC", "ROC/USDT") + GBZ("GBZ", "GBZ/USDT") ,BTC("BTC", "BTC/USDT") ,ETH("ETH", "ETH/USDT") ,LTC("LTC", "LTC/USDT") 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 0501a20..0dcf023 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 @@ -505,7 +505,7 @@ } Long memberId = memberCoinAddress.getMemberId(); // 查询钱包 并更新 - MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.ROC.name()); + MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.GBZ.name()); if (walletCoinEntity == null) { // 创建一个钱包 // 创建这个钱包 @@ -521,9 +521,9 @@ memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0); - String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.ROC.name(), "", BigDecimal.ZERO, null); + String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.GBZ.name(), "", BigDecimal.ZERO, null); // 插入财务记录 - LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.ROC.name(), 1, 1); + LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.GBZ.name(), 1, 1); try { ThreadPoolUtils.sendDingTalk(5); 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 0e6d092..1e857f9 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.ROC.toString()); + List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.GBZ.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 2ae5ded..9e68c31 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 = "ROC"; + public final static String ROC = "GBZ"; static { - EXCHANGE_SYMBOLS.add("ROC"); + EXCHANGE_SYMBOLS.add("GBZ"); } } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index f50bae3..641235b 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -7,9 +7,9 @@ profiles: active: prod datasource: - url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 - username: roc_user - password: roc123pasd!@ + url: jdbc:mysql://127.0.0.1:3306/db_gbz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 + username: db_gbz + password: db_gbz123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 149dae1..7743f81 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -72,10 +72,10 @@ ## 连接超时时间(毫秒) timeout: 30000 rabbitmq: - host: 47.114.114.219 + host: 154.91.195.155 port: 5672 - username: roc_user - password: roc123456 + username: abc_user + password: abc123 publisher-confirm-type: correlated @@ -94,13 +94,13 @@ debug: false redis_expire: 3000 kline-update-job: false - newest-price-update-job: false - exchange-trade: false + newest-price-update-job: true + exchange-trade: true day-line: false - other-job: false + other-job: true loop-job: false rabbit-consumer: false - block-job: false + block-job: true aliyun: oss: -- Gitblit v1.9.1