diff --git a/dsp/src/main/resources/application.yml b/dsp/src/main/resources/application.yml index 8700186..83f6806 100644 --- a/dsp/src/main/resources/application.yml +++ b/dsp/src/main/resources/application.yml @@ -6,13 +6,12 @@ spring: kafka: binder: brokers: 47.113.231.200:9092 - zkNodes: 47.113.231.200:2181 auto-create-topics: true healthTimeout: 600 bindings: file_dl_pipeline_in: destination: stream-file-dl - group: file-dl + group: file-dl-test consumer: pollTimeout: 60 file_dl_pipeline_out: @@ -20,7 +19,7 @@ spring: content-type: text/plain protobuf_pipeline_in: destination: stream-protobuf - group: protobuf + group: protobuf-test consumer: pollTimeout: 60 protobuf_pipeline_out: @@ -28,7 +27,7 @@ spring: content-type: text/plain storage_pipeline_in: destination: stream-db - group: db + group: db-test consumer: pollTimeout: 60 storage_pipeline_out: @@ -48,33 +47,28 @@ topics: stream-db: com.jsc.dsp.service.StorageService stream-file-dl: com.jsc.dsp.service.FileDlService -es: - ip: 8.130.95.27 - port: 28087 - username: elastic - password: passok123A - index: indeximos - type: default -ceph: - aws-access-key: JH8OF0D9ZJYYXBFYB5OD - aws-secret-key: FuptELjiPQOQNR6tPOVL777n3dGe3bZCDJphyiz0 - endpoint: 192.168.1.16:28090 +switch: + enable-storage-service: true + enable-file-dl-service: false + enable-protobuf-service: false + db: driver: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://8.130.95.27:28089/dsp + url: jdbc:mysql://47.113.231.200:28089/dsp user: root password: passok123A custom: dev-mode: false filter-words-query-api: http://47.115.228.133:28081/api/open/wordBank/queryAll filter-words-update-interval-ms: 3600000 - local-file-storage-path: E:/data/local-storage/ + local-file-storage-path: D:/data/local-storage/ proto_save_path: D:/data/spider_data/proto/ - transfer_backup_path: E:/data/transfer_backup/ - file_unzip_path: E:/html-full/ - keep_backup_file: E:/data/dbzq_backup/ - nginx_path: E:/OSC-3.0/app/osdp_board/html/ + transfer_backup_path: D:/data/transfer_backup/ + file_unzip_path: D:/html-full/ + keep_backup_file: D:/data/dbzq_backup/ + nginx_path: D:/OSC-3.0/app/osdp_board/html/ websiteQueryAPI: http://47.115.228.133:28081/api/open/target/website/queryAllInfo websiteUpdateAPI: http://47.115.228.133:28081/api/open/target/website/update socialQueryAPI: http://47.115.228.133:28081/api/open/target/social/queryAll?sortBy=id&shuffleResult=false socialUpdateAPI: http://47.115.228.133:28081/api/open/target/social/update + websiteWhiteList: 能源界(国内信息);能源界(国际信息);中国能源新闻网;新华能源网;中国能源网(能源战略);中国农网(三农要闻);中国经济网(三农经济);中华粮网(粮食安全);美国之音(中国版面);美国之音(中美关系);美国之音(台海两岸版面);美国之音(港澳版面);看中国(看大陆版面);看中国(重点新闻);德国之声(中国报道);纽约时报中文网(中国版面);大纪元(一周大陆新闻);EnergyNow;联合国粮农组织;路透社(中国版面) diff --git a/dsp/src/main/resources/logback-spring.xml b/dsp/src/main/resources/logback-spring.xml index f06cdf8..3de274f 100644 --- a/dsp/src/main/resources/logback-spring.xml +++ b/dsp/src/main/resources/logback-spring.xml @@ -8,7 +8,7 @@ logback - + @@ -27,7 +27,7 @@ ${CONSOLE_LOG_PATTERN} - GBK + UTF-8