Commit 5506c269 authored by chenhao's avatar chenhao

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 20a6cde6 aa639a45
...@@ -50,7 +50,7 @@ spring.redis.expire.time=300 ...@@ -50,7 +50,7 @@ spring.redis.expire.time=300
## mqtt-警情初报消息主题 ## mqtt-警情初报消息主题
mqtt.topic.alert.reporting=alertReporting mqtt.topic.alert.reporting=alertReporting
## 实战指挥新警情?报主题 ## 实战指挥新警情�?�报主题
mqtt.topic.command.alert.notice=alertNotice mqtt.topic.command.alert.notice=alertNotice
## 跑马灯地震,天气预警信息 ## 跑马灯地震,天气预警信息
...@@ -60,6 +60,8 @@ mqtt.topic.command.power.deployment=power ...@@ -60,6 +60,8 @@ mqtt.topic.command.power.deployment=power
security.systemctl.name=AMOS-API-SYSTEMCTL security.systemctl.name=AMOS-API-SYSTEMCTL
supervision.feign.name = AMOS-SUPERVISION-API
iot.fegin.name=AMOS-API-IOT iot.fegin.name=AMOS-API-IOT
equip.fegin.name=AMOS-EQUIPMANAGE equip.fegin.name=AMOS-EQUIPMANAGE
\ No newline at end of file
...@@ -31,7 +31,7 @@ spring.liquibase.enabled=true ...@@ -31,7 +31,7 @@ spring.liquibase.enabled=true
mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
equip.feign.name=AMOS-EQUIPMANAGE-SHG equip.feign.name=AMOS-EQUIPMANAGE
equip.feign.prefix=/equip equip.feign.prefix=/equip
input.custom.prefix = QYZD input.custom.prefix = QYZD
input.statute.prefix = FG input.statute.prefix = FG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment