Merge branch '2024年2月1日V1.0.53' of E:\workspace\qa-prevention-gwj with conflicts.
parent
6aa940170a
commit
a63e3883c8
|
@ -1,5 +1,3 @@
|
||||||
|
|
||||||
|
|
||||||
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-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||||
datasource.no1.username=root
|
datasource.no1.username=root
|
||||||
|
@ -60,9 +58,8 @@ spring.main.banner-mode=off
|
||||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||||
#
|
#
|
||||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||||
|
|
||||||
preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
|
preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
|
||||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
|
||||||
#?????
|
#?????
|
||||||
smb.host=39.103.224.166
|
smb.host=39.103.224.166
|
||||||
smb.port=22
|
smb.port=22
|
||||||
|
@ -74,8 +71,8 @@ smb.basePath=/mnt/qgfile/file/
|
||||||
rocketmq.consumer.group2=edu-admin-edit
|
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=172.24.151.16:9876
|
#rocketmq.name-server=172.24.151.16:9876
|
||||||
rocketmq.producer.group=libmiddle
|
rocketmq.producer.group=libmiddle
|
||||||
rocketmq.producer.send-message-timeout=3000
|
rocketmq.producer.send-message-timeout=3000
|
||||||
rocketmq.producer.compress-message-body-threshold=4096
|
rocketmq.producer.compress-message-body-threshold=4096
|
||||||
|
@ -90,16 +87,38 @@ 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
|
||||||
|
|
||||||
http.file.url=https://qgqy.qhdsafety.com/file/
|
|
||||||
|
|
||||||
|
|
||||||
#数据同步topic
|
|
||||||
mq.gwj.data.topic=czks_qy_docking
|
|
||||||
mq.gwj.file.topic=czks_qy_dockingPicture
|
|
||||||
#港务局文件服务器前缀
|
|
||||||
baseimgpath=https://qgqy.qhdsafety.com/file/
|
|
||||||
|
|
||||||
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
|
|
||||||
|
|
||||||
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/
|
||||||
|
|
||||||
|
|
||||||
|
#用户标识
|
||||||
|
# 沧州矿石
|
||||||
|
czks-useridentity=CZKS
|
||||||
|
czks-baseimgpath=https://wwag.qhdsafety.com/file/
|
||||||
|
czks-backendaddr=http://192.168.0.79:8091/
|
||||||
|
# 港务局
|
||||||
|
gwj-useridentity=GWJ
|
||||||
|
gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
|
||||||
|
gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
|
||||||
|
# ??????
|
||||||
|
http.file.url=https://qgqy.qhdsafety.com/file/
|
||||||
|
perLoc.url=http://192.168.210.32:8084
|
||||||
|
perLoc.userName=qaaqadmin
|
||||||
|
perLoc.pwd=Cfd2023@
|
||||||
|
baseimgpath =http://192.168.192.201:8991/file/
|
||||||
|
|
||||||
|
mq.csy.data.topic=csy_docking
|
||||||
|
mq.csy.data.group=scheduled_tasks_csy_docking
|
||||||
|
mq.csy.file.topic=csy_dockingPicture
|
||||||
|
mq.csy.file.group=scheduled_tasks_csy_dockingPicture
|
||||||
|
|
||||||
|
mq.cmt.data.topic=cmt_docking
|
||||||
|
mq.cmt.data.group=scheduled_tasks_cmt_docking
|
||||||
|
mq.cmt.file.topic=cmt_dockingPicture
|
||||||
|
mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture
|
||||||
|
|
||||||
|
mq.czks.data.topic=czks_docking
|
||||||
|
mq.czks.data.group=scheduled_tasks_czks_docking
|
||||||
|
mq.czks.file.topic=czks_dockingPicture
|
||||||
|
mq.czks.file.group=scheduled_tasks_czks_dockingPicture
|
||||||
|
|
Loading…
Reference in New Issue