| src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-app.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-dayline.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-loop.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-newprice.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/logback-spring.xml | ●●●●● patch | view | raw | blame | history |
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -65,7 +65,7 @@ // 扫块区块 Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM"); if(trc20BlockNum==null){ trc20BlockNum = 27805917L; trc20BlockNum = 28095275L; } Long blockNum = Long.valueOf(trc20BlockNum.toString()); src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
@@ -85,7 +85,7 @@ // 获取最新区块 String string = redisUtils.getString(ETH_USDT_BLOCK_NUM); if(string==null){ string = "11892420"; string = "11957825"; } BigInteger blockNum = new BigInteger(string); Credentials credentials = Credentials.create(privateKey); src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
@@ -1,5 +1,6 @@ package com.xcong.excoin.modules.contract.parameter.vo; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +36,7 @@ @ApiModelProperty("开仓均价") private BigDecimal openingPrice; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("开仓价") private Date openingTime; @@ -60,7 +61,7 @@ @ApiModelProperty("平仓手续费") private BigDecimal closingFeeAmount; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("平仓时间") private Date closingTime; @@ -76,6 +77,13 @@ @ApiModelProperty(value = "合约类型 1-普通 2-跟单") private Integer contractType; @ApiModelProperty(value = "订单编号") private String orderNo; public String getOrderNo() { return StrUtil.isNotBlank(orderNo) ? orderNo.substring(orderNo.length() - 6) : ""; } public String getOpeningFeeAmount() { return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); } src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -42,7 +42,7 @@ private FollowTraderProfitInfoDao followTraderProfitInfoDao; //@Scheduled(cron = "0 0/30 * * * ? ") @Scheduled(cron = "0 0/5 * * * ? *") @Scheduled(cron = "0 0/5 * * * ?") public void traderProfitUpdate() { log.info("交易员定时任务执行"); // 查询所有交易员信息 src/main/resources/application-app.yml
@@ -7,9 +7,9 @@ profiles: active: app datasource: url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: db_hibit password: hibit123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 114.55.92.106 host: 192.168.0.36 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: hibit123 password: d32ncxe@i3#!dV jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,10 +72,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.55.86.146 host: 192.168.0.36 port: 5672 username: biyict password: biyict123 username: hibit password: hibit123 publisher-confirm-type: correlated
@@ -7,9 +7,9 @@ profiles: active: dayline datasource: url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: db_hibit password: hibit123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 114.55.92.106 host: 192.168.0.36 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: hibit123 password: d32ncxe@i3#!dV jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,10 +72,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.55.86.146 host: 192.168.0.36 port: 5672 username: biyict password: biyict123 username: hibit password: hibit123 publisher-confirm-type: correlated
@@ -7,9 +7,9 @@ profiles: active: loop datasource: url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: db_hibit password: hibit123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 114.55.92.106 host: 192.168.0.36 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: hibit123 password: d32ncxe@i3#!dV jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,10 +72,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.55.86.146 host: 192.168.0.36 port: 5672 username: biyict password: biyict123 username: hibit password: hibit123 publisher-confirm-type: correlated
@@ -7,9 +7,9 @@ profiles: active: newprice datasource: url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: db_hibit password: hibit123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 114.55.92.106 host: 192.168.0.36 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: hibit123 password: d32ncxe@i3#!dV jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,10 +72,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.55.86.146 host: 192.168.0.36 port: 5672 username: biyict password: biyict123 username: hibit password: hibit123 publisher-confirm-type: correlated
@@ -5,14 +5,14 @@ spring: profiles: active: test active: dev 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 url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: ct_test password: 123456 url: jdbc:mysql://124.70.222.34:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: db_hibit password: hibit123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -51,13 +51,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 120.27.238.55 host: 121.37.162.173 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: xcong123 password: d32ncxe@i3#!dV jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -75,10 +75,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.27.238.55 host: 121.37.162.173 port: 5672 username: ct_rabbit password: 123456 username: hibit password: hibit123 publisher-confirm-type: correlated
@@ -2,7 +2,7 @@ <configuration> <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 --> <property name="log.path" value="biue/logs" /> <property name="log.path" value="hibit/logs" /> <!-- <springProperty scope="context" name="log.path" source="logging.file.path"/>--> <!-- 彩色日志 -->
