梳理yml配置

audio-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: audio-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

docs/cmd/set-pipe-ner-env.bat

@@ -1,31 +0,0 @@
-@echo off
-
-set "NACOS_SERVER_ADDR=192.168.110.30:8848"
-set "NACOS_NAMESPACE=9ce240d6-ae6b-45a3-8566-e75ac25c9d71"
-set "NACOS_GROUP=DEFAULT_GROUP"
-set "SPRING_PROFILES_ACTIVE=dev"
-set "NACOS_USERNAME=nacos"
-set "NACOS_PASSWORD=nacos"
-
-reg add "HKCU\Environment" /v NACOS_SERVER_ADDR /t REG_SZ /d "%NACOS_SERVER_ADDR%" /f >nul
-if errorlevel 1 goto failed
-reg add "HKCU\Environment" /v NACOS_NAMESPACE /t REG_SZ /d "%NACOS_NAMESPACE%" /f >nul
-if errorlevel 1 goto failed
-reg add "HKCU\Environment" /v NACOS_GROUP /t REG_SZ /d "%NACOS_GROUP%" /f >nul
-if errorlevel 1 goto failed
-reg add "HKCU\Environment" /v SPRING_PROFILES_ACTIVE /t REG_SZ /d "%SPRING_PROFILES_ACTIVE%" /f >nul
-if errorlevel 1 goto failed
-reg add "HKCU\Environment" /v NACOS_USERNAME /t REG_SZ /d "%NACOS_USERNAME%" /f >nul
-if errorlevel 1 goto failed
-reg add "HKCU\Environment" /v NACOS_PASSWORD /t REG_SZ /d "%NACOS_PASSWORD%" /f >nul
-if errorlevel 1 goto failed
-
-echo pipe-ner %SPRING_PROFILES_ACTIVE% environment variables are saved for the current Windows user.
-echo Sign out of Windows and sign in again, then restart the IDE or terminal.
-pause
-exit /b 0
-
-:failed
-echo Failed to save environment variables. Check permissions and try again.
-pause
-exit /b 1

docs/cmd/set-pipe-ner-env.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-
-if ! (return 0 2>/dev/null); then
-  echo "Run this script in the current shell with: . ./docs/cmd/set-pipe-ner-env.sh" >&2
-  exit 1
-fi
-
-export NACOS_SERVER_ADDR='192.168.110.30:8848'
-export NACOS_NAMESPACE='9ce240d6-ae6b-45a3-8566-e75ac25c9d71'
-export NACOS_GROUP='DEFAULT_GROUP'
-export SPRING_PROFILES_ACTIVE='prod'
-export NACOS_USERNAME='nacos'
-export NACOS_PASSWORD='nacos'
-
-printf 'pipe-ner prod environment variables are set in the current shell.\n'

environment-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: environment-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

firefighting-pressure-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: pressure-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

flammable-gas-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: gas-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

manhole-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: manhole-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

pipe-network-service/zksy-admin/src/main/resources/bootstrap.yaml

@@ -1,22 +1,3 @@
 spring:
   application:
     name: pipe-network-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

radar-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: radar-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

telemetry-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: telemetry-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

video-service/src/main/resources/bootstrap.yaml

@@ -1,27 +1,9 @@
 spring:
   application:
     name: video-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     allow-circular-references: true
   cloud:
     nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        enabled: ${VIDEO_NACOS_DISCOVERY_ENABLED:true}
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-        enabled: ${VIDEO_NACOS_ENABLED:true}
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
         refresh-enabled: false
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

water-level-service/src/main/resources/bootstrap.yaml

@@ -1,25 +1,6 @@
 spring:
   application:
     name: water-level-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     web-application-type: none
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

zk-api-service/src/main/resources/bootstrap.yaml

@@ -1,24 +1,5 @@
 spring:
   application:
     name: zk-api-service
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     allow-bean-definition-overriding: true
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}

zk-gateway/src/main/resources/bootstrap.yaml

@@ -1,22 +1,3 @@
 spring:
   application:
     name: zksy-gateway
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:dev}
-  cloud:
-    nacos:
-      server-addr: ${NACOS_SERVER_ADDR}
-      username: ${NACOS_USERNAME:}
-      password: ${NACOS_PASSWORD:}
-      discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-      config:
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
-        file-extension: yaml
-        shared-configs:
-          - data-id: pipe-common-${spring.profiles.active}.yaml
-            group: ${NACOS_GROUP:DEFAULT_GROUP}