Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

location-rescue-service/src/main/resources/application.properties

@@ -1,7 +1,7 @@
spring.application.name=WorkTaskSpec
server.port=8011
server.port=8086
server.servlet.context-path=/ipu
#server.servlet.context-path=/ipu
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
@@ -20,8 +20,8 @@ spring.jpa.properties.hibernate.generate_statistics=false
spring.main.allow-bean-definition-overriding=true
#kafka
kafka.bootstrap-servers=47.105.160.21:9090
#kafka.bootstrap-servers=10.19.90.34:2182
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
#kafka.topic.alarm=Topic_IoT_IndividualAlarm
kafka.topic.deviceLocation=DeviceLocationA