Merge remote-tracking branch 'origin/czks1.0' into czks1.0
commit
5f53def846
|
@ -69,9 +69,9 @@ rocketmq.consumer.group2=edu-admin-edit
|
||||||
rocketmq.consumer.group1=edu-admin-add
|
rocketmq.consumer.group1=edu-admin-add
|
||||||
#rocketmq.name-server=10.0.140.141:9876
|
#rocketmq.name-server=10.0.140.141:9876
|
||||||
#rocketmq.name-server=192.168.0.70:9876
|
#rocketmq.name-server=192.168.0.70:9876
|
||||||
rocketmq.name-server=192.168.110.184:9876
|
rocketmq.name-server=39.101.130.96:9876
|
||||||
rocketmq.producer.group=libmiddle
|
rocketmq.producer.group=libmiddle
|
||||||
rocketmq.producer.send-message-timeout=3000
|
rocketmq.producer.send-message-timeout=300000
|
||||||
rocketmq.producer.compress-message-body-threshold=4096
|
rocketmq.producer.compress-message-body-threshold=4096
|
||||||
rocketmq.producer.max-message-size=4194304
|
rocketmq.producer.max-message-size=4194304
|
||||||
rocketmq.producer.retry-times-when-send-failed=3
|
rocketmq.producer.retry-times-when-send-failed=3
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
datasource.no1.url=jdbc:mysql://172.16.130.92:3306/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||||
datasource.no1.username=root
|
datasource.no1.username=root
|
||||||
datasource.no1.password=Mysql@zcloud88888
|
datasource.no1.password=Zcloud@888888
|
||||||
|
|
||||||
|
|
||||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
datasource.no2.url=jdbc:mysql://172.16.130.92:3306/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||||
datasource.no2.username=root
|
datasource.no2.username=root
|
||||||
datasource.no2.password=Mysql@zcloud88888
|
datasource.no2.password=Zcloud@888888
|
||||||
|
|
||||||
#druid???
|
#druid???
|
||||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||||
|
@ -52,24 +50,18 @@ spring.http.encoding.enabled=true
|
||||||
# ??springboot????banner
|
# ??springboot????banner
|
||||||
spring.main.banner-mode=off
|
spring.main.banner-mode=off
|
||||||
|
|
||||||
|
#????????????
|
||||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||||
|
|
||||||
#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
|
|
||||||
#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
|
|
||||||
#?????
|
|
||||||
smb.host=39.101.130.96
|
smb.host=39.101.130.96
|
||||||
smb.port=22
|
smb.port=22
|
||||||
smb.user=root
|
smb.user=root
|
||||||
smb.password=Zcloud@zcloud88888
|
smb.password=Zcloud@zcloud88888
|
||||||
smb.basePath=/mnt/wwag/file/
|
smb.basePath=/mnt/wwag/file/
|
||||||
|
|
||||||
#Mq\u914D\u7F6E
|
#mq???????????
|
||||||
rocketmq.consumer.group2=edu-admin-edit
|
rocketmq.name-server=172.16.130.91:9876
|
||||||
rocketmq.consumer.group1=edu-admin-add
|
|
||||||
#rocketmq.name-server=10.0.140.141:9876
|
|
||||||
#rocketmq.name-server=192.168.0.70:9876
|
|
||||||
rocketmq.name-server=39.101.130.96:9876
|
|
||||||
rocketmq.producer.group=libmiddle
|
rocketmq.producer.group=libmiddle
|
||||||
rocketmq.producer.send-message-timeout=300000
|
rocketmq.producer.send-message-timeout=300000
|
||||||
rocketmq.producer.compress-message-body-threshold=4096
|
rocketmq.producer.compress-message-body-threshold=4096
|
||||||
|
@ -77,24 +69,28 @@ rocketmq.producer.max-message-size=4194304
|
||||||
rocketmq.producer.retry-times-when-send-failed=3
|
rocketmq.producer.retry-times-when-send-failed=3
|
||||||
rocketmq.producer.retry-next-server=true
|
rocketmq.producer.retry-next-server=true
|
||||||
rocketmq.producer.retry-times-when-send-async-failed=3
|
rocketmq.producer.retry-times-when-send-async-failed=3
|
||||||
## topic \u524D\u7F00
|
## topic ????
|
||||||
|
|
||||||
mq.topic.info=info
|
mq.topic.info=info
|
||||||
mq.topic.eightWork=eightWork
|
mq.topic.eightWork=eightWork
|
||||||
mq.group.info=scheduled_tasks
|
mq.group.info=scheduled_tasks
|
||||||
mq.group.eightWork=scheduled_tasks_eightWork
|
mq.group.eightWork=scheduled_tasks_eightWork
|
||||||
|
|
||||||
#????
|
# topic ????
|
||||||
mq.topic.docking=docking
|
mq.topic.docking=docking
|
||||||
mq.topic.dockingPicture=dockingPicture
|
mq.topic.dockingPicture=dockingPicture
|
||||||
mq.group.docking=scheduled_tasks_docking
|
mq.group.docking=scheduled_tasks_docking
|
||||||
|
|
||||||
|
#???? ??????
|
||||||
perLoc.url=http://172.16.130.86/gateway-service
|
perLoc.url=http://172.16.130.86/gateway-service
|
||||||
perLoc.userName=qaaqadmin
|
perLoc.userName=qaaqadmin
|
||||||
perLoc.pwd=Cfd2023@
|
perLoc.pwd=Cfd2023@
|
||||||
|
|
||||||
|
#????? ??????
|
||||||
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
corp.default.pic-path=https://qgqy.qhdsafety.com/
|
||||||
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
|
corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
|
||||||
|
|
||||||
http.file.url=https://qgqy.qhdsafety.com/file/
|
#??????
|
||||||
#????????????
|
http.file.url=http://172.16.130.91:9004/file/
|
||||||
baseimgpath =https://wwag.qhdsafety.com/file/
|
#??????
|
||||||
|
baseimgpath =http://172.16.130.91:9004/file/
|
||||||
|
|
|
@ -4,9 +4,9 @@ server.port=8091
|
||||||
#??
|
#??
|
||||||
#spring.profiles.active=local
|
#spring.profiles.active=local
|
||||||
#<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
|
#<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
|
||||||
#spring.profiles.active=dev
|
spring.profiles.active=dev
|
||||||
#??
|
#??
|
||||||
spring.profiles.active=master
|
#spring.profiles.active=master
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue