Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-10-17 4576151cb8452ee6c1e2150c4dbc4ad5fa4d86bf

 hd/pipe/StaffManage/src/main/resources/application-dev.yml

@@ -1,13 +1,11 @@
server:
  port: 8882
spring:
  config:
    activate:
      on-profile: dev
    import:
      - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
      - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
      - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
      - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
      - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
  cloud:
    nacos:
      server-addr: 111.30.93.215:8848
@@ -15,19 +13,12 @@
        heart-beat-interval: 3000
        heart-beat-timeout: 15000
        group: supipe
        namespace: suzhou
      config:
        file-extension: yml
        group: sunacos
global:
  filePrefix: https://pipe.thhy-tj.com/
emqx:
  host: 111.30.93.215
  port: 1883
  username: thhy
  password: thhy123
  qos: 1
  topic: FF:AA:F4:12:67:05
  willTopic: FF:AA:F4:12:67:05-W
  willContent: FF:AA:F4:12:67:05-offline
        namespace: suzhou
server:
  port: ${${spring.application.name}port}
netty:
  port: 10001
  port: ${${spring.application.name}nettyport}