Merge remote-tracking branch 'origin/huacheng' into huacheng

101captain

2022-05-07 6bcf671b4c57ca5e16601d6acb53e534338fa66f

Merge remote-tracking branch 'origin/huacheng' into huacheng

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml

@@ -1,11 +1,11 @@
spring:
  application:
    name: property
    name: huacheng-property
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
  profiles:
@@ -40,7 +40,7 @@

  metrics:
    tags:
      application: property
      application: huacheng-property

#从一键报警设备websocket订阅时间消息配置
websocket: