From ea660e77544326adc57956f6253c2c853bc70216 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 21 May 2021 19:07:18 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java | 2 +- src/main/resources/logback-spring.xml | 2 +- src/main/resources/application-app.yml | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java index 6b1981f..d0fb7ba 100644 --- a/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java +++ b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java @@ -17,7 +17,7 @@ **/ @Slf4j @Component -@ConditionalOnProperty(prefix = "app", name = "loop-job", havingValue = "true") +@ConditionalOnProperty(prefix = "app", name = "otc-job", havingValue = "true") public class LoopExecutorJob { @Resource diff --git a/src/main/resources/application-app.yml b/src/main/resources/application-app.yml index 75266b2..1a1cddb 100644 --- a/src/main/resources/application-app.yml +++ b/src/main/resources/application-app.yml @@ -7,9 +7,9 @@ profiles: active: app datasource: - url: jdbc:mysql://192.168.0.151:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 - username: db_otc - password: db_otc123!@# + url: jdbc:mysql://127.0.0.1:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 + username: yd_otc + password: yd_otc123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -50,11 +50,11 @@ ## Redis数据库索引(默认为0) database: 0 ## Redis服务器地址 - host: 192.168.0.36 + host: 127.0.0.1 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码(默认为空) - password: d32ncxe@i3#!dV + password: aerefnadlfnwu241 jedis: pool: ## 连接池最大连接数(使用负值表示没有限制) @@ -72,10 +72,10 @@ ## 连接超时时间(毫秒) timeout: 30000 rabbitmq: - host: 192.168.0.36 + host: 127.0.0.1 port: 5672 - username: hibit - password: hibit123 + username: yunding + password: yunding123 publisher-confirm-type: correlated @@ -93,14 +93,15 @@ app: debug: false redis_expire: 3000 - kline-update-job: false - newest-price-update-job: false + kline-update-job: true + newest-price-update-job: true #日线 该任务不能与最新价处于同一个服务器 - day-line: false - other-job: false + day-line: true + other-job: true loop-job: false rabbit-consumer: false block-job: false + otc-job: true aliyun: oss: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index af9bfd5..301033f 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ <configuration> <contextName>logback</contextName> <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 --> - <property name="log.path" value="hibit/logs" /> + <property name="log.path" value="otc/logs" /> <!-- <springProperty scope="context" name="log.path" source="logging.file.path"/>--> <!-- 彩色日志 --> -- Gitblit v1.9.1