Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

xiaoyong931011

2022-03-02 2b6e54e96e32999f1c2ef03f54c636d5f5961dee

Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

 src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java

@@ -53,9 +53,9 @@
                    // TODO 测试环境关闭这个插入redis
                    redisUtils.set(CoinTypeConvert.convertToKey(symbol), price);
                    // 比较
                    //websocketPriceService.comparePriceAsc(symbol, price);
                    //websocketPriceService.comparePriceDesc(symbol, price);
                    //System.out.println("比较完毕:"+symbol+"-"+price);
                    websocketPriceService.comparePriceAsc(symbol, price);
                    websocketPriceService.comparePriceDesc(symbol, price);
//                    System.out.println("比较完毕:"+symbol+"-"+price);

                }


 src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java

@@ -13,7 +13,7 @@
 */
@Slf4j
@Component
@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job", havingValue = "true")
@ConditionalOnProperty(prefix = "app", name = "other-job", havingValue = "true")
public class ZhiyarRewardJob {



 src/main/resources/application.yml

@@ -72,10 +72,10 @@
    ## 连接超时时间（毫秒）
    timeout: 30000
  rabbitmq:
    host: 154.91.195.155
    host: 120.27.238.55
    port: 5672
    username: abc_user
    password: abc123
    username: ct_rabbit
    password: 123456
    publisher-confirm-type: correlated