梳理yml配置

audio-service/src/main/java/com/zksy/audio/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8313}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

audio-service/src/main/resources/application-dev.yaml

@@ -1,30 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-device:
-  offline:
-    timeout-minutes: 1560 # 每24小时上报，超过26小时未收到有效数据才判离线
-    check-interval-ms: 300000
-wlds:
-  raw-pcm-bytes: 81920 # 厂家80K无头PCM接收长度，另兼容带头WAV；0仅接收带头WAV
-  retransmission-window-seconds: 120 # 每24小时上传正常/异常录音；同内容连续重传刷新2分钟静默窗口
-  fileUploadBaseDir: D:\home\wlds\uploads
-  leak:
-    freq-min: 200.0     # 特征频段下限 Hz
-    freq-max: 2000.0    # 特征频段上限 Hz
-    window-minutes: 30  # 时间窗口（分钟）
-    alarm-count: 1      # 单次独立录音满足RMS及频段条件即一级告警、短信

audio-service/src/main/resources/application-druid.yaml

@@ -1,30 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-device:
-  offline:
-    timeout-minutes: 1560 # 每24小时上报，超过26小时未收到有效数据才判离线
-    check-interval-ms: 300000
-wlds:
-  raw-pcm-bytes: 81920 # 厂家80K无头PCM接收长度，另兼容带头WAV；0仅接收带头WAV
-  retransmission-window-seconds: 120 # 每24小时上传正常/异常录音；同内容连续重传刷新2分钟静默窗口
-  fileUploadBaseDir: \home\wlds\uploads
-  leak:
-    freq-min: 200.0     # 特征频段下限 Hz
-    freq-max: 2000.0    # 特征频段上限 Hz
-    window-minutes: 30  # 时间窗口（分钟）
-    alarm-count: 1      # 单次独立录音满足RMS及频段条件即一级告警、短信

audio-service/src/main/resources/application-prod.yaml

@@ -1,24 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
-device:
-  offline:
-    timeout-minutes: 1560 # 每24小时上报，超过26小时未收到有效数据才判离线
-    check-interval-ms: 300000
-wlds:
-  raw-pcm-bytes: 81920 # 厂家80K无头PCM接收长度，另兼容带头WAV；0仅接收带头WAV
-  retransmission-window-seconds: 120 # 每24小时上传正常/异常录音；同内容连续重传刷新2分钟静默窗口
-  fileUploadBaseDir: \home\wlds\uploads
-  leak:
-    freq-min: 200.0     # 特征频段下限 Hz
-    freq-max: 2000.0    # 特征频段上限 Hz
-    window-minutes: 30  # 时间窗口（分钟）
-    alarm-count: 1      # 单次独立录音满足RMS及频段条件即一级告警、短信

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: audio-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: audio-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30004
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

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

@@ -0,0 +1,31 @@
+@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

@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+if ! (return 0 2>/dev/null); then
+  echo "Run this script in the current shell with: 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/java/com/zksy/environment/Demo.java

@@ -10,7 +10,7 @@ public class Demo {
 
 	public static void main(String[] args) throws IOException,
 			InterruptedException {
-		RSServer rsServer = RSServer.Initiate(9801);// 初始化
+		RSServer rsServer = RSServer.Initiate(Integer.parseInt(args[0])); // 端口由启动参数提供
 		rsServer.addDataListener(new IDataListener() {// 添加监听
 			@Override
 			public void receiveTimmingAck(TimmingAck data) {// 校时指令应答处理

environment-service/src/main/java/com/zksy/environment/SwingDemo.java

@@ -165,7 +165,6 @@ public class SwingDemo extends JFrame {
 
 		txtPort = new JTextField();
 		txtPort.setBounds(45, 7, 66, 21);
-		txtPort.setText("9801");
 		txtPort.setColumns(10);
 
 		btnStart = new JButton("\u542F\u52A8");

environment-service/src/main/java/com/zksy/environment/config/RSServerConfig.java

@@ -1,142 +0,0 @@
-/*
-package com.zksy.environment.config;
-
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import rk.netDevice.sdk.p2.*;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-
-@Component  // 关键：Spring会自动扫描并实例化该组件
-public class RSServerConfig {
-
-    private RSServer rsServer;
-
-    // 应用启动时初始化
-    @PostConstruct  // 当Bean初始化完成后自动调用
-    public void initialize() throws IOException {
-        // 初始化服务器
-        rsServer = RSServer.Initiate(9801);
-
-        // 添加数据监听器（保持原有逻辑不变）
-        rsServer.addDataListener(new IDataListener() {
-            @Override
-            public void receiveTimmingAck(TimmingAck data) {
-                System.out.println("校时应答->设备编号:" + data.getDeviceId()
-                        + "\t执行结果：" + data.getStatus());
-            }
-
-            @Override
-            public void receiveTelecontrolAck(TelecontrolAck data) {
-                System.out.println("遥控应答->设备编号:" + data.getDeviceId()
-                        + "\t继电器编号:" + data.getRelayId() + "\t执行结果:"
-                        + data.getStatus());
-            }
-
-            @Override
-            public void receiveStoreData(StoreData data) {
-                for (NodeData nd : data.getNodeList()) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
-                    String str = sdf.format(nd.getRecordTime());
-                    System.out.println("存储数据->设备地址:" + data.getDeviceId()
-                            + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
-                            + "\t湿度:" + nd.getHum() + "\t存储时间:" + str);
-                }
-            }
-
-            @Override
-            public void receiveRealtimeData(RealTimeData data) {
-                for (NodeData nd : data.getNodeList()) {
-                    System.out.println("实时数据->设备地址:" + data.getDeviceId()
-                            + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
-                            + "\t湿度:" + nd.getHum() + "\t经度:" + nd.getLng()
-                            + "\t纬度:" + nd.getLat() + "\t坐标类型:"
-                            + data.getCoordinateType() + "\t继电器状态:"
-                            + data.getRelayStatus() + "\t悬浮物:" + nd.getFloatValue());
-                }
-            }
-
-            @Override
-            public void receiveLoginData(LoginData data) {
-                System.out.println("登录->设备地址:" + data.getDeviceId());
-            }
-
-            @Override
-            public void receiveParamIds(ParamIdsData data) {
-                String str = "设备参数编号列表->设备编号：" + data.getDeviceId()
-                        + "\t参数总数量：" + data.getTotalCount() + "\t本帧参数数量："
-                        + data.getCount() + "\r\n";
-                for (int paramId : data.getPararmIdList()) {
-                    str += paramId + ",";
-                }
-                System.out.println(str);
-            }
-
-            @Override
-            public void receiveParam(ParamData data) {
-                String str = "设备参数->设备编号：" + data.getDeviceId() + "\r\n";
-                for (ParamItem pararm : data.getParameterList()) {
-                    str += "参数编号：" + pararm.getParamId()
-                            + "\t参数描述：" + pararm.getDescription()
-                            + "\t参数值：" + (pararm.getValueDescription() == null ?
-                            pararm.getValue() : pararm.getValueDescription().get(pararm.getValue())) + "\r\n";
-                }
-                System.out.println(str);
-            }
-
-            @Override
-            public void receiveWriteParamAck(WriteParamAck data) {
-                String str = "下载设备参数->设备编号：" + data.getDeviceId()
-                        + "\t参数数量：" + data.getCount() + "\t"
-                        + (data.isSuccess() ? "下载成功" : "下载失败");
-                System.out.println(str);
-            }
-
-            @Override
-            public void receiveTransDataAck(TransDataAck data) {
-                String str = "数据透传->设备编号：" + data.getDeviceId()
-                        + "\t响应结果：" + data.getData() + "\r\n字节数：" + data.getTransDataLen();
-                System.out.println(str);
-            }
-
-            @Override
-            public void receiveHeartbeatData(HeartbeatData heartbeatData) {
-                // 心跳数据处理逻辑（如需要）
-            }
-        });
-
-        // 调用异步方法启动服务器
-        startServer();
-    }
-
-    // 标记为异步方法，由Spring异步执行
-    @Async
-    public void startServer() {
-        try {
-            if (rsServer != null) {
-                rsServer.start();
-                System.out.println("RSServer已异步启动成功");
-            }
-        } catch (Exception e) {
-            System.err.println("RSServer启动失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    // 应用关闭时执行
-    @PreDestroy  // 应用关闭时自动调用
-    public void shutdown() {
-        if (rsServer != null) {
-            try {
-                rsServer.stop();
-                System.out.println("RSServer已成功停止");
-            } catch (Exception e) {
-                System.err.println("RSServer停止过程中发生异常: " + e.getMessage());
-            }
-        }
-    }
-}
-*/

environment-service/src/main/java/com/zksy/environment/config/RSServerService.java

@@ -59,12 +59,15 @@ public class RSServerService {
     @Autowired
     private DeviceOfflineCheckTask deviceOfflineCheckTask;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 
+    @Value("${netty.port}")
+    private int port;
+
     @PostConstruct
     public void init() {
-        log.info("RSServer服务开始初始化，监听端口：9801");
+        log.info("RSServer服务开始初始化，监听端口：{}", port);
         // 提交初始化任务 + 启动监控
         serverFuture = serverExecutor.submit(this::initializeServer);
         new Thread(this::monitorServerInitialization, "RSServer-Monitor").start();
@@ -98,7 +101,7 @@ public class RSServerService {
     private void initializeServer() {
         try {
             long initiateStartTime = System.currentTimeMillis();
-            rsServer = RSServer.Initiate(9801);
+            rsServer = RSServer.Initiate(port);
             log.info("RSServer实例初始化完成，耗时：{}ms", System.currentTimeMillis() - initiateStartTime);
 
             rsServer.addDataListener(new IDataListener() {
@@ -196,7 +199,7 @@ public class RSServerService {
             log.info("开始启动RSServer（阻塞式监听）");
             long startTime = System.currentTimeMillis();
             rsServer.start(); // 正常运行时不返回，停止时执行后续日志
-            log.info("RSServer已启动并监听端口：9801，启动耗时：{}ms", System.currentTimeMillis() - startTime);
+            log.info("RSServer已启动并监听端口：{}，启动耗时：{}ms", port, System.currentTimeMillis() - startTime);
 
         } catch (Exception e) {
             log.error("RSServer初始化/启动异常", e);

environment-service/src/main/resources/application-dev.yaml

@@ -1,21 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-
-mybatis-plus:
-  type-aliases-package: com.zksy.environment.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

environment-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.environment.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

environment-service/src/main/resources/application-prod.yaml

@@ -1,11 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379

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

@@ -2,32 +2,24 @@ spring:
   application:
     name: environment-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: environment-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

firefighting-pressure-service/pom.xml

@@ -84,11 +84,6 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
-        <!--websocket-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

firefighting-pressure-service/src/main/java/com/zksy/pressure/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8311}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

firefighting-pressure-service/src/main/java/com/zksy/pressure/utils/MessageHandler.java

@@ -56,7 +56,7 @@ public class MessageHandler extends ChannelInboundHandlerAdapter {
     @Autowired
     private DeviceOfflineCheckTask deviceOfflineCheckTask;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 	@Autowired
 	public MessageHandler(FirefightingPressureService firefightingPressureService) {

firefighting-pressure-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.pressure.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

firefighting-pressure-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.pressure.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

firefighting-pressure-service/src/main/resources/application-prod.yaml

@@ -1,11 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: pressure-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: pressure-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30003
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

flammable-gas-service/src/main/java/com/zksy/gas/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8312}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

flammable-gas-service/src/main/java/com/zksy/gas/utils/MessageHandler.java

@@ -63,7 +63,7 @@ public class MessageHandler extends ChannelInboundHandlerAdapter {
     @Autowired
     private DeviceOfflineCheckTask deviceOfflineCheckTask;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 
 	@Autowired

flammable-gas-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.gas.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

flammable-gas-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.gas.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

flammable-gas-service/src/main/resources/application-prod.yaml

@@ -1,11 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: gas-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: gas-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30007
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

manhole-service/src/main/java/com/zksy/manhole/config/NettyServerThread.java

@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:20011}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

manhole-service/src/main/java/com/zksy/manhole/utils/AlarmUtil.java

@@ -39,7 +39,7 @@ public class AlarmUtil {
     @Autowired
     private AlarmDataService alarmDataService;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 
     public void checkAndSaveAlarm(String deviceCode,

manhole-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.manhole.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

manhole-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.manhole.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

manhole-service/src/main/resources/application-prod.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.107.107.47:8848
-      config:
-        server-addr: 47.107.107.47:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.manhole.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

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

@@ -2,40 +2,24 @@ spring:
   application:
     name: manhole-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: manhole-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-device:
-  check:
-    interval: 120000
-websocket:
-  url: http://127.0.0.1:8103
-netty:
-  # 端口号
-  port: 30000
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

pipe-network-service/zksy-admin/pom.xml

@@ -32,32 +32,6 @@
             <artifactId>minio</artifactId>
             <version>7.1.0</version> <!-- 与 classpath 中的版本保持一致，或使用 8.5.x 也可 -->
         </dependency>
-        <!-- swagger3-->
-<!--
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-
-        &lt;!&ndash; 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 &ndash;&gt;
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-         &lt;!&ndash; Mysql驱动包 &ndash;&gt;
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
--->
-
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <version>8.0.33</version>
-        </dependency>
         <dependency>
             <groupId>cn.com.kingbase</groupId>
             <artifactId>kingbase8</artifactId>
@@ -174,4 +148,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

pipe-network-service/zksy-admin/src/main/resources/application-dev.yml

@@ -1,14 +0,0 @@
-minio:
-  endpoint: http://192.168.110.30:9000
-  accessKey: minio
-  secretKey: minio123
-  bucket: pipe
-  readPath: http://192.168.110.30:9000
-imgAddress: D:/Temp/%s.jpg
-
-mybatis-plus:
-  global-config:
-    db-config:
-      logic-delete-field: delFlag
-      logic-delete-value: "2"
-      logic-not-delete-value: "0"

pipe-network-service/zksy-admin/src/main/resources/application-druid.yml

@@ -1,7 +0,0 @@
-minio:
-  endpoint: http://172.16.102.52:9000
-  accessKey: minio
-  secretKey: minio123
-  bucket: pipe
-  readPath: http://172.16.102.52:9000
-imgAddress: D:/Temp/%s.jpg

pipe-network-service/zksy-admin/src/main/resources/application-prod.yml

@@ -1,14 +0,0 @@
-minio:
-    endpoint: http://47.107.107.47:9000
-    accessKey: minio
-    secretKey: minio123
-    bucket: pipe
-    readPath: http://47.107.107.47:9000
-imgAddress: /home/img-repository/%s.jpg
-
-mybatis-plus:
-    global-config:
-        db-config:
-            logic-delete-field: delFlag
-            logic-delete-value: "2"
-            logic-not-delete-value: "0"

pipe-network-service/zksy-admin/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  config:
-    import: "optional:file:./.local/video-business.properties,optional:file:../.local/video-business.properties,optional:file:../../.local/video-business.properties"

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

@@ -2,120 +2,21 @@ spring:
   application:
     name: pipe-network-service
   profiles:
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   cloud:
-    sentinel:
-      transport:
-        dashboard: 192.168.110.30:8090
-#        dashboard: 172.16.102.52:8090
-      http-method-specify: true
     nacos:
-      server-addr: 192.168.110.30:8848
-#      server-addr: 172.16.102.52:8848
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
-        server-addr: 192.168.110.30
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-#        server-addr: 172.16.102.52
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-        server-addr: 192.168.110.30
-#        server-addr: 172.16.102.52
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: zksy-log.yaml # 共享日志配置
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size: 10MB
-      # 设置总上传的文件大小
-      max-request-size: 20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: false
-  redis:
-    # 地址
-#    host: 192.168.110.30
-    host: 172.16.102.52
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    #password: 123456
-    password:
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 10
-        # 连接池中的最大空闲连接
-        max-idle: 200
-        # 连接池的最大数据库连接数
-        max-active: 200
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: 1000ms
-zksy:
-  # 名称
-  name: 管网物联网平台
-  # 版本
-  version: 1.0.0
-  # 版权年份
-  copyrightYear: 2025
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/zksy/pipe/uploadPath
-#  profile: /home/ruoyi/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数字计算 char 字符验证
-  captchaType: math
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 10
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 180
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

pipe-network-service/zksy-generator/src/main/java/com/zksy/generator/controller/GenController.java

@@ -3,7 +3,7 @@ package com.zksy.generator.controller;
 import com.alibaba.druid.DbType;
 import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.zksy.common.annotation.Log;
 import com.zksy.common.core.controller.BaseController;
 import com.zksy.common.core.domain.AjaxResult;
@@ -126,16 +126,16 @@ public class GenController extends BaseController
         try
         {
             SqlUtil.filterKeyword(sql);
-            List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
+            List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase);
             List<String> tableNames = new ArrayList<>();
             for (SQLStatement sqlStatement : sqlStatements)
             {
-                if (sqlStatement instanceof MySqlCreateTableStatement)
+                if (sqlStatement instanceof SQLCreateTableStatement)
                 {
-                    MySqlCreateTableStatement createTableStatement = (MySqlCreateTableStatement) sqlStatement;
+                    SQLCreateTableStatement createTableStatement = (SQLCreateTableStatement) sqlStatement;
                     if (genTableService.createTable(createTableStatement.toString()))
                     {
-                        String tableName = createTableStatement.getTableName().replaceAll("`", "");
+                        String tableName = createTableStatement.getName().toString().replaceAll("[`\"]", "");
                         tableNames.add(tableName);
                     }
                 }
@@ -254,4 +254,4 @@ public class GenController extends BaseController
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());
     }
-}
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/base/video/VideoCollectorClient.java

@@ -16,7 +16,7 @@ public class VideoCollectorClient {
     private final String base;
     private final String token;
     private final RestTemplate http;
-    public VideoCollectorClient(@Value("${video.service-url:http://127.0.0.1:8330}") String base,
+    public VideoCollectorClient(@Value("${video.service-url}") String base,
                                 @Value("${video.internal-token:${VIDEO_INTERNAL_TOKEN:}}") String token) {
         this.base=base; this.token=token;
         SimpleClientHttpRequestFactory factory=new SimpleClientHttpRequestFactory();

pipe-network-service/zksy-system/src/main/java/com/zksy/ops/service/impl/WorkOrderServiceImpl.java

@@ -759,7 +759,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     /**
      * 构建工单业务筛选条件，PC 与移动端查询共用。
      *
-     * <p>返回值刻意不含 orderBy：状态统计要按状态分组，带排序在 MySQL ONLY_FULL_GROUP_BY 下会报错。</p>
+     * <p>返回值刻意不含 orderBy：状态统计按状态分组计数，不需要列表排序。</p>
      *
      * @param condition  查询条件
      * @param withStatus 是否叠加状态筛选。状态统计必须传 false，

pipe-network-service/zksy-system/src/main/resources/mapper/ops/WorkOrderMapper.xml

@@ -69,7 +69,7 @@
     </select>
 
     <!-- 状态筛选条统计：复用列表筛选条件（不含状态筛选）按状态分组计数。
-         条件由 wrapper 承载且不含 orderBy，避免 MySQL ONLY_FULL_GROUP_BY 下报错。 -->
+         条件由 wrapper 承载且不含 orderBy，状态统计不需要列表排序。 -->
     <select id="countByStatus" resultType="java.util.HashMap">
         SELECT order_status AS status,
                COUNT(*)     AS cnt

pom.xml

@@ -46,7 +46,6 @@
         <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
         <mybatis-plus.version>3.5.7</mybatis-plus.version>
         <hutool.version>5.8.11</hutool.version>
-        <mysql.version>8.0.23</mysql.version>
         <kingbase.version>8.6.0</kingbase.version>
         <okhttp.version>4.9.3</okhttp.version>
         <redis.version>3.0.5</redis.version>
@@ -78,12 +77,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- 数据库驱动包管理 -->
-            <!--<dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
-            </dependency>-->
+            <!-- KingbaseES JDBC driver management -->
             <dependency>
                 <groupId>cn.com.kingbase</groupId>
                 <artifactId>kingbase8</artifactId>

radar-service/src/main/java/com/zksy/radar/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8313}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

radar-service/src/main/java/com/zksy/radar/utils/MessageHandler.java

@@ -53,7 +53,7 @@ public class MessageHandler extends ChannelInboundHandlerAdapter {
     @Autowired
     private DeviceOfflineCheckTask deviceOfflineCheckTask;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 
     @Autowired

radar-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.radar.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

radar-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.radar.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

radar-service/src/main/resources/application-prod.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.107.107.47:8848
-      config:
-        server-addr: 47.107.107.47:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.radar.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: radar-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: radar-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30005
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

telemetry-service/src/main/java/com/zksy/telemetry/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8313}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

telemetry-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.telemetry.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

telemetry-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.telemetry.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

telemetry-service/src/main/resources/application-prod.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.107.107.47:8848
-      config:
-        server-addr: 47.107.107.47:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.telemetry.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: telemetry-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: telemetry-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30006
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

video-service/src/main/resources/application-dev.yaml

@@ -1,69 +0,0 @@
-# dev 环境；Nacos video-service-dev.yaml 可覆盖本文件的启动配置。
-server:
-  port: ${VIDEO_HTTP_PORT:8330}
-  address: ${VIDEO_BIND_ADDRESS:127.0.0.1}
-spring:
-  datasource:
-    dynamic:
-      primary: master
-      strict: true
-      datasource:
-        master:
-          driver-class-name: com.kingbase8.Driver
-          url: ${VIDEO_DB_URL}
-          username: ${VIDEO_DB_USER}
-          password: ${VIDEO_DB_PASSWORD}
-  redis:
-    host: ${VIDEO_REDIS_HOST:127.0.0.1}
-    port: ${VIDEO_REDIS_PORT:6379}
-    password: ${VIDEO_REDIS_PASSWORD:}
-    database: ${VIDEO_REDIS_DATABASE:6}
-  mvc:
-    async:
-      request-timeout: 95000
-mybatis:
-  mapper-locations: classpath*:mapper/**/*.xml
-  configuration:
-    map-underscore-to-camel-case: true
-pagehelper:
-  helper-dialect: postgresql
-  reasonable: true
-sip:
-  ip: ${VIDEO_SIP_IP}
-  show-ip: ${VIDEO_SIP_ADVERTISED_IP:${VIDEO_SIP_IP}}
-  port: ${VIDEO_SIP_PORT:8116}
-  domain: ${VIDEO_SIP_DOMAIN:4101050000}
-  id: ${VIDEO_SIP_ID:41010500002000000002}
-  password: ${VIDEO_SIP_PASSWORD}
-  alarm: false
-media:
-  id: ${VIDEO_MEDIA_ID:city_video_zlm}
-  ip: ${VIDEO_MEDIA_HOST:127.0.0.1}
-  hook-ip: ${VIDEO_HOOK_IP:127.0.0.1}
-  sdp-ip: ${VIDEO_RTP_IP:${VIDEO_SIP_IP}}
-  stream-ip: ${VIDEO_STREAM_HOST:127.0.0.1}
-  http-port: ${VIDEO_MEDIA_HTTP_PORT:8094}
-  rtsp-port: ${VIDEO_MEDIA_RTSP_PORT:8556}
-  rtmp-port: ${VIDEO_MEDIA_RTMP_PORT:1937}
-  secret: ${VIDEO_MEDIA_SECRET}
-  auto-config: true
-  rtp:
-    enable: true
-    port-range: ${VIDEO_RTP_PORT_RANGE:31000,31500}
-    send-port-range: ${VIDEO_RTP_SEND_PORT_RANGE:31501,32000}
-user-settings:
-  server-id: ${VIDEO_SERVER_ID:city-video-01}
-  play-timeout: 20000
-  interface-authentication: true
-  sync-channel-on-device-online: true
-  record-sip: false
-  record-push-live: false
-  stream-on-demand: true
-  sip-log: false
-video:
-  internal-token: ${VIDEO_INTERNAL_TOKEN}
-  hook-allowed-addresses: ${VIDEO_HOOK_ALLOWED_ADDRESSES:127.0.0.1,0:0:0:0:0:0:0:1}
-version:
-  version: 1.0.0
-  artifactId: video-service
-  description: 城市生命线国标视频服务

video-service/src/main/resources/application-druid.yaml

@@ -1,69 +0,0 @@
-# druid 环境；Nacos video-service-druid.yaml 可覆盖本文件的启动配置。
-server:
-  port: ${VIDEO_HTTP_PORT:8330}
-  address: ${VIDEO_BIND_ADDRESS:0.0.0.0}
-spring:
-  datasource:
-    dynamic:
-      primary: master
-      strict: true
-      datasource:
-        master:
-          driver-class-name: com.kingbase8.Driver
-          url: ${VIDEO_DB_URL}
-          username: ${VIDEO_DB_USER}
-          password: ${VIDEO_DB_PASSWORD}
-  redis:
-    host: ${VIDEO_REDIS_HOST:127.0.0.1}
-    port: ${VIDEO_REDIS_PORT:6379}
-    password: ${VIDEO_REDIS_PASSWORD:}
-    database: ${VIDEO_REDIS_DATABASE:6}
-  mvc:
-    async:
-      request-timeout: 95000
-mybatis:
-  mapper-locations: classpath*:mapper/**/*.xml
-  configuration:
-    map-underscore-to-camel-case: true
-pagehelper:
-  helper-dialect: postgresql
-  reasonable: true
-sip:
-  ip: ${VIDEO_SIP_IP}
-  show-ip: ${VIDEO_SIP_ADVERTISED_IP:${VIDEO_SIP_IP}}
-  port: ${VIDEO_SIP_PORT:8116}
-  domain: ${VIDEO_SIP_DOMAIN:4101050000}
-  id: ${VIDEO_SIP_ID:41010500002000000002}
-  password: ${VIDEO_SIP_PASSWORD}
-  alarm: false
-media:
-  id: ${VIDEO_MEDIA_ID:city_video_zlm}
-  ip: ${VIDEO_MEDIA_HOST:127.0.0.1}
-  hook-ip: ${VIDEO_HOOK_IP}
-  sdp-ip: ${VIDEO_RTP_IP:${VIDEO_SIP_IP}}
-  stream-ip: ${VIDEO_STREAM_HOST}
-  http-port: ${VIDEO_MEDIA_HTTP_PORT:8094}
-  rtsp-port: ${VIDEO_MEDIA_RTSP_PORT:8556}
-  rtmp-port: ${VIDEO_MEDIA_RTMP_PORT:1937}
-  secret: ${VIDEO_MEDIA_SECRET}
-  auto-config: true
-  rtp:
-    enable: true
-    port-range: ${VIDEO_RTP_PORT_RANGE:31000,31500}
-    send-port-range: ${VIDEO_RTP_SEND_PORT_RANGE:31501,32000}
-user-settings:
-  server-id: ${VIDEO_SERVER_ID:city-video-01}
-  play-timeout: 20000
-  interface-authentication: true
-  sync-channel-on-device-online: true
-  record-sip: false
-  record-push-live: false
-  stream-on-demand: true
-  sip-log: false
-video:
-  internal-token: ${VIDEO_INTERNAL_TOKEN}
-  hook-allowed-addresses: ${VIDEO_HOOK_ALLOWED_ADDRESSES}
-version:
-  version: 1.0.0
-  artifactId: video-service
-  description: 城市生命线国标视频服务

video-service/src/main/resources/application-prod.yaml

@@ -1,69 +0,0 @@
-# prod 环境；Nacos video-service-prod.yaml 可覆盖本文件的启动配置。
-server:
-  port: ${VIDEO_HTTP_PORT:8330}
-  address: ${VIDEO_BIND_ADDRESS:0.0.0.0}
-spring:
-  datasource:
-    dynamic:
-      primary: master
-      strict: true
-      datasource:
-        master:
-          driver-class-name: com.kingbase8.Driver
-          url: ${VIDEO_DB_URL}
-          username: ${VIDEO_DB_USER}
-          password: ${VIDEO_DB_PASSWORD}
-  redis:
-    host: ${VIDEO_REDIS_HOST:127.0.0.1}
-    port: ${VIDEO_REDIS_PORT:6379}
-    password: ${VIDEO_REDIS_PASSWORD:}
-    database: ${VIDEO_REDIS_DATABASE:6}
-  mvc:
-    async:
-      request-timeout: 95000
-mybatis:
-  mapper-locations: classpath*:mapper/**/*.xml
-  configuration:
-    map-underscore-to-camel-case: true
-pagehelper:
-  helper-dialect: postgresql
-  reasonable: true
-sip:
-  ip: ${VIDEO_SIP_IP}
-  show-ip: ${VIDEO_SIP_ADVERTISED_IP:${VIDEO_SIP_IP}}
-  port: ${VIDEO_SIP_PORT:8116}
-  domain: ${VIDEO_SIP_DOMAIN:4101050000}
-  id: ${VIDEO_SIP_ID:41010500002000000002}
-  password: ${VIDEO_SIP_PASSWORD}
-  alarm: false
-media:
-  id: ${VIDEO_MEDIA_ID:city_video_zlm}
-  ip: ${VIDEO_MEDIA_HOST:127.0.0.1}
-  hook-ip: ${VIDEO_HOOK_IP}
-  sdp-ip: ${VIDEO_RTP_IP:${VIDEO_SIP_IP}}
-  stream-ip: ${VIDEO_STREAM_HOST}
-  http-port: ${VIDEO_MEDIA_HTTP_PORT:8094}
-  rtsp-port: ${VIDEO_MEDIA_RTSP_PORT:8556}
-  rtmp-port: ${VIDEO_MEDIA_RTMP_PORT:1937}
-  secret: ${VIDEO_MEDIA_SECRET}
-  auto-config: true
-  rtp:
-    enable: true
-    port-range: ${VIDEO_RTP_PORT_RANGE:31000,31500}
-    send-port-range: ${VIDEO_RTP_SEND_PORT_RANGE:31501,32000}
-user-settings:
-  server-id: ${VIDEO_SERVER_ID:city-video-01}
-  play-timeout: 20000
-  interface-authentication: true
-  sync-channel-on-device-online: true
-  record-sip: false
-  record-push-live: false
-  stream-on-demand: true
-  sip-log: false
-video:
-  internal-token: ${VIDEO_INTERNAL_TOKEN}
-  hook-allowed-addresses: ${VIDEO_HOOK_ALLOWED_ADDRESSES}
-version:
-  version: 1.0.0
-  artifactId: video-service
-  description: 城市生命线国标视频服务

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

@@ -1,4 +1,3 @@
-# 与其他采集服务一致，支持 dev / druid / prod。命名空间与凭据由部署环境提供。
 spring:
   application:
     name: video-service
@@ -8,30 +7,21 @@ spring:
     allow-circular-references: true
   cloud:
     nacos:
-      server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848}
+      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:}
+        namespace: ${NACOS_NAMESPACE}
         group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
-        # SIP/RTP/HTTP 端口和认证配置在启动时绑定，发布后重启服务使其一致生效。
         refresh-enabled: false
         shared-configs:
-          - data-id: zksy-shared-log.yaml
+          - data-id: pipe-common-${spring.profiles.active}.yaml
             group: ${NACOS_GROUP:DEFAULT_GROUP}
-            refresh: false
-      discovery:
-        enabled: ${VIDEO_NACOS_DISCOVERY_ENABLED:${VIDEO_NACOS_ENABLED:true}}
-        server-addr: ${spring.cloud.nacos.server-addr}
-        namespace: ${NACOS_NAMESPACE:}
-        group: ${NACOS_GROUP:DEFAULT_GROUP}
----
-spring:
-  config:
-    activate:
-      on-profile: dev
-    # 本机私有文件仅供 dev；在 bootstrap 阶段读取，使 Nacos 连接配置也能从文件提供。
-    import: "optional:file:./video-service/.runtime/video-local.properties,optional:file:./.runtime/video-local.properties"

water-level-service/src/main/java/com/zksy/water/config/NettyServerThread.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class NettyServerThread {
-	@Value("${netty.port:8313}")
+	@Value("${netty.port}")
 	private int port;
     @Value("${collection.worker-threads:16}")
     private int businessThreads = 16;

water-level-service/src/main/java/com/zksy/water/utils/MessageHandler.java

@@ -53,7 +53,7 @@ public class MessageHandler extends ChannelInboundHandlerAdapter {
     @Autowired
     private DeviceOfflineCheckTask deviceOfflineCheckTask;
 
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String deviceStatusApiUrl;
 
 	@Autowired

water-level-service/src/main/resources/application-dev.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.water.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

water-level-service/src/main/resources/application-druid.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.water.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

water-level-service/src/main/resources/application-prod.yaml

@@ -1,20 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 47.107.107.47:8848
-      config:
-        server-addr: 47.107.107.47:8848
-mybatis-plus:
-  type-aliases-package: com.zksy.water.domain, com.zksy.common.core.domain.entity,com.zksy.system.domain,com.zksy.system.domain
-  mapper-locations: classpath*:mapper/**/*Mapper.xml

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

@@ -2,34 +2,24 @@ spring:
   application:
     name: water-level-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
+    web-application-type: none
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: water-level-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
-netty:
-  port: 30001 #弃用
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

zk-api-service/src/main/java/com/zksy/api/utils/CollectionDeviceNotifier.java

@@ -16,7 +16,7 @@ public class CollectionDeviceNotifier {
     @Autowired private RestTemplate restTemplate;
     @Autowired private SmsUtil smsUtil;
     @Autowired private DeviceContactService devicePhoneFetchUtil;
-    @Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
+    @Value("${device.status.api.url}")
     private String statusUrl;
 
     public void updateAlarmStatus(String deviceCode, int status) {

zk-api-service/src/main/resources/application-dev.yaml

@@ -1,17 +0,0 @@
-zksy:
-  db:
-    host: 192.168.110.30
-    un: app_user
-    pw: kes@123456
-    port: 54321
-    database: pipi_ner
-spring:
-  redis:
-    host: 192.168.110.30
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.110.30:8848
-      config:
-        server-addr: 192.168.110.30:8848

zk-api-service/src/main/resources/application-druid.yaml

@@ -1,17 +0,0 @@
-zksy:
-  db:
-    host: 172.16.102.51
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 172.16.102.52
-    port: 6379
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 172.16.102.52:8848
-      config:
-        server-addr: 172.16.102.52:8848

zk-api-service/src/main/resources/application-prod.yaml

@@ -1,11 +0,0 @@
-zksy:
-  db:
-    host: 47.107.107.47
-    un: root
-    pw: d$3%#*(jnhUDGHB]z0x876c~
-    port: 3306
-    database: pipe-ner
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379

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

@@ -2,32 +2,23 @@ spring:
   application:
     name: zk-api-service
   profiles:
-    active: dev
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   main:
     allow-bean-definition-overriding: true
   cloud:
-    sentinel:
-      transport:
-#        dashboard: 172.16.102.52:8090
-        dashboard: 192.168.110.30:8090
-      http-method-specify: true
     nacos:
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-         server-addr: 192.168.110.30:8848
-         namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-#        server-addr: 172.16.102.52:8848
-#        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 192.168.110.30:8848
-        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: zk-api-service.yaml
-          - dataId: zksy-shared-jdbc.yaml
-          - dataId: zksy-shared-log.yaml
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}

zk-common/src/main/java/com/zksy/common/advice/CommonExceptionAdvice.java

@@ -28,7 +28,7 @@ public class CommonExceptionAdvice {
 
     @ExceptionHandler(DbException.class)
     public Object handleDbException(DbException e) {
-        log.error("mysql数据库操作异常 -> ", e);
+        log.error("数据库操作异常 -> ", e);
         return processResponse(e);
     }
 

zk-common/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -1,141 +1,16 @@
 {
   "groups": [
-    {
-      "name": "hm.db"
-    },
-    {
-      "name": "hm.mq"
-    },
-    {
-      "name": "hm.swagger"
-    },
     {
       "name": "hm.jwt",
-      "type": "com.zksy.config.SecurityConfig",
-      "sourceType": "com.zksy.config.JwtProperties"
+      "type": "com.zksy.gateway.config.SecurityConfig",
+      "sourceType": "com.zksy.gateway.config.JwtProperties"
     },
     {
       "name": "hm.auth",
-      "type": "com.zksy.config.MvcConfig",
-      "sourceType": "com.zksy.config.AuthProperties"
+      "sourceType": "com.zksy.gateway.config.AuthProperties"
     }
   ],
   "properties": [
-    {
-      "name": "hm.mq.host",
-      "type": "java.lang.String",
-      "description": "rabbitmq的地址",
-      "defaultValue": "192.168.150.101"
-    },
-    {
-      "name": "hm.mq.port",
-      "type": "java.lang.Integer",
-      "description": "rabbitmq的端口",
-      "defaultValue": "5672"
-    },
-    {
-      "name": "hm.mq.vhost",
-      "type": "java.lang.String",
-      "description": "rabbitmq的virtual-host地址",
-      "defaultValue": "/hmxt"
-    },
-    {
-      "name": "hm.mq.username",
-      "type": "java.lang.String",
-      "description": "rabbitmq的用户名",
-      "defaultValue": "hmxt"
-    },
-    {
-      "name": "hm.mq.password",
-      "type": "java.lang.String",
-      "description": "rabbitmq的密码",
-      "defaultValue": "123321"
-    },
-    {
-      "name": "hm.mq.listener.retry.enable",
-      "type": "java.lang.Boolean",
-      "description": "是否开启rabbitmq的消费者重试机制",
-      "defaultValue": "true"
-    },
-    {
-      "name": "hm.mq.listener.retry.interval",
-      "type": "java.time.Duration",
-      "description": "消费者重试初始失败等待时长",
-      "defaultValue": "1000ms"
-    },
-    {
-      "name": "hm.mq.listener.retry.multiplier",
-      "type": "java.lang.Integer",
-      "description": "失败等待时长的递增倍数",
-      "defaultValue": "1"
-    },
-    {
-      "name": "hm.mq.listener.retry.max-attempts",
-      "type": "java.lang.Integer",
-      "description": "消费者重试最大重试次数",
-      "defaultValue": "3"
-    },
-    {
-      "name": "hm.mq.listener.retry.stateless",
-      "type": "java.lang.Boolean",
-      "description": "是否是无状态，默认true",
-      "defaultValue": "true"
-    },
-    {
-      "name": "hm.db.host",
-      "type": "java.lang.String",
-      "description": "数据库地址",
-      "defaultValue": "192.168.150.101"
-    },
-    {
-      "name": "hm.db.port",
-      "type": "java.lang.Integer",
-      "description": "数据库端口",
-      "defaultValue": "3306"
-    },
-    {
-      "name": "hm.db.database",
-      "type": "java.lang.String",
-      "description": "数据库database名",
-      "defaultValue": ""
-    },
-    {
-      "name": "hm.db.un",
-      "type": "java.lang.String",
-      "description": "数据库用户名",
-      "defaultValue": "root"
-    },
-    {
-      "name": "hm.db.pw",
-      "type": "java.lang.String",
-      "description": "数据库密码",
-      "defaultValue": "123"
-    },
-    {
-      "name": "hm.swagger.title",
-      "type": "java.lang.String",
-      "description": "接口文档标题"
-    },
-    {
-      "name": "hm.swagger.description",
-      "type": "java.lang.String",
-      "description": "接口文档描述"
-    },
-    {
-      "name": "hm.swagger.email",
-      "type": "java.lang.String",
-      "description": "接口文档联系人邮箱"
-    },
-    {
-      "name": "hm.swagger.concat",
-      "type": "java.lang.String",
-      "description": "接口文档联系人"
-    },
-    {
-      "name": "hm.swagger.package",
-      "type": "java.lang.String",
-      "description": "接口controller扫描包"
-    },
     {
       "name": "hm.jwt.location",
       "type": "java.lang.String",
@@ -168,4 +43,4 @@
     }
   ],
   "hints": []
-}
+}

zk-gateway/src/main/resources/application-dev.yaml

@@ -1,21 +0,0 @@
-server:
-  port: 8300 # 端口
-hm:
-  jwt:
-    location: classpath:hmall.jks # 秘钥地址
-    alias: hmall # 秘钥别名
-    password: hmall123 # 秘钥文件密码
-    tokenTTL: 30m # 登录有效期
-  auth:
-    excludePaths: # 无需登录校验的路径
-      - /search/**
-      - /users/login
-      - /items/**
-spring:
-  graphql:
-    cors:
-      allowed-origins: "*"
-      allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
-      allowed-headers: "*"
-      allow-credentials: true
-      max-age: 3600

zk-gateway/src/main/resources/application-druid.yaml

@@ -1,21 +0,0 @@
-server:
-  port: 8300 # 端口
-hm:
-  jwt:
-    location: classpath:hmall.jks # 秘钥地址
-    alias: hmall # 秘钥别名
-    password: hmall123 # 秘钥文件密码
-    tokenTTL: 30m # 登录有效期
-  auth:
-    excludePaths: # 无需登录校验的路径
-      - /search/**
-      - /users/login
-      - /items/**
-spring:
-  graphql:
-    cors:
-      allowed-origins: "*"
-      allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
-      allowed-headers: "*"
-      allow-credentials: true
-      max-age: 3600

zk-gateway/src/main/resources/application-prod.yaml

@@ -1,21 +0,0 @@
-server:
-  port: 8300 # 端口
-hm:
-  jwt:
-    location: classpath:hmall.jks # 秘钥地址
-    alias: hmall # 秘钥别名
-    password: hmall123 # 秘钥文件密码
-    tokenTTL: 30m # 登录有效期
-  auth:
-    excludePaths: # 无需登录校验的路径
-      - /search/**
-      - /users/login
-      - /items/**
-spring:
-  graphql:
-    cors:
-      allowed-origins: "*"
-      allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
-      allowed-headers: "*"
-      allow-credentials: true
-      max-age: 3600

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

@@ -2,21 +2,21 @@ spring:
   application:
     name: zksy-gateway
   profiles:
-    active: druid
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   cloud:
     nacos:
-      server-addr: 172.16.102.52:8848
-#      server-addr: 192.168.110.30:8848
+      server-addr: ${NACOS_SERVER_ADDR}
+      username: ${NACOS_USERNAME:}
+      password: ${NACOS_PASSWORD:}
       discovery:
-        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 172.16.102.52:8848
-#        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
-#        server-addr: 192.168.110.30:8848
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
       config:
-        namespace: e67fa2c3-7422-449f-927b-046159cc64eb
-        server-addr: 172.16.102.52:8848
-#        namespace: 9ce240d6-ae6b-45a3-8566-e75ac25c9d71
-#        server-addr: 192.168.110.30:8848
+        server-addr: ${spring.cloud.nacos.server-addr}
+        namespace: ${NACOS_NAMESPACE}
+        group: ${NACOS_GROUP:DEFAULT_GROUP}
         file-extension: yaml
         shared-configs:
-          - dataId: zksy-log.yaml # 共享日志配置
+          - data-id: pipe-common-${spring.profiles.active}.yaml
+            group: ${NACOS_GROUP:DEFAULT_GROUP}