Merge branch 'master' into 重构/1078

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java

src/main/java/com/genersoft/iot/vmp/utils/CloudRecordUtils.java

@@ -2,21 +2,45 @@ package com.genersoft.iot.vmp.utils;
 
 import com.genersoft.iot.vmp.media.bean.MediaServer;
 import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
+import lombok.experimental.UtilityClass;
 
+/**
+ * 云录像工具类
+ *
+ * @author 648540858
+ */
+@UtilityClass
 public class CloudRecordUtils {
 
+
+    /**
+     * 修复原始工具类中的格式化问题
+     *
+     * @param mediaServerItem 媒体服务器配置
+     * @param filePath        文件路径（可能包含%等特殊字符）
+     * @return 修复后的下载信息
+     */
     public static DownloadFileInfo getDownloadFilePath(MediaServer mediaServerItem, String filePath) {
-        DownloadFileInfo downloadFileInfo = new DownloadFileInfo();
+        // 将filePath作为独立参数传入，避免%符号解析问题
+        String pathTemplate = "%s://%s:%s/index/api/downloadFile?file_path=%s";
 
-        String pathTemplate = "%s://%s:%s/index/api/downloadFile?file_path=" + filePath;
+        DownloadFileInfo info = new DownloadFileInfo();
 
-        downloadFileInfo.setHttpPath(String.format(pathTemplate, "http", mediaServerItem.getStreamIp(),
-                mediaServerItem.getHttpPort()));
+        // filePath作为第4个参数
+        info.setHttpPath(String.format(pathTemplate,
+                "http",
+                mediaServerItem.getStreamIp(),
+                mediaServerItem.getHttpPort(),
+                filePath));
 
+        // 同样作为第4个参数
         if (mediaServerItem.getHttpSSlPort() > 0) {
-            downloadFileInfo.setHttpsPath(String.format(pathTemplate, "https", mediaServerItem.getStreamIp(),
-                    mediaServerItem.getHttpSSlPort()));
+            info.setHttpsPath(String.format(pathTemplate,
+                    "https",
+                    mediaServerItem.getStreamIp(),
+                    mediaServerItem.getHttpSSlPort(),
+                    filePath));
         }
-        return downloadFileInfo;
+        return info;
     }
 }

src/main/java/com/genersoft/iot/vmp/utils/IpPortUtil.java

@@ -0,0 +1,90 @@
+package com.genersoft.iot.vmp.utils;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public class IpPortUtil {
+
+    /**
+     * 拼接IP和端口
+     * @param ip IP地址字符串
+     * @param port 端口号字符串
+     * @return 拼接后的字符串
+     * @throws IllegalArgumentException 如果IP地址无效或端口无效
+     */
+    public static String concatenateIpAndPort(String ip, String port) {
+        if (port == null || port.isEmpty()) {
+            throw new IllegalArgumentException("端口号不能为空");
+        }
+
+        // 验证端口是否为有效数字
+        try {
+            int portNum = Integer.parseInt(port);
+            if (portNum < 0 || portNum > 65535) {
+                throw new IllegalArgumentException("端口号必须在0-65535范围内");
+            }
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("端口号必须是有效数字", e);
+        }
+
+        try {
+            InetAddress inetAddress = InetAddress.getByName(ip);
+
+            if (inetAddress instanceof Inet6Address) {
+                // IPv6地址需要加上方括号
+                return "[" + ip + "]:" + port;
+            } else {
+                // IPv4地址直接拼接
+                return ip + ":" + port;
+            }
+        } catch (UnknownHostException e) {
+            throw new IllegalArgumentException("无效的IP地址: " + ip, e);
+        }
+    }
+
+    // 测试用例
+    public static void main(String[] args) {
+        // IPv4测试
+        String ipv4 = "192.168.1.1";
+        String port1 = "8080";
+        System.out.println(concatenateIpAndPort(ipv4, port1));  // 输出: 192.168.1.1:8080
+
+        // IPv6测试
+        String ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
+        String port2 = "80";
+        System.out.println(concatenateIpAndPort(ipv6, port2));  // 输出: [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80
+
+        // 压缩格式IPv6测试
+        String ipv6Compressed = "2001:db8::1";
+        System.out.println(concatenateIpAndPort(ipv6Compressed, port2));  // 输出: [2001:db8::1]:80
+
+        // 无效IP测试
+        try {
+            System.out.println(concatenateIpAndPort("invalid.ip", "1234"));
+        } catch (IllegalArgumentException e) {
+            System.out.println("捕获到预期异常: " + e.getMessage());
+        }
+
+        // 无效端口测试 - 非数字
+        try {
+            System.out.println(concatenateIpAndPort(ipv4, "abc"));
+        } catch (IllegalArgumentException e) {
+            System.out.println("捕获到预期异常: " + e.getMessage());
+        }
+
+        // 无效端口测试 - 超出范围
+        try {
+            System.out.println(concatenateIpAndPort(ipv4, "70000"));
+        } catch (IllegalArgumentException e) {
+            System.out.println("捕获到预期异常: " + e.getMessage());
+        }
+
+        // 空端口测试
+        try {
+            System.out.println(concatenateIpAndPort(ipv4, ""));
+        } catch (IllegalArgumentException e) {
+            System.out.println("捕获到预期异常: " + e.getMessage());
+        }
+    }
+}