merge cuohe

Helius

2020-10-14 008303eaadd7f31423cd2b586b38146f509da187

 src/main/resources/application-test.yml

@@ -7,9 +7,9 @@
  profiles:
    active: dev
  datasource:
    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!@
    url: jdbc:mysql://47.96.73.250: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
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
@@ -50,11 +50,11 @@
    ## Redis数据库索引（默认为0）
    database: 1
    ## Redis服务器地址
    host: 47.114.114.219
    host: 47.96.73.250
    ## Redis服务器连接端口
    port: 6379
    ## Redis服务器连接密码（默认为空）
    password: biyi123
    password: qwer12345678
    jedis:
      pool:
        ## 连接池最大连接数（使用负值表示没有限制）
@@ -72,9 +72,9 @@
    ## 连接超时时间（毫秒）
    timeout: 30000
  rabbitmq:
    host: 120.27.238.55
    host: 47.96.73.250
    port: 5672
    username: ct_rabbit
    username: rabbit
    password: 123456
    publisher-confirm-type: correlated

@@ -91,17 +91,16 @@


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

aliyun:
  oss: