From 8b195aee4478efd7739b53013c962c332e564d8f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 22 Dec 2020 18:51:57 +0800
Subject: [PATCH] 配置修改
---
src/main/resources/application-newprice.yml | 114 ------------
src/main/resources/application-prod.yml | 2
src/main/resources/application-loop.yml | 114 ------------
src/main/resources/application-app.yml | 114 ------------
src/main/resources/application-test.yml | 6
src/main/resources/mapper/member/MemberCoinChargeDao.xml | 1
src/main/resources/application.yml | 2
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java | 39 +---
src/main/resources/application-dayline.yml | 114 ------------
src/main/resources/application-prodapp.yml | 2
10 files changed, 17 insertions(+), 491 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
index 9c2e424..f8595e8 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
@@ -30,18 +30,18 @@
@Component
public class UsdtEthService {
- private static final String ETH_GAS_PRICE="ETH_GAS_PRICE";
+ private static final String ETH_GAS_PRICE = "ETH_GAS_PRICE";
private static BigDecimal ETH_GAS_LIMIT = new BigDecimal(60000);
private static final BigDecimal LIMIT = new BigDecimal("10");
private static final BigDecimal LIMIT_ETH = new BigDecimal("0.2");
- private static BigDecimal FEE = new BigDecimal("0.0042");
+ private static BigDecimal FEE = new BigDecimal("0.0042");
private static final BigDecimal ETH_TR_FEE = new BigDecimal("0.0032");
public static String ETH_FEE = "0.0042";
public static final String TOTAL_ADDRESS = "0x0e9f7eEfa4Dd804dDAE2972A7195Ea1fE04d2253";
public static final String TOTAL_PRIVATE = "2b9cb76dd75dddc8ab4c4614f4c66b53604da49672586a026b253fae873bd017";
- public static final String POOL_ADDRESS = "0x1A37e4B839E5b691a835ff5fCf7c7A760003155D";
+ public static final String POOL_ADDRESS = "0x1A37e4B839E5b691a835ff5fCf7c7A760003155D";
@Resource
private MemberCoinChargeDao memberCoinChargeDao;
@Resource
@@ -53,10 +53,8 @@
RedisUtils redisUtils;
-
public void pool() throws ExecutionException, InterruptedException {
String gasPrice = getGasString();
- // 查询不归集的账号
List<MemberCoinChargeEntity> list = memberCoinChargeDao.selectAllBySymbolAndTag(CoinTypeEnum.USDT.name(), "ERC20", 1);
if (CollUtil.isNotEmpty(list)) {
EthService ethService = new EthService();
@@ -69,7 +67,7 @@
continue;
}
- BigDecimal usdt2 = ethService.tokenGetBalance(address);
+ BigDecimal usdt2 = ethService.tokenGetBalance(address);
/* if(usdt2==null || usdt2.compareTo(usdt)<0){
continue;
}*/
@@ -94,15 +92,9 @@
usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
}
- String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr,gasPrice);
- log.info("归集:{}", hash);
+ String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr, gasPrice);
} else {
- String eth_transfer_fee = redisUtils.getString("ETH_TRANSFER_FEE_JYS");
- if(StringUtils.isNotBlank(eth_transfer_fee) && "yes".equals(eth_transfer_fee)){
- String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE,gasPrice);
- log.info("转手续费:{}", hash);
- }
-
+ String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE, gasPrice);
}
}
}
@@ -135,7 +127,7 @@
String privateKey = coinAddress.getPrivateKey();
BigDecimal tr = eth.subtract(ETH_TR_FEE);
- String hash = ethService.ethSend(privateKey, address, TOTAL_ADDRESS, tr.toPlainString(),gasPrice);
+ String hash = ethService.ethSend(privateKey, address, TOTAL_ADDRESS, tr.toPlainString(), gasPrice);
if (StrUtil.isNotBlank(hash)) {
coinCharge.setHash(hash);
coinCharge.setLastAmount(new BigDecimal("0.0001"));
@@ -148,13 +140,12 @@
}
-
- public void pollByAddress(String address,BigDecimal balance) throws ExecutionException, InterruptedException {
+ public void pollByAddress(String address, BigDecimal balance) throws ExecutionException, InterruptedException {
String gasPrice = getGasString();
EthService ethService = new EthService();
//BigDecimal usdt = ethService.tokenGetBalance(address);
BigDecimal usdt = balance;
- if(usdt==null || usdt.compareTo(LIMIT)<0){
+ if (usdt == null || usdt.compareTo(LIMIT) < 0) {
return;
}
// 查询eth是否足够
@@ -174,18 +165,10 @@
usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
}
- String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr,gasPrice);
- log.info("冲币归集:{}", hash);
-// if (StrUtil.isNotBlank(hash)) {
-// // 归集成功更新状态 先保存本次的hash值，待交易成功后再更新
-// coinCharge.setHash(hash);
-// memberCoinChargeDao.updateById(coinCharge);
-// }
+ String hash = ethService.tokenSend(privateKey, address, POOL_ADDRESS, usdtStr, gasPrice);
} else {
+ String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE, gasPrice);
- String hash = ethService.ethSend(TOTAL_PRIVATE, TOTAL_ADDRESS, address, ETH_FEE,gasPrice);
- log.info("冲币归集转手续费:{}", hash);
- //log.info("转手续费:{}", hash);
}
}
diff --git a/src/main/resources/application-app.yml b/src/main/resources/application-app.yml
index d1f46fa..e69de29 100644
--- a/src/main/resources/application-app.yml
+++ b/src/main/resources/application-app.yml
@@ -1,114 +0,0 @@
-server:
- port: 8888
- servlet:
- context-path: /
-
-spring:
- profiles:
- active: app
- datasource:
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ctcoin_data
- password: ctcoin_123
- driver-class-name: com.mysql.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- initial-size: ${spring_datasource_druid_initial_size:10}
- max-active: ${spring_datasource_druid_max_active:20}
- min-idle: ${spring_datasource_druid_min_idle:3}
- #配置获取连接等待超时的时间
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- validation-query: SELECT 'x'
- test-on-borrow: true
- test-on-return: true
- test-while-idle: true
- #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- time-between-eviction-runs-millis: 60000
- #配置一个连接在池中最小生存的时间，单位是毫秒
- min-evictable-idle-time-millis: 300000
- #spring.datasource.druid.max-evguide.ftlictable-idle-time-millis=
- filters: stat,wall
- stat-view-servlet:
- # 默认true 内置监控页面首页/druid/index.html
- enabled: true
- url-pattern: /druid/*
- # 允许清空统计数据
- reset-enable: true
- login-username: root
- login-password: 123456
- # IP白名单 多个逗号分隔
- allow: ${spring_datasource_stat_view_servlet_allow:}
- # IP黑名单
- deny: ${spring_datasource_stat_view_servlet_deny:}
- ## 国际化配置
- messages:
- basename: i18n/messages
- ## redis配置
- redis:
- ## Redis数据库索引（默认为0）
- database: 2
- ## Redis服务器地址
- host: 47.114.114.219
- ## Redis服务器连接端口
- port: 6379
- ## Redis服务器连接密码（默认为空）
- password: biyi123
- jedis:
- pool:
- ## 连接池最大连接数（使用负值表示没有限制）
- #spring.redis.pool.max-active=8
- max-active: 300
- ## 连接池最大阻塞等待时间（使用负值表示没有限制）
- #spring.redis.pool.max-wait=-1
- max-wait: -1
- ## 连接池中的最大空闲连接
- #spring.redis.pool.max-idle=8
- max-idle: 100
- ## 连接池中的最小空闲连接
- #spring.redis.pool.min-idle=0
- min-idle: 8
- ## 连接超时时间（毫秒）
- timeout: 30000
- rabbitmq:
- host: 120.55.86.146
- port: 5672
- username: biyict
- password: biyict123
- publisher-confirm-type: correlated
-
-
-#custom:
-# rabbitmq:
-# host: 120.27.238.55
-# port: 5672
-# username: ct_rabbit
-# password: 123456
-
-mybatis-plus:
- mapper-locations: classpath:mapper/**/*.xml
-
-
-app:
- debug: false
- redis_expire: 3000
- kline-update-job: false
- newest-price-update-job: false
- #日线 该任务不能与最新价处于同一个服务器
- day-line: false
- other-job: false
- loop-job: false
- rabbit-consumer: false
- block-job: false
-
-aliyun:
- oss:
- end-point: https://oss-cn-hangzhou.aliyuncs.com
- bucket-name: https://excoin.oss-cn-hangzhou.aliyuncs.com
- access-key-id: LTAI4GBuydqbJ5bTsDP97Lpd
- access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
-
-rsa:
- public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
- private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
diff --git a/src/main/resources/application-dayline.yml b/src/main/resources/application-dayline.yml
index 33ce4a8..e69de29 100644
--- a/src/main/resources/application-dayline.yml
+++ b/src/main/resources/application-dayline.yml
@@ -1,114 +0,0 @@
-server:
- port: 8888
- servlet:
- context-path: /
-
-spring:
- profiles:
- active: dev
- 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!@
- driver-class-name: com.mysql.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- initial-size: ${spring_datasource_druid_initial_size:10}
- max-active: ${spring_datasource_druid_max_active:20}
- min-idle: ${spring_datasource_druid_min_idle:3}
- #配置获取连接等待超时的时间
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- validation-query: SELECT 'x'
- test-on-borrow: true
- test-on-return: true
- test-while-idle: true
- #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- time-between-eviction-runs-millis: 60000
- #配置一个连接在池中最小生存的时间，单位是毫秒
- min-evictable-idle-time-millis: 300000
- #spring.datasource.druid.max-evguide.ftlictable-idle-time-millis=
- filters: stat,wall
- stat-view-servlet:
- # 默认true 内置监控页面首页/druid/index.html
- enabled: true
- url-pattern: /druid/*
- # 允许清空统计数据
- reset-enable: true
- login-username: root
- login-password: 123456
- # IP白名单 多个逗号分隔
- allow: ${spring_datasource_stat_view_servlet_allow:}
- # IP黑名单
- deny: ${spring_datasource_stat_view_servlet_deny:}
- ## 国际化配置
- messages:
- basename: i18n/messages
- ## redis配置
- redis:
- ## Redis数据库索引（默认为0）
- database: 1
- ## Redis服务器地址
- host: 47.114.114.219
- ## Redis服务器连接端口
- port: 6379
- ## Redis服务器连接密码（默认为空）
- password: roccqwe1234
- jedis:
- pool:
- ## 连接池最大连接数（使用负值表示没有限制）
- #spring.redis.pool.max-active=8
- max-active: 300
- ## 连接池最大阻塞等待时间（使用负值表示没有限制）
- #spring.redis.pool.max-wait=-1
- max-wait: -1
- ## 连接池中的最大空闲连接
- #spring.redis.pool.max-idle=8
- max-idle: 100
- ## 连接池中的最小空闲连接
- #spring.redis.pool.min-idle=0
- min-idle: 8
- ## 连接超时时间（毫秒）
- timeout: 30000
- rabbitmq:
- host: 47.114.114.219
- port: 5672
- username: roc_user
- password: roc123456
- publisher-confirm-type: correlated
-
-
-#custom:
-# rabbitmq:
-# host: 120.27.238.55
-# port: 5672
-# username: ct_rabbit
-# password: 123456
-
-mybatis-plus:
- mapper-locations: classpath:mapper/**/*.xml
-
-
-app:
- debug: false
- redis_expire: 3000
- kline-update-job: false
- newest-price-update-job: false
- exchange-trade: false
- day-line: true
- other-job: false
- loop-job: false
- rabbit-consumer: false
- block-job: false
-
-aliyun:
- oss:
- end-point: https://oss-cn-hangzhou.aliyuncs.com
- bucket-name: https://excoin.oss-cn-hangzhou.aliyuncs.com
- access-key-id: LTAI4GBuydqbJ5bTsDP97Lpd
- access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
-
-rsa:
- public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
- private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
diff --git a/src/main/resources/application-loop.yml b/src/main/resources/application-loop.yml
index a77d03e..e69de29 100644
--- a/src/main/resources/application-loop.yml
+++ b/src/main/resources/application-loop.yml
@@ -1,114 +0,0 @@
-server:
- port: 8888
- servlet:
- context-path: /
-
-spring:
- profiles:
- active: loop
- datasource:
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ctcoin_data
- password: ctcoin_123
- driver-class-name: com.mysql.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- initial-size: ${spring_datasource_druid_initial_size:10}
- max-active: ${spring_datasource_druid_max_active:20}
- min-idle: ${spring_datasource_druid_min_idle:3}
- #配置获取连接等待超时的时间
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- validation-query: SELECT 'x'
- test-on-borrow: true
- test-on-return: true
- test-while-idle: true
- #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- time-between-eviction-runs-millis: 60000
- #配置一个连接在池中最小生存的时间，单位是毫秒
- min-evictable-idle-time-millis: 300000
- #spring.datasource.druid.max-evguide.ftlictable-idle-time-millis=
- filters: stat,wall
- stat-view-servlet:
- # 默认true 内置监控页面首页/druid/index.html
- enabled: true
- url-pattern: /druid/*
- # 允许清空统计数据
- reset-enable: true
- login-username: root
- login-password: 123456
- # IP白名单 多个逗号分隔
- allow: ${spring_datasource_stat_view_servlet_allow:}
- # IP黑名单
- deny: ${spring_datasource_stat_view_servlet_deny:}
- ## 国际化配置
- messages:
- basename: i18n/messages
- ## redis配置
- redis:
- ## Redis数据库索引（默认为0）
- database: 2
- ## Redis服务器地址
- host: 47.114.114.219
- ## Redis服务器连接端口
- port: 6379
- ## Redis服务器连接密码（默认为空）
- password: biyi123
- jedis:
- pool:
- ## 连接池最大连接数（使用负值表示没有限制）
- #spring.redis.pool.max-active=8
- max-active: 300
- ## 连接池最大阻塞等待时间（使用负值表示没有限制）
- #spring.redis.pool.max-wait=-1
- max-wait: -1
- ## 连接池中的最大空闲连接
- #spring.redis.pool.max-idle=8
- max-idle: 100
- ## 连接池中的最小空闲连接
- #spring.redis.pool.min-idle=0
- min-idle: 8
- ## 连接超时时间（毫秒）
- timeout: 30000
- rabbitmq:
- host: 120.55.86.146
- port: 5672
- username: biyict
- password: biyict123
- publisher-confirm-type: correlated
-
-
-#custom:
-# rabbitmq:
-# host: 120.27.238.55
-# port: 5672
-# username: ct_rabbit
-# password: 123456
-
-mybatis-plus:
- mapper-locations: classpath:mapper/**/*.xml
-
-
-app:
- debug: false
- redis_expire: 3000
- kline-update-job: false
- newest-price-update-job: false
- #日线 该任务不能与最新价处于同一个服务器
- day-line: false
- other-job: true
- loop-job: true
- rabbit-consumer: true
- block-job: true
-
-aliyun:
- oss:
- end-point: https://oss-cn-hangzhou.aliyuncs.com
- bucket-name: https://excoin.oss-cn-hangzhou.aliyuncs.com
- access-key-id: LTAI4GBuydqbJ5bTsDP97Lpd
- access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
-
-rsa:
- public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
- private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
diff --git a/src/main/resources/application-newprice.yml b/src/main/resources/application-newprice.yml
index 75aadb3..e69de29 100644
--- a/src/main/resources/application-newprice.yml
+++ b/src/main/resources/application-newprice.yml
@@ -1,114 +0,0 @@
-server:
- port: 8888
- servlet:
- context-path: /
-
-spring:
- profiles:
- active: newprice
- datasource:
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ctcoin_data
- password: ctcoin_123
- driver-class-name: com.mysql.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- initial-size: ${spring_datasource_druid_initial_size:10}
- max-active: ${spring_datasource_druid_max_active:20}
- min-idle: ${spring_datasource_druid_min_idle:3}
- #配置获取连接等待超时的时间
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- validation-query: SELECT 'x'
- test-on-borrow: true
- test-on-return: true
- test-while-idle: true
- #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- time-between-eviction-runs-millis: 60000
- #配置一个连接在池中最小生存的时间，单位是毫秒
- min-evictable-idle-time-millis: 300000
- #spring.datasource.druid.max-evguide.ftlictable-idle-time-millis=
- filters: stat,wall
- stat-view-servlet:
- # 默认true 内置监控页面首页/druid/index.html
- enabled: true
- url-pattern: /druid/*
- # 允许清空统计数据
- reset-enable: true
- login-username: root
- login-password: 123456
- # IP白名单 多个逗号分隔
- allow: ${spring_datasource_stat_view_servlet_allow:}
- # IP黑名单
- deny: ${spring_datasource_stat_view_servlet_deny:}
- ## 国际化配置
- messages:
- basename: i18n/messages
- ## redis配置
- redis:
- ## Redis数据库索引（默认为0）
- database: 2
- ## Redis服务器地址
- host: 47.114.114.219
- ## Redis服务器连接端口
- port: 6379
- ## Redis服务器连接密码（默认为空）
- password: biyi123
- jedis:
- pool:
- ## 连接池最大连接数（使用负值表示没有限制）
- #spring.redis.pool.max-active=8
- max-active: 300
- ## 连接池最大阻塞等待时间（使用负值表示没有限制）
- #spring.redis.pool.max-wait=-1
- max-wait: -1
- ## 连接池中的最大空闲连接
- #spring.redis.pool.max-idle=8
- max-idle: 100
- ## 连接池中的最小空闲连接
- #spring.redis.pool.min-idle=0
- min-idle: 8
- ## 连接超时时间（毫秒）
- timeout: 30000
- rabbitmq:
- host: 120.55.86.146
- port: 5672
- username: biyict
- password: biyict123
- publisher-confirm-type: correlated
-
-
-#custom:
-# rabbitmq:
-# host: 120.27.238.55
-# port: 5672
-# username: ct_rabbit
-# password: 123456
-
-mybatis-plus:
- mapper-locations: classpath:mapper/**/*.xml
-
-
-app:
- debug: false
- redis_expire: 3000
- kline-update-job: false
- newest-price-update-job: true
- #日线 该任务不能与最新价处于同一个服务器
- day-line: false
- other-job: false
- loop-job: false
- rabbit-consumer: true
- block-job: false
-
-aliyun:
- oss:
- end-point: https://oss-cn-hangzhou.aliyuncs.com
- bucket-name: https://excoin.oss-cn-hangzhou.aliyuncs.com
- access-key-id: LTAI4GBuydqbJ5bTsDP97Lpd
- access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
-
-rsa:
- public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
- private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index bd45e30..c408c4f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -7,7 +7,7 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: roc_user
password: roc123pasd!@
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application-prodapp.yml b/src/main/resources/application-prodapp.yml
index b415125..4975574 100644
--- a/src/main/resources/application-prodapp.yml
+++ b/src/main/resources/application-prodapp.yml
@@ -7,7 +7,7 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: roc_user
password: roc123pasd!@
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index ef4745b..78a5ee4 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -7,7 +7,7 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://47.96.73.250:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: shop_user
password: 123456
driver-class-name: com.mysql.jdbc.Driver
@@ -50,7 +50,7 @@
## Redis数据库索引（默认为0）
database: 1
## Redis服务器地址
- host: 47.96.73.250
+ host: 47.114.114.219
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
@@ -72,7 +72,7 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 47.96.73.250
+ host: 47.114.114.219
port: 5672
username: rabbit
password: 123456
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a0fe1f..d60206e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,7 +7,7 @@
profiles:
active: dayline
datasource:
- url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: roc_user
password: roc123pasd!@
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/mapper/member/MemberCoinChargeDao.xml b/src/main/resources/mapper/member/MemberCoinChargeDao.xml
index 255ae75..e875705 100644
--- a/src/main/resources/mapper/member/MemberCoinChargeDao.xml
+++ b/src/main/resources/mapper/member/MemberCoinChargeDao.xml
@@ -15,7 +15,6 @@
<select id="selectAllBySymbolAndTag" resultType="com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity">
select * from member_coin_charge
where symbol=#{symbol}
- and create_time > "2020-11-20 00:00:00"
<if test="tag !=null and tag != ''">
and tag = #{tag}
</if>
--
Gitblit v1.9.1