Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot

Helius

2020-10-15 fba8eb05dcb8b08f894a3924316874b233030e92

 src/main/resources/application-dayline.yml

@@ -5,11 +5,11 @@

spring:
  profiles:
    active: dev
    active: dayline
  datasource:
    url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
    username: ct_test
    password: 123456
    url: jdbc:mysql://180.215.221.145:3306/db_pilot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
    username: pilot
    password: pilot123!@#
    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: 47.114.114.219
    host: 180.215.221.145
    ## Redis服务器连接端口
    port: 6379
    ## Redis服务器连接密码（默认为空）
    password: biyi123
    password: pilot123!@#
    jedis:
      pool:
        ## 连接池最大连接数（使用负值表示没有限制）
@@ -72,10 +72,10 @@
    ## 连接超时时间（毫秒）
    timeout: 30000
  rabbitmq:
    host: 120.27.238.55
    host: 27.124.4.94
    port: 5672
    username: ct_rabbit
    password: 123456
    username: pilot
    password: pilot123
    publisher-confirm-type: correlated


@@ -94,12 +94,12 @@
  debug: false
  redis_expire: 3000
  kline-update-job: false
  newest-price-update-job: true
  newest-price-update-job: false
  #日线 该任务不能与最新价处于同一个服务器
  day-line: false
  day-line: true
  other-job: false
  loop-job: false
  rabbit-consumer: true
  rabbit-consumer: false
  block-job: false

aliyun: